From febba956627d03e41599a17bc38f30edb54dc673 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 1 Apr 2024 17:29:36 +0000 Subject: [PATCH 001/155] Preserve gogoproto generated files --- models/{actions.pb.go => actions.gogoproto.go} | 0 models/{actual_lrp.pb.go => actual_lrp.gogoproto.go} | 0 ...actual_lrp_requests.pb.go => actual_lrp_requests.gogoproto.go} | 0 .../{cached_dependency.pb.go => cached_dependency.gogoproto.go} | 0 models/{cells.pb.go => cells.gogoproto.go} | 0 ...icate_properties.pb.go => certificate_properties.gogoproto.go} | 0 models/{check_definition.pb.go => check_definition.gogoproto.go} | 0 models/{desired_lrp.pb.go => desired_lrp.gogoproto.go} | 0 ...sired_lrp_requests.pb.go => desired_lrp_requests.gogoproto.go} | 0 models/{domain.pb.go => domain.gogoproto.go} | 0 ...ronment_variables.pb.go => environment_variables.gogoproto.go} | 0 models/{error.pb.go => error.gogoproto.go} | 0 models/{evacuation.pb.go => evacuation.gogoproto.go} | 0 models/{events.pb.go => events.gogoproto.go} | 0 models/{image_layer.pb.go => image_layer.gogoproto.go} | 0 models/{log_rate_limit.pb.go => log_rate_limit.gogoproto.go} | 0 models/{metric_tags.pb.go => metric_tags.gogoproto.go} | 0 models/{modification_tag.pb.go => modification_tag.gogoproto.go} | 0 models/{network.pb.go => network.gogoproto.go} | 0 models/{ping.pb.go => ping.gogoproto.go} | 0 models/{security_group.pb.go => security_group.gogoproto.go} | 0 models/{sidecar.pb.go => sidecar.gogoproto.go} | 0 models/{task.pb.go => task.gogoproto.go} | 0 models/{task_requests.pb.go => task_requests.gogoproto.go} | 0 models/{volume_mount.pb.go => volume_mount.gogoproto.go} | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename models/{actions.pb.go => actions.gogoproto.go} (100%) rename models/{actual_lrp.pb.go => actual_lrp.gogoproto.go} (100%) rename models/{actual_lrp_requests.pb.go => actual_lrp_requests.gogoproto.go} (100%) rename models/{cached_dependency.pb.go => cached_dependency.gogoproto.go} (100%) rename models/{cells.pb.go => cells.gogoproto.go} (100%) rename models/{certificate_properties.pb.go => certificate_properties.gogoproto.go} (100%) rename models/{check_definition.pb.go => check_definition.gogoproto.go} (100%) rename models/{desired_lrp.pb.go => desired_lrp.gogoproto.go} (100%) rename models/{desired_lrp_requests.pb.go => desired_lrp_requests.gogoproto.go} (100%) rename models/{domain.pb.go => domain.gogoproto.go} (100%) rename models/{environment_variables.pb.go => environment_variables.gogoproto.go} (100%) rename models/{error.pb.go => error.gogoproto.go} (100%) rename models/{evacuation.pb.go => evacuation.gogoproto.go} (100%) rename models/{events.pb.go => events.gogoproto.go} (100%) rename models/{image_layer.pb.go => image_layer.gogoproto.go} (100%) rename models/{log_rate_limit.pb.go => log_rate_limit.gogoproto.go} (100%) rename models/{metric_tags.pb.go => metric_tags.gogoproto.go} (100%) rename models/{modification_tag.pb.go => modification_tag.gogoproto.go} (100%) rename models/{network.pb.go => network.gogoproto.go} (100%) rename models/{ping.pb.go => ping.gogoproto.go} (100%) rename models/{security_group.pb.go => security_group.gogoproto.go} (100%) rename models/{sidecar.pb.go => sidecar.gogoproto.go} (100%) rename models/{task.pb.go => task.gogoproto.go} (100%) rename models/{task_requests.pb.go => task_requests.gogoproto.go} (100%) rename models/{volume_mount.pb.go => volume_mount.gogoproto.go} (100%) diff --git a/models/actions.pb.go b/models/actions.gogoproto.go similarity index 100% rename from models/actions.pb.go rename to models/actions.gogoproto.go diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.gogoproto.go similarity index 100% rename from models/actual_lrp.pb.go rename to models/actual_lrp.gogoproto.go diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.gogoproto.go similarity index 100% rename from models/actual_lrp_requests.pb.go rename to models/actual_lrp_requests.gogoproto.go diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.gogoproto.go similarity index 100% rename from models/cached_dependency.pb.go rename to models/cached_dependency.gogoproto.go diff --git a/models/cells.pb.go b/models/cells.gogoproto.go similarity index 100% rename from models/cells.pb.go rename to models/cells.gogoproto.go diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.gogoproto.go similarity index 100% rename from models/certificate_properties.pb.go rename to models/certificate_properties.gogoproto.go diff --git a/models/check_definition.pb.go b/models/check_definition.gogoproto.go similarity index 100% rename from models/check_definition.pb.go rename to models/check_definition.gogoproto.go diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.gogoproto.go similarity index 100% rename from models/desired_lrp.pb.go rename to models/desired_lrp.gogoproto.go diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.gogoproto.go similarity index 100% rename from models/desired_lrp_requests.pb.go rename to models/desired_lrp_requests.gogoproto.go diff --git a/models/domain.pb.go b/models/domain.gogoproto.go similarity index 100% rename from models/domain.pb.go rename to models/domain.gogoproto.go diff --git a/models/environment_variables.pb.go b/models/environment_variables.gogoproto.go similarity index 100% rename from models/environment_variables.pb.go rename to models/environment_variables.gogoproto.go diff --git a/models/error.pb.go b/models/error.gogoproto.go similarity index 100% rename from models/error.pb.go rename to models/error.gogoproto.go diff --git a/models/evacuation.pb.go b/models/evacuation.gogoproto.go similarity index 100% rename from models/evacuation.pb.go rename to models/evacuation.gogoproto.go diff --git a/models/events.pb.go b/models/events.gogoproto.go similarity index 100% rename from models/events.pb.go rename to models/events.gogoproto.go diff --git a/models/image_layer.pb.go b/models/image_layer.gogoproto.go similarity index 100% rename from models/image_layer.pb.go rename to models/image_layer.gogoproto.go diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.gogoproto.go similarity index 100% rename from models/log_rate_limit.pb.go rename to models/log_rate_limit.gogoproto.go diff --git a/models/metric_tags.pb.go b/models/metric_tags.gogoproto.go similarity index 100% rename from models/metric_tags.pb.go rename to models/metric_tags.gogoproto.go diff --git a/models/modification_tag.pb.go b/models/modification_tag.gogoproto.go similarity index 100% rename from models/modification_tag.pb.go rename to models/modification_tag.gogoproto.go diff --git a/models/network.pb.go b/models/network.gogoproto.go similarity index 100% rename from models/network.pb.go rename to models/network.gogoproto.go diff --git a/models/ping.pb.go b/models/ping.gogoproto.go similarity index 100% rename from models/ping.pb.go rename to models/ping.gogoproto.go diff --git a/models/security_group.pb.go b/models/security_group.gogoproto.go similarity index 100% rename from models/security_group.pb.go rename to models/security_group.gogoproto.go diff --git a/models/sidecar.pb.go b/models/sidecar.gogoproto.go similarity index 100% rename from models/sidecar.pb.go rename to models/sidecar.gogoproto.go diff --git a/models/task.pb.go b/models/task.gogoproto.go similarity index 100% rename from models/task.pb.go rename to models/task.gogoproto.go diff --git a/models/task_requests.pb.go b/models/task_requests.gogoproto.go similarity index 100% rename from models/task_requests.pb.go rename to models/task_requests.gogoproto.go diff --git a/models/volume_mount.pb.go b/models/volume_mount.gogoproto.go similarity index 100% rename from models/volume_mount.pb.go rename to models/volume_mount.gogoproto.go From bf25c19a3fe5aab73bf051a8a82d27a5efeccf1e Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 16:34:54 +0000 Subject: [PATCH 002/155] Protos: Remove import of gogoproto --- models/actions.proto | 1 - models/actual_lrp.proto | 1 - models/actual_lrp_requests.proto | 1 - models/cached_dependency.proto | 1 - models/cells.proto | 1 - models/check_definition.proto | 1 - models/desired_lrp.proto | 1 - models/desired_lrp_requests.proto | 1 - models/domain.proto | 1 - models/environment_variables.proto | 1 - models/error.proto | 1 - models/evacuation.proto | 1 - models/events.proto | 1 - models/image_layer.proto | 1 - models/metric_tags.proto | 1 - models/modification_tag.proto | 1 - models/network.proto | 1 - models/ping.proto | 1 - models/security_group.proto | 1 - models/sidecar.proto | 1 - models/task.proto | 1 - models/task_requests.proto | 1 - models/volume_mount.proto | 1 - 23 files changed, 23 deletions(-) diff --git a/models/actions.proto b/models/actions.proto index 7b29cc45..b3bff2c3 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "environment_variables.proto"; message Action { diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index aa089c96..b7710709 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "modification_tag.proto"; option (gogoproto.goproto_enum_prefix_all) = true; diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index 178d6127..71430b11 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "actual_lrp.proto"; import "error.proto"; diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index daea97e2..92c8334d 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; option (gogoproto.goproto_enum_prefix_all) = true; diff --git a/models/cells.proto b/models/cells.proto index e73a028a..93275b0a 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "error.proto"; message CellCapacity { diff --git a/models/check_definition.proto b/models/check_definition.proto index e38338d5..5c7a7275 100644 --- a/models/check_definition.proto +++ b/models/check_definition.proto @@ -3,7 +3,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message CheckDefinition { repeated Check checks = 1; diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index a0777892..cd83b5ae 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "actions.proto"; import "cached_dependency.proto"; import "certificate_properties.proto"; diff --git a/models/desired_lrp_requests.proto b/models/desired_lrp_requests.proto index be746255..dfca9703 100644 --- a/models/desired_lrp_requests.proto +++ b/models/desired_lrp_requests.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "desired_lrp.proto"; import "error.proto"; diff --git a/models/domain.proto b/models/domain.proto index 7028f0f7..2251d898 100644 --- a/models/domain.proto +++ b/models/domain.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "error.proto"; option (gogoproto.equal_all) = false; diff --git a/models/environment_variables.proto b/models/environment_variables.proto index 390aa783..82be0474 100644 --- a/models/environment_variables.proto +++ b/models/environment_variables.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message EnvironmentVariable { string name = 1 [(gogoproto.jsontag) = "name"]; diff --git a/models/error.proto b/models/error.proto index 7aa1a9c8..834b2e90 100644 --- a/models/error.proto +++ b/models/error.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; option (gogoproto.equal_all) = false; option (gogoproto.goproto_enum_prefix_all) = true; diff --git a/models/evacuation.proto b/models/evacuation.proto index 85f4883d..6ae3fbf2 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "actual_lrp.proto"; import "error.proto"; diff --git a/models/events.proto b/models/events.proto index c6bf8ecc..1157ee26 100644 --- a/models/events.proto +++ b/models/events.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "actual_lrp.proto"; import "desired_lrp.proto"; import "task.proto"; diff --git a/models/image_layer.proto b/models/image_layer.proto index 07b64913..02212a0a 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message ImageLayer { enum DigestAlgorithm { diff --git a/models/metric_tags.proto b/models/metric_tags.proto index 18293e0f..a79a7a64 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message MetricTagValue { enum DynamicValue { diff --git a/models/modification_tag.proto b/models/modification_tag.proto index 0b413b54..5666486d 100644 --- a/models/modification_tag.proto +++ b/models/modification_tag.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message ModificationTag { string epoch = 1 [(gogoproto.jsontag) = "epoch"]; diff --git a/models/network.proto b/models/network.proto index 95185656..a6f094a2 100644 --- a/models/network.proto +++ b/models/network.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; option (gogoproto.goproto_enum_prefix_all) = true; diff --git a/models/ping.proto b/models/ping.proto index 2841864f..d93155d3 100644 --- a/models/ping.proto +++ b/models/ping.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message PingResponse { bool available = 1 [(gogoproto.jsontag) = "available"]; diff --git a/models/security_group.proto b/models/security_group.proto index ad28c29c..009dd757 100644 --- a/models/security_group.proto +++ b/models/security_group.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message PortRange { uint32 start = 1 [(gogoproto.jsontag) = "start"]; diff --git a/models/sidecar.proto b/models/sidecar.proto index baa13bcb..02356997 100644 --- a/models/sidecar.proto +++ b/models/sidecar.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "actions.proto"; message Sidecar { diff --git a/models/task.proto b/models/task.proto index 2e4b1c27..34001e68 100644 --- a/models/task.proto +++ b/models/task.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "actions.proto"; import "environment_variables.proto"; import "security_group.proto"; diff --git a/models/task_requests.proto b/models/task_requests.proto index bf43ad66..dbaa70da 100644 --- a/models/task_requests.proto +++ b/models/task_requests.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "task.proto"; import "error.proto"; diff --git a/models/volume_mount.proto b/models/volume_mount.proto index 3139b87e..70518c6c 100644 --- a/models/volume_mount.proto +++ b/models/volume_mount.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package models; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; option (gogoproto.goproto_enum_prefix_all) = true; From 8f6e4bc571a93c2ce80f90ac9d65076d16a93d42 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 16:35:20 +0000 Subject: [PATCH 003/155] Protos: Add option go_package --- models/actions.proto | 1 + models/actual_lrp.proto | 1 + models/actual_lrp_requests.proto | 1 + models/cached_dependency.proto | 1 + models/cells.proto | 1 + models/certificate_properties.proto | 1 + models/check_definition.proto | 1 + models/desired_lrp.proto | 1 + models/desired_lrp_requests.proto | 1 + models/domain.proto | 1 + models/environment_variables.proto | 1 + models/error.proto | 1 + models/evacuation.proto | 1 + models/events.proto | 1 + models/image_layer.proto | 1 + models/log_rate_limit.proto | 1 + models/metric_tags.proto | 1 + models/modification_tag.proto | 1 + models/network.proto | 1 + models/ping.proto | 1 + models/security_group.proto | 1 + models/sidecar.proto | 1 + models/task.proto | 1 + models/task_requests.proto | 1 + models/volume_mount.proto | 1 + 25 files changed, 25 insertions(+) diff --git a/models/actions.proto b/models/actions.proto index b3bff2c3..63da7c12 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "environment_variables.proto"; diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index b7710709..2d8ef02f 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "modification_tag.proto"; diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index 71430b11..fecccf5c 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "actual_lrp.proto"; import "error.proto"; diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index 92c8334d..21d0a1de 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; option (gogoproto.goproto_enum_prefix_all) = true; diff --git a/models/cells.proto b/models/cells.proto index 93275b0a..a2b68cb4 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "error.proto"; diff --git a/models/certificate_properties.proto b/models/certificate_properties.proto index 9eced102..853faf70 100644 --- a/models/certificate_properties.proto +++ b/models/certificate_properties.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message CertificateProperties { repeated string organizational_unit = 1; diff --git a/models/check_definition.proto b/models/check_definition.proto index 5c7a7275..197ccdea 100644 --- a/models/check_definition.proto +++ b/models/check_definition.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package models; +option go_package="."; message CheckDefinition { diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index cd83b5ae..81d43dc6 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "actions.proto"; import "cached_dependency.proto"; diff --git a/models/desired_lrp_requests.proto b/models/desired_lrp_requests.proto index dfca9703..f4c5483f 100644 --- a/models/desired_lrp_requests.proto +++ b/models/desired_lrp_requests.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "desired_lrp.proto"; import "error.proto"; diff --git a/models/domain.proto b/models/domain.proto index 2251d898..f53958c7 100644 --- a/models/domain.proto +++ b/models/domain.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "error.proto"; diff --git a/models/environment_variables.proto b/models/environment_variables.proto index 82be0474..02435479 100644 --- a/models/environment_variables.proto +++ b/models/environment_variables.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message EnvironmentVariable { diff --git a/models/error.proto b/models/error.proto index 834b2e90..eb443ef9 100644 --- a/models/error.proto +++ b/models/error.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; option (gogoproto.equal_all) = false; diff --git a/models/evacuation.proto b/models/evacuation.proto index 6ae3fbf2..f7c8be16 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "actual_lrp.proto"; import "error.proto"; diff --git a/models/events.proto b/models/events.proto index 1157ee26..385ad01d 100644 --- a/models/events.proto +++ b/models/events.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "actual_lrp.proto"; import "desired_lrp.proto"; diff --git a/models/image_layer.proto b/models/image_layer.proto index 02212a0a..8ae612e0 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message ImageLayer { diff --git a/models/log_rate_limit.proto b/models/log_rate_limit.proto index 7248103b..d2723ba1 100644 --- a/models/log_rate_limit.proto +++ b/models/log_rate_limit.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message LogRateLimit { int64 bytes_per_second = 1; diff --git a/models/metric_tags.proto b/models/metric_tags.proto index a79a7a64..a39741e3 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message MetricTagValue { diff --git a/models/modification_tag.proto b/models/modification_tag.proto index 5666486d..2ad4edd2 100644 --- a/models/modification_tag.proto +++ b/models/modification_tag.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message ModificationTag { diff --git a/models/network.proto b/models/network.proto index a6f094a2..7ef145b4 100644 --- a/models/network.proto +++ b/models/network.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; option (gogoproto.goproto_enum_prefix_all) = true; diff --git a/models/ping.proto b/models/ping.proto index d93155d3..59986381 100644 --- a/models/ping.proto +++ b/models/ping.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message PingResponse { diff --git a/models/security_group.proto b/models/security_group.proto index 009dd757..90e3508b 100644 --- a/models/security_group.proto +++ b/models/security_group.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; message PortRange { diff --git a/models/sidecar.proto b/models/sidecar.proto index 02356997..9c5f8e2c 100644 --- a/models/sidecar.proto +++ b/models/sidecar.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "actions.proto"; diff --git a/models/task.proto b/models/task.proto index 34001e68..40262dd3 100644 --- a/models/task.proto +++ b/models/task.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "actions.proto"; import "environment_variables.proto"; diff --git a/models/task_requests.proto b/models/task_requests.proto index dbaa70da..1d173bdc 100644 --- a/models/task_requests.proto +++ b/models/task_requests.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; import "task.proto"; import "error.proto"; diff --git a/models/volume_mount.proto b/models/volume_mount.proto index 70518c6c..0c92d01a 100644 --- a/models/volume_mount.proto +++ b/models/volume_mount.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package models; +option go_package="."; option (gogoproto.goproto_enum_prefix_all) = true; From 2ce16060fcd9e7bbe9a7c9ff2c516521fc6e0c0c Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 16:35:52 +0000 Subject: [PATCH 004/155] Protos: gogoproto.jsontag => json_name --- models/actions.proto | 48 +++++++++--------- models/actual_lrp.proto | 46 +++++++++--------- models/actual_lrp_requests.proto | 32 ++++++------ models/cached_dependency.proto | 10 ++-- models/cells.proto | 18 +++---- models/check_definition.proto | 8 +-- models/desired_lrp.proto | 78 +++++++++++++++--------------- models/desired_lrp_requests.proto | 8 +-- models/domain.proto | 4 +- models/environment_variables.proto | 4 +- models/error.proto | 4 +- models/evacuation.proto | 6 +-- models/events.proto | 40 +++++++-------- models/image_layer.proto | 8 +-- models/modification_tag.proto | 4 +- models/network.proto | 2 +- models/ping.proto | 2 +- models/security_group.proto | 10 ++-- models/sidecar.proto | 4 +- models/task.proto | 52 ++++++++++---------- models/task_requests.proto | 48 +++++++++--------- models/volume_mount.proto | 14 +++--- 22 files changed, 225 insertions(+), 225 deletions(-) diff --git a/models/actions.proto b/models/actions.proto index 63da7c12..36acbb9a 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -15,60 +15,60 @@ message Action { // disadvantages of using multiple optionals without onlyone: // - writing our own GetAction/SetAction methods // action oneof { - DownloadAction download_action = 1 [(gogoproto.jsontag) = "download,omitempty"]; - UploadAction upload_action = 2 [(gogoproto.jsontag) = "upload,omitempty"]; - RunAction run_action = 3 [(gogoproto.jsontag) = "run,omitempty"]; - TimeoutAction timeout_action = 4 [(gogoproto.jsontag) = "timeout,omitempty"]; - EmitProgressAction emit_progress_action = 5 [(gogoproto.jsontag) = "emit_progress,omitempty"]; - TryAction try_action = 6 [(gogoproto.jsontag) = "try,omitempty"]; - ParallelAction parallel_action = 7 [(gogoproto.jsontag) = "parallel,omitempty"]; - SerialAction serial_action = 8 [(gogoproto.jsontag) = "serial,omitempty"]; - CodependentAction codependent_action = 9 [(gogoproto.jsontag) = "codependent,omitempty"]; + DownloadAction download_action = 1 [json_name = "download,omitempty"]; + UploadAction upload_action = 2 [json_name = "upload,omitempty"]; + RunAction run_action = 3 [json_name = "run,omitempty"]; + TimeoutAction timeout_action = 4 [json_name = "timeout,omitempty"]; + EmitProgressAction emit_progress_action = 5 [json_name = "emit_progress,omitempty"]; + TryAction try_action = 6 [json_name = "try,omitempty"]; + ParallelAction parallel_action = 7 [json_name = "parallel,omitempty"]; + SerialAction serial_action = 8 [json_name = "serial,omitempty"]; + CodependentAction codependent_action = 9 [json_name = "codependent,omitempty"]; // } } message DownloadAction { string artifact = 1; - string from = 2 [(gogoproto.jsontag) = "from"]; - string to = 3 [(gogoproto.jsontag) = "to"]; - string cache_key = 4 [(gogoproto.jsontag) = "cache_key"]; + string from = 2 [json_name = "from"]; + string to = 3 [json_name = "to"]; + string cache_key = 4 [json_name = "cache_key"]; string log_source = 5; - string user = 6 [(gogoproto.jsontag) = "user"] ; + string user = 6 [json_name = "user"] ; string checksum_algorithm = 7; string checksum_value = 8; } message UploadAction { string artifact = 1; - string from = 2 [(gogoproto.jsontag) = "from"]; - string to = 3 [(gogoproto.jsontag) = "to"]; + string from = 2 [json_name = "from"]; + string to = 3 [json_name = "to"]; string log_source = 4; - string user = 5 [(gogoproto.jsontag) = "user"]; + string user = 5 [json_name = "user"]; } message RunAction { - string path = 1 [(gogoproto.jsontag) = "path"]; + string path = 1 [json_name = "path"]; repeated string args = 2; string dir = 3; repeated EnvironmentVariable env = 4; ResourceLimits resource_limits = 5; - string user = 6 [(gogoproto.jsontag) = "user"]; + string user = 6 [json_name = "user"]; string log_source = 7; - bool suppress_log_output = 8 [(gogoproto.jsontag) = "suppress_log_output"]; + bool suppress_log_output = 8 [json_name = "suppress_log_output"]; } message TimeoutAction { Action action = 1; - int64 deprecated_timeout_ns = 2 [(gogoproto.jsontag) = "timeout,omitempty", deprecated=true]; + int64 deprecated_timeout_ns = 2 [json_name = "timeout,omitempty", deprecated=true]; string log_source = 3; - int64 timeout_ms = 4 [(gogoproto.jsontag) = "timeout_ms"]; + int64 timeout_ms = 4 [json_name = "timeout_ms"]; } message EmitProgressAction { Action action = 1; - string start_message = 2 [(gogoproto.jsontag) = "start_message"]; - string success_message = 3 [(gogoproto.jsontag) = "success_message"]; - string failure_message_prefix = 4 [(gogoproto.jsontag) = "failure_message_prefix"]; + string start_message = 2 [json_name = "start_message"]; + string success_message = 3 [json_name = "success_message"]; + string failure_message_prefix = 4 [json_name = "failure_message_prefix"]; string log_source = 5; } diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 2d8ef02f..a62fe8ce 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -14,26 +14,26 @@ message ActualLRPGroup { } message PortMapping { - uint32 container_port = 1 [(gogoproto.jsontag) = "container_port"]; - uint32 host_port = 2 [(gogoproto.jsontag) = "host_port"]; - uint32 container_tls_proxy_port = 3 [(gogoproto.jsontag) = "container_tls_proxy_port"]; - uint32 host_tls_proxy_port = 4 [(gogoproto.jsontag) = "host_tls_proxy_port"]; + uint32 container_port = 1 [json_name = "container_port"]; + uint32 host_port = 2 [json_name = "host_port"]; + uint32 container_tls_proxy_port = 3 [json_name = "container_tls_proxy_port"]; + uint32 host_tls_proxy_port = 4 [json_name = "host_tls_proxy_port"]; } message ActualLRPKey { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; - int32 index = 2 [(gogoproto.jsontag) = "index"]; - string domain = 3 [(gogoproto.jsontag) = "domain"]; + string process_guid = 1 [json_name = "process_guid"]; + int32 index = 2 [json_name = "index"]; + string domain = 3 [json_name = "domain"]; } message ActualLRPInstanceKey { - string instance_guid = 1 [(gogoproto.jsontag) = "instance_guid"]; - string cell_id = 2 [(gogoproto.jsontag) = "cell_id"]; + string instance_guid = 1 [json_name = "instance_guid"]; + string cell_id = 2 [json_name = "cell_id"]; } message ActualLRPNetInfo { - string address = 1 [(gogoproto.jsontag) = "address"]; - repeated PortMapping ports = 2 [(gogoproto.jsontag) = "ports"]; + string address = 1 [json_name = "address"]; + repeated PortMapping ports = 2 [json_name = "ports"]; string instance_address = 3; enum PreferredAddress { @@ -42,11 +42,11 @@ message ActualLRPNetInfo { HOST = 2 [(gogoproto.enumvalue_customname) = "PreferredAddressHost"]; } - PreferredAddress preferred_address = 4 [(gogoproto.jsontag) = "preferred_address"]; + PreferredAddress preferred_address = 4 [json_name = "preferred_address"]; } message ActualLRPInternalRoute { - string hostname = 1 [(gogoproto.jsontag) = "hostname"]; + string hostname = 1 [json_name = "hostname"]; } message ActualLRP { @@ -56,20 +56,20 @@ message ActualLRP { SUSPECT = 2 [(gogoproto.enumvalue_customname) = "Suspect"]; } - ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - ActualLRPNetInfo actual_lrp_net_info = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - int32 crash_count = 4 [(gogoproto.jsontag) = "crash_count"]; + ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPNetInfo actual_lrp_net_info = 3 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; - string state = 6 [(gogoproto.jsontag) = "state"]; + string state = 6 [json_name = "state"]; string placement_error = 7; - int64 since = 8 [(gogoproto.jsontag) = "since"]; - ModificationTag modification_tag = 9 [(gogoproto.nullable) = false,(gogoproto.jsontag) = "modification_tag"]; - Presence presence = 10 [(gogoproto.jsontag) = "presence"]; + int64 since = 8 [json_name = "since"]; + ModificationTag modification_tag = 9 [(gogoproto.nullable) = false,json_name = "modification_tag"]; + Presence presence = 10 [json_name = "presence"]; repeated ActualLRPInternalRoute actual_lrp_internal_routes = 11; map metric_tags = 12; oneof optional_routable { - bool routable = 13 [(gogoproto.jsontag) = "routable"]; + bool routable = 13 [json_name = "routable"]; } - string availability_zone = 14 [(gogoproto.jsontag) = "availability_zone"]; + string availability_zone = 14 [json_name = "availability_zone"]; } diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index fecccf5c..1b387643 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -24,24 +24,24 @@ message ActualLRPGroupResponse { message ActualLRPGroupsRequest { option deprecated = true; - string domain = 1 [(gogoproto.jsontag) = "domain"]; - string cell_id = 2 [(gogoproto.jsontag) = "cell_id"]; + string domain = 1 [json_name = "domain"]; + string cell_id = 2 [json_name = "cell_id"]; } message ActualLRPGroupsByProcessGuidRequest { option deprecated = true; - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; + string process_guid = 1 [json_name = "process_guid"]; } message ActualLRPGroupByProcessGuidAndIndexRequest { option deprecated = true; - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; - int32 index = 2 [(gogoproto.jsontag) = "index"]; + string process_guid = 1 [json_name = "process_guid"]; + int32 index = 2 [json_name = "index"]; } message ClaimActualLRPRequest { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; - int32 index = 2 [(gogoproto.jsontag) = "index"]; + string process_guid = 1 [json_name = "process_guid"]; + int32 index = 2 [json_name = "index"]; ActualLRPInstanceKey actual_lrp_instance_key = 3; } @@ -54,18 +54,18 @@ message StartActualLRPRequest { oneof optional_routable { bool Routable = 6; } - string availability_zone = 7 [(gogoproto.jsontag)= "availability_zone"]; + string availability_zone = 7 [json_name= "availability_zone"]; } message CrashActualLRPRequest { ActualLRPKey actual_lrp_key = 1; ActualLRPInstanceKey actual_lrp_instance_key = 2; - string error_message = 3 [(gogoproto.jsontag) = "error_message"]; + string error_message = 3 [json_name = "error_message"]; } message FailActualLRPRequest { ActualLRPKey actual_lrp_key = 1; - string error_message = 2 [(gogoproto.jsontag) = "error_message"]; + string error_message = 2 [json_name = "error_message"]; } message RetireActualLRPRequest { @@ -73,8 +73,8 @@ message RetireActualLRPRequest { } message RemoveActualLRPRequest { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; - int32 index = 2 [(gogoproto.jsontag) = "index"]; + string process_guid = 1 [json_name = "process_guid"]; + int32 index = 2 [json_name = "index"]; ActualLRPInstanceKey actual_lrp_instance_key = 3; } @@ -84,11 +84,11 @@ message ActualLRPsResponse { } message ActualLRPsRequest { - string domain = 1 [(gogoproto.jsontag) = "domain"]; - string cell_id = 2 [(gogoproto.jsontag) = "cell_id"]; - string process_guid = 3 [(gogoproto.jsontag) = "process_guid"]; + string domain = 1 [json_name = "domain"]; + string cell_id = 2 [json_name = "cell_id"]; + string process_guid = 3 [json_name = "process_guid"]; oneof optional_index { - int32 index = 4 [(gogoproto.jsontag) = "index"]; + int32 index = 4 [json_name = "index"]; } } diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index 21d0a1de..7e5b124d 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -7,11 +7,11 @@ option go_package="."; option (gogoproto.goproto_enum_prefix_all) = true; message CachedDependency { - string name = 1 [(gogoproto.jsontag) = "name"]; - string from = 2 [(gogoproto.jsontag) = "from"]; - string to = 3 [(gogoproto.jsontag) = "to"]; - string cache_key = 4 [(gogoproto.jsontag) = "cache_key"]; - string log_source = 5 [(gogoproto.jsontag) = "log_source"]; + string name = 1 [json_name = "name"]; + string from = 2 [json_name = "from"]; + string to = 3 [json_name = "to"]; + string cache_key = 4 [json_name = "cache_key"]; + string log_source = 5 [json_name = "log_source"]; string checksum_algorithm = 6; string checksum_value = 7; } diff --git a/models/cells.proto b/models/cells.proto index a2b68cb4..3431dc91 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -6,24 +6,24 @@ option go_package="."; import "error.proto"; message CellCapacity { - int32 memory_mb = 1 [(gogoproto.jsontag) = "memory_mb"]; - int32 disk_mb = 2 [(gogoproto.jsontag) = "disk_mb"]; - int32 containers = 3 [(gogoproto.jsontag) = "containers"]; + int32 memory_mb = 1 [json_name = "memory_mb"]; + int32 disk_mb = 2 [json_name = "disk_mb"]; + int32 containers = 3 [json_name = "containers"]; } message CellPresence { - string cell_id = 1 [(gogoproto.jsontag) = "cell_id"]; - string rep_address = 2 [(gogoproto.jsontag) = "rep_address"]; - string zone = 3 [(gogoproto.jsontag) = "zone"]; + string cell_id = 1 [json_name = "cell_id"]; + string rep_address = 2 [json_name = "rep_address"]; + string zone = 3 [json_name = "zone"]; CellCapacity capacity = 4; - repeated Provider rootfs_providers = 5 [(gogoproto.jsontag) = "rootfs_provider_list,omitempty"]; + repeated Provider rootfs_providers = 5 [json_name = "rootfs_provider_list,omitempty"]; repeated string placement_tags = 6; repeated string optional_placement_tags = 7; - string rep_url = 8 [(gogoproto.jsontag) = "rep_url"]; + string rep_url = 8 [json_name = "rep_url"]; } message Provider { - string name = 1 [(gogoproto.jsontag) = "name"]; + string name = 1 [json_name = "name"]; repeated string properties = 2; } diff --git a/models/check_definition.proto b/models/check_definition.proto index 197ccdea..2f6740e6 100644 --- a/models/check_definition.proto +++ b/models/check_definition.proto @@ -7,7 +7,7 @@ option go_package="."; message CheckDefinition { repeated Check checks = 1; - string log_source = 2 [(gogoproto.jsontag) = "log_source"]; + string log_source = 2 [json_name = "log_source"]; repeated Check readiness_checks = 3; } @@ -20,14 +20,14 @@ message Check { } message TCPCheck { - uint32 port = 1 [(gogoproto.jsontag) = "port"]; + uint32 port = 1 [json_name = "port"]; uint64 connect_timeout_ms = 2; uint64 interval_ms = 3; } message HTTPCheck { - uint32 port = 1 [(gogoproto.jsontag) = "port"]; + uint32 port = 1 [json_name = "port"]; uint64 request_timeout_ms = 2; - string path = 3 [(gogoproto.jsontag) = "path"]; + string path = 3 [json_name = "path"]; uint64 interval_ms = 4; } diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 81d43dc6..5486d47e 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -18,44 +18,44 @@ import "sidecar.proto"; import "log_rate_limit.proto"; message DesiredLRPSchedulingInfo { - DesiredLRPKey desired_lrp_key = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; + DesiredLRPKey desired_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; - string annotation = 2 [(gogoproto.jsontag) = "annotation"]; - int32 instances = 3 [(gogoproto.jsontag) = "instances"]; + string annotation = 2 [json_name = "annotation"]; + int32 instances = 3 [json_name = "instances"]; - DesiredLRPResource desired_lrp_resource = 4 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; + DesiredLRPResource desired_lrp_resource = 4 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; ProtoRoutes routes = 5 [(gogoproto.nullable) = false, (gogoproto.customtype) = "Routes"]; - ModificationTag modification_tag = 6 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; + ModificationTag modification_tag = 6 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; VolumePlacement volume_placement = 7; - repeated string PlacementTags = 8 [(gogoproto.jsontag) ="placement_tags,omitempty"]; + repeated string PlacementTags = 8 [json_name ="placement_tags,omitempty"]; } message DesiredLRPRunInfo { - DesiredLRPKey desired_lrp_key = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; + DesiredLRPKey desired_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; - repeated EnvironmentVariable environment_variables = 2 [(gogoproto.jsontag) = "env", (gogoproto.nullable) = false]; + repeated EnvironmentVariable environment_variables = 2 [json_name = "env", (gogoproto.nullable) = false]; Action setup = 3; Action action = 4; Action monitor = 5; - uint32 deprecated_start_timeout_s = 6 [(gogoproto.jsontag) = "start_timeout,omitempty", deprecated=true]; + uint32 deprecated_start_timeout_s = 6 [json_name = "start_timeout,omitempty", deprecated=true]; - bool privileged = 7 [(gogoproto.jsontag) = "privileged"]; + bool privileged = 7 [json_name = "privileged"]; - uint32 cpu_weight = 8 [(gogoproto.jsontag) = "cpu_weight"]; + uint32 cpu_weight = 8 [json_name = "cpu_weight"]; repeated uint32 ports = 9 [packed = false]; repeated SecurityGroupRule egress_rules = 10 [(gogoproto.nullable) = false]; - string log_source = 11 [(gogoproto.jsontag) = "log_source"]; - string metrics_guid = 12 [deprecated=true, (gogoproto.jsontag) = "metrics_guid"]; - int64 created_at = 13 [(gogoproto.jsontag) = "created_at"]; + string log_source = 11 [json_name = "log_source"]; + string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid"]; + int64 created_at = 13 [json_name = "created_at"]; repeated CachedDependency cached_dependencies = 14; string legacy_download_user = 15 [deprecated=true]; string trusted_system_certificates_path = 16; repeated VolumeMount volume_mounts = 17; Network network = 18; - int64 start_timeout_ms = 19 [(gogoproto.jsontag) = "start_timeout_ms"]; + int64 start_timeout_ms = 19 [json_name = "start_timeout_ms"]; CertificateProperties certificate_properties = 20 [(gogoproto.nullable) = true]; @@ -89,41 +89,41 @@ message DesiredLRPUpdate { } message DesiredLRPKey { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; - string domain = 2 [(gogoproto.jsontag) = "domain"]; - string log_guid = 3 [(gogoproto.jsontag) = "log_guid"]; + string process_guid = 1 [json_name = "process_guid"]; + string domain = 2 [json_name = "domain"]; + string log_guid = 3 [json_name = "log_guid"]; } message DesiredLRPResource { - int32 memory_mb = 1 [(gogoproto.jsontag) = "memory_mb"]; - int32 disk_mb = 2 [(gogoproto.jsontag) = "disk_mb"]; - string root_fs = 3 [(gogoproto.jsontag) = "rootfs"]; - int32 max_pids = 4 [(gogoproto.jsontag) = "max_pids"]; + int32 memory_mb = 1 [json_name = "memory_mb"]; + int32 disk_mb = 2 [json_name = "disk_mb"]; + string root_fs = 3 [json_name = "rootfs"]; + int32 max_pids = 4 [json_name = "max_pids"]; } message DesiredLRP { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; - string domain = 2 [(gogoproto.jsontag) = "domain"]; - string root_fs = 3 [(gogoproto.jsontag) = "rootfs"]; - int32 instances = 4 [(gogoproto.jsontag) = "instances"]; - repeated EnvironmentVariable environment_variables = 5 [(gogoproto.jsontag) = "env"]; + string process_guid = 1 [json_name = "process_guid"]; + string domain = 2 [json_name = "domain"]; + string root_fs = 3 [json_name = "rootfs"]; + int32 instances = 4 [json_name = "instances"]; + repeated EnvironmentVariable environment_variables = 5 [json_name = "env"]; Action setup = 6; Action action = 7; - int64 start_timeout_ms = 27 [(gogoproto.jsontag) = "start_timeout_ms"]; - uint32 deprecated_start_timeout_s = 8 [(gogoproto.jsontag) = "deprecated_timeout_ns,omitempty", deprecated=true]; + int64 start_timeout_ms = 27 [json_name = "start_timeout_ms"]; + uint32 deprecated_start_timeout_s = 8 [json_name = "deprecated_timeout_ns,omitempty", deprecated=true]; Action monitor = 9; - int32 disk_mb = 10 [(gogoproto.jsontag) = "disk_mb"]; - int32 memory_mb = 11 [(gogoproto.jsontag) = "memory_mb"]; - uint32 cpu_weight = 12 [(gogoproto.jsontag) = "cpu_weight"]; - bool privileged = 13 [(gogoproto.jsontag) = "privileged"]; + int32 disk_mb = 10 [json_name = "disk_mb"]; + int32 memory_mb = 11 [json_name = "memory_mb"]; + uint32 cpu_weight = 12 [json_name = "cpu_weight"]; + bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; ProtoRoutes routes = 15 [(gogoproto.nullable) = true, (gogoproto.customtype) = "Routes"]; - string log_source = 16 [(gogoproto.jsontag) = "log_source"]; - string log_guid = 17 [(gogoproto.jsontag) = "log_guid"]; - string metrics_guid = 18 [deprecated=true, (gogoproto.jsontag) = "metrics_guid"]; - string annotation = 19 [(gogoproto.jsontag) = "annotation"]; + string log_source = 16 [json_name = "log_source"]; + string log_guid = 17 [json_name = "log_guid"]; + string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; + string annotation = 19 [json_name = "annotation"]; repeated SecurityGroupRule egress_rules = 20; ModificationTag modification_tag = 21; repeated CachedDependency cached_dependencies = 22; @@ -131,8 +131,8 @@ message DesiredLRP { string trusted_system_certificates_path = 24; repeated VolumeMount volume_mounts = 25; Network network = 26; - repeated string PlacementTags = 28 [(gogoproto.jsontag) ="placement_tags,omitempty"]; - int32 max_pids = 29 [(gogoproto.jsontag) = "max_pids"]; + repeated string PlacementTags = 28 [json_name ="placement_tags,omitempty"]; + int32 max_pids = 29 [json_name = "max_pids"]; CertificateProperties certificate_properties = 30 [(gogoproto.nullable) = true]; diff --git a/models/desired_lrp_requests.proto b/models/desired_lrp_requests.proto index f4c5483f..39ca2c84 100644 --- a/models/desired_lrp_requests.proto +++ b/models/desired_lrp_requests.proto @@ -16,7 +16,7 @@ message DesiredLRPsResponse { } message DesiredLRPsRequest { - string domain = 1 [(gogoproto.jsontag) = "domain"]; + string domain = 1 [json_name = "domain"]; repeated string process_guids = 2; } @@ -36,7 +36,7 @@ message DesiredLRPSchedulingInfoByProcessGuidResponse { } message DesiredLRPByProcessGuidRequest { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; + string process_guid = 1 [json_name = "process_guid"]; } message DesireLRPRequest { @@ -44,10 +44,10 @@ message DesireLRPRequest { } message UpdateDesiredLRPRequest { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; + string process_guid = 1 [json_name = "process_guid"]; DesiredLRPUpdate update = 2; } message RemoveDesiredLRPRequest { - string process_guid = 1 [(gogoproto.jsontag) = "process_guid"]; + string process_guid = 1 [json_name = "process_guid"]; } diff --git a/models/domain.proto b/models/domain.proto index f53958c7..342deb05 100644 --- a/models/domain.proto +++ b/models/domain.proto @@ -17,6 +17,6 @@ message UpsertDomainResponse { } message UpsertDomainRequest { - string domain = 1 [(gogoproto.jsontag) = "domain"]; - uint32 ttl = 2 [(gogoproto.jsontag) = "ttl"]; + string domain = 1 [json_name = "domain"]; + uint32 ttl = 2 [json_name = "ttl"]; } diff --git a/models/environment_variables.proto b/models/environment_variables.proto index 02435479..524bb23e 100644 --- a/models/environment_variables.proto +++ b/models/environment_variables.proto @@ -5,6 +5,6 @@ option go_package="."; message EnvironmentVariable { - string name = 1 [(gogoproto.jsontag) = "name"]; - string value = 2 [(gogoproto.jsontag) = "value"]; + string name = 1 [json_name = "name"]; + string value = 2 [json_name = "value"]; } diff --git a/models/error.proto b/models/error.proto index eb443ef9..9b1c2d22 100644 --- a/models/error.proto +++ b/models/error.proto @@ -47,6 +47,6 @@ message Error { Timeout = 31; } - Type type = 1 [(gogoproto.jsontag) = "type"]; - string message = 2 [(gogoproto.jsontag) = "message"]; + Type type = 1 [json_name = "type"]; + string message = 2 [json_name = "message"]; } diff --git a/models/evacuation.proto b/models/evacuation.proto index f7c8be16..b5b5c8e1 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -10,7 +10,7 @@ option (gogoproto.equal_all) = false; message EvacuationResponse { Error error = 1; - bool keep_container = 2 [(gogoproto.jsontag) = "keep_container"]; + bool keep_container = 2 [json_name = "keep_container"]; } message EvacuateClaimedActualLRPRequest { @@ -29,7 +29,7 @@ message EvacuateRunningActualLRPRequest { oneof optional_routable { bool Routable = 7; } - string availability_zone = 8 [(gogoproto.jsontag) = "availability_zone"]; + string availability_zone = 8 [json_name = "availability_zone"]; } message EvacuateStoppedActualLRPRequest { @@ -40,7 +40,7 @@ message EvacuateStoppedActualLRPRequest { message EvacuateCrashedActualLRPRequest { ActualLRPKey actual_lrp_key = 1; ActualLRPInstanceKey actual_lrp_instance_key = 2; - string error_message = 3 [(gogoproto.jsontag) = "error_message"]; + string error_message = 3 [json_name = "error_message"]; } message RemoveEvacuatingActualLRPRequest { diff --git a/models/events.proto b/models/events.proto index 385ad01d..7fbeb034 100644 --- a/models/events.proto +++ b/models/events.proto @@ -26,63 +26,63 @@ message ActualLRPRemovedEvent { message ActualLRPInstanceCreatedEvent { ActualLRP actual_lrp = 1; - string trace_id = 2 [(gogoproto.jsontag) = "trace_id"]; + string trace_id = 2 [json_name = "trace_id"]; } message ActualLRPInfo { - ActualLRPNetInfo actual_lrp_net_info = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - int32 crash_count = 4 [(gogoproto.jsontag) = "crash_count"]; + ActualLRPNetInfo actual_lrp_net_info = 3 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; - string state = 6 [(gogoproto.jsontag) = "state"]; + string state = 6 [json_name = "state"]; string placement_error = 7; - int64 since = 8 [(gogoproto.jsontag) = "since"]; - ModificationTag modification_tag = 9 [(gogoproto.nullable) = false,(gogoproto.jsontag) = "modification_tag"]; - ActualLRP.Presence presence = 10 [(gogoproto.jsontag) = "presence"]; + int64 since = 8 [json_name = "since"]; + ModificationTag modification_tag = 9 [(gogoproto.nullable) = false,json_name = "modification_tag"]; + ActualLRP.Presence presence = 10 [json_name = "presence"]; oneof optional_routable { bool Routable = 11; } - string availability_zone = 12 [(gogoproto.jsontag) = "availability_zone"]; + string availability_zone = 12 [json_name = "availability_zone"]; } message ActualLRPInstanceChangedEvent { - ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; + ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; ActualLRPInfo before = 3; ActualLRPInfo after = 4; - string trace_id = 5 [(gogoproto.jsontag) = "trace_id"]; + string trace_id = 5 [json_name = "trace_id"]; } message ActualLRPInstanceRemovedEvent { ActualLRP actual_lrp = 1; - string trace_id = 2 [(gogoproto.jsontag) = "trace_id"]; + string trace_id = 2 [json_name = "trace_id"]; } message DesiredLRPCreatedEvent { DesiredLRP desired_lrp = 1; - string trace_id = 2 [(gogoproto.jsontag) = "trace_id"]; + string trace_id = 2 [json_name = "trace_id"]; } message DesiredLRPChangedEvent { DesiredLRP before = 1; DesiredLRP after = 2; - string trace_id = 3 [(gogoproto.jsontag) = "trace_id"]; + string trace_id = 3 [json_name = "trace_id"]; } message DesiredLRPRemovedEvent { DesiredLRP desired_lrp = 1; - string trace_id = 2 [(gogoproto.jsontag) = "trace_id"]; + string trace_id = 2 [json_name = "trace_id"]; } message ActualLRPCrashedEvent { - ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - int32 crash_count = 3 [(gogoproto.jsontag) = "crash_count"]; + ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + int32 crash_count = 3 [json_name = "crash_count"]; string crash_reason = 4; - int64 since = 5 [(gogoproto.jsontag) = "since"]; + int64 since = 5 [json_name = "since"]; } message EventsByCellId { - string cell_id = 1 [(gogoproto.jsontag) = "cell_id"]; + string cell_id = 1 [json_name = "cell_id"]; } message TaskCreatedEvent { diff --git a/models/image_layer.proto b/models/image_layer.proto index 8ae612e0..3039cd2d 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -25,10 +25,10 @@ message ImageLayer { } string name = 1; - string url = 2 [(gogoproto.jsontag) = "url"]; - string destination_path = 3 [(gogoproto.jsontag) = "destination_path"]; - Type layer_type = 4 [(gogoproto.jsontag) = "layer_type"]; - MediaType media_type = 5 [(gogoproto.jsontag) = "media_type"]; + string url = 2 [json_name = "url"]; + string destination_path = 3 [json_name = "destination_path"]; + Type layer_type = 4 [json_name = "layer_type"]; + MediaType media_type = 5 [json_name = "media_type"]; DigestAlgorithm digest_algorithm = 6; string digest_value = 7; } diff --git a/models/modification_tag.proto b/models/modification_tag.proto index 2ad4edd2..428331b5 100644 --- a/models/modification_tag.proto +++ b/models/modification_tag.proto @@ -5,7 +5,7 @@ option go_package="."; message ModificationTag { - string epoch = 1 [(gogoproto.jsontag) = "epoch"]; - uint32 index = 2 [(gogoproto.jsontag) = "index"]; + string epoch = 1 [json_name = "epoch"]; + uint32 index = 2 [json_name = "index"]; } diff --git a/models/network.proto b/models/network.proto index 7ef145b4..cf3db671 100644 --- a/models/network.proto +++ b/models/network.proto @@ -7,5 +7,5 @@ option go_package="."; option (gogoproto.goproto_enum_prefix_all) = true; message Network { - map properties = 1 [(gogoproto.jsontag) = "properties,omitempty"]; + map properties = 1 [json_name = "properties,omitempty"]; } diff --git a/models/ping.proto b/models/ping.proto index 59986381..0711bfc0 100644 --- a/models/ping.proto +++ b/models/ping.proto @@ -5,5 +5,5 @@ option go_package="."; message PingResponse { - bool available = 1 [(gogoproto.jsontag) = "available"]; + bool available = 1 [json_name = "available"]; } diff --git a/models/security_group.proto b/models/security_group.proto index 90e3508b..12231965 100644 --- a/models/security_group.proto +++ b/models/security_group.proto @@ -5,13 +5,13 @@ option go_package="."; message PortRange { - uint32 start = 1 [(gogoproto.jsontag) = "start"]; - uint32 end = 2 [(gogoproto.jsontag) = "end"]; + uint32 start = 1 [json_name = "start"]; + uint32 end = 2 [json_name = "end"]; } message ICMPInfo { - int32 type = 1 [(gogoproto.jsontag) = "type"]; - int32 code = 2 [(gogoproto.jsontag) = "code"]; + int32 type = 1 [json_name = "type"]; + int32 code = 2 [json_name = "code"]; } message SecurityGroupRule { @@ -20,6 +20,6 @@ message SecurityGroupRule { repeated uint32 ports = 3 [packed = false]; PortRange port_range = 4; ICMPInfo icmp_info = 5; - bool log = 6 [(gogoproto.jsontag) = "log"]; + bool log = 6 [json_name = "log"]; repeated string annotations = 7; } diff --git a/models/sidecar.proto b/models/sidecar.proto index 9c5f8e2c..12a06b97 100644 --- a/models/sidecar.proto +++ b/models/sidecar.proto @@ -8,6 +8,6 @@ import "actions.proto"; message Sidecar { Action action = 1; - int32 disk_mb = 2 [(gogoproto.jsontag) = "disk_mb"]; - int32 memory_mb = 3 [(gogoproto.jsontag) = "memory_mb"]; + int32 disk_mb = 2 [json_name = "disk_mb"]; + int32 memory_mb = 3 [json_name = "memory_mb"]; } diff --git a/models/task.proto b/models/task.proto index 40262dd3..50e727c9 100644 --- a/models/task.proto +++ b/models/task.proto @@ -17,17 +17,17 @@ import "metric_tags.proto"; option (gogoproto.goproto_enum_prefix_all) = true; message TaskDefinition { - string root_fs = 1 [(gogoproto.jsontag) = "rootfs"]; - repeated EnvironmentVariable environment_variables = 2 [(gogoproto.jsontag) = "env,omitempty"]; + string root_fs = 1 [json_name = "rootfs"]; + repeated EnvironmentVariable environment_variables = 2 [json_name = "env,omitempty"]; Action action = 3; - int32 disk_mb = 4 [(gogoproto.jsontag) = "disk_mb"]; - int32 memory_mb = 5 [(gogoproto.jsontag) = "memory_mb"]; - uint32 cpu_weight = 6 [(gogoproto.jsontag) = "cpu_weight"]; - bool privileged = 7 [(gogoproto.jsontag) = "privileged"]; - string log_source = 8 [(gogoproto.jsontag) = "log_source"]; - string log_guid = 9 [(gogoproto.jsontag) = "log_guid"]; - string metrics_guid = 10 [(gogoproto.jsontag) = "metrics_guid"]; - string result_file = 11 [(gogoproto.jsontag) = "result_file"]; + int32 disk_mb = 4 [json_name = "disk_mb"]; + int32 memory_mb = 5 [json_name = "memory_mb"]; + uint32 cpu_weight = 6 [json_name = "cpu_weight"]; + bool privileged = 7 [json_name = "privileged"]; + string log_source = 8 [json_name = "log_source"]; + string log_guid = 9 [json_name = "log_guid"]; + string metrics_guid = 10 [json_name = "metrics_guid"]; + string result_file = 11 [json_name = "result_file"]; string completion_callback_url = 12; string annotation = 13; repeated SecurityGroupRule egress_rules = 14; @@ -37,10 +37,10 @@ message TaskDefinition { repeated VolumeMount volume_mounts = 18; Network network = 19; repeated string placement_tags = 20; - int32 max_pids = 21 [(gogoproto.jsontag) = "max_pids"]; + int32 max_pids = 21 [json_name = "max_pids"]; CertificateProperties certificate_properties = 22; - string image_username = 23 [(gogoproto.jsontag) = "image_username"]; - string image_password = 24 [(gogoproto.jsontag) = "image_password"]; + string image_username = 23 [json_name = "image_username"]; + string image_password = 24 [json_name = "image_password"]; repeated ImageLayer image_layers = 25; LogRateLimit log_rate_limit = 26; map metric_tags = 27; @@ -55,22 +55,22 @@ message Task { Resolving = 4; } - TaskDefinition task_definition = 1 [(gogoproto.jsontag) = "", (gogoproto.embed) = true]; + TaskDefinition task_definition = 1 [json_name = "", (gogoproto.embed) = true]; - string task_guid = 2 [(gogoproto.jsontag) = "task_guid"]; - string domain = 3 [(gogoproto.jsontag) = "domain"]; - int64 created_at = 4 [(gogoproto.jsontag) = "created_at"]; - int64 updated_at = 5 [(gogoproto.jsontag) = "updated_at"]; - int64 first_completed_at = 6 [(gogoproto.jsontag) = "first_completed_at"]; + string task_guid = 2 [json_name = "task_guid"]; + string domain = 3 [json_name = "domain"]; + int64 created_at = 4 [json_name = "created_at"]; + int64 updated_at = 5 [json_name = "updated_at"]; + int64 first_completed_at = 6 [json_name = "first_completed_at"]; - State state = 7 [(gogoproto.jsontag) = "state"]; + State state = 7 [json_name = "state"]; - string cell_id = 8 [(gogoproto.jsontag) = "cell_id"]; + string cell_id = 8 [json_name = "cell_id"]; - string result = 9 [(gogoproto.jsontag) = "result"]; - bool failed = 10 [(gogoproto.jsontag) = "failed"]; - string failure_reason = 11 [(gogoproto.jsontag) = "failure_reason"]; - int32 rejection_count = 12 [(gogoproto.jsontag) = "rejection_count"]; - string rejection_reason = 13 [(gogoproto.jsontag) = "rejection_reason"]; + string result = 9 [json_name = "result"]; + bool failed = 10 [json_name = "failed"]; + string failure_reason = 11 [json_name = "failure_reason"]; + int32 rejection_count = 12 [json_name = "rejection_count"]; + string rejection_reason = 13 [json_name = "rejection_reason"]; } diff --git a/models/task_requests.proto b/models/task_requests.proto index 1d173bdc..88ceb036 100644 --- a/models/task_requests.proto +++ b/models/task_requests.proto @@ -11,56 +11,56 @@ message TaskLifecycleResponse { } message DesireTaskRequest { - TaskDefinition task_definition = 1 [(gogoproto.jsontag) = "task_definition"]; - string task_guid = 2 [(gogoproto.jsontag) = "task_guid"]; - string domain = 3 [(gogoproto.jsontag) = "domain"]; + TaskDefinition task_definition = 1 [json_name = "task_definition"]; + string task_guid = 2 [json_name = "task_guid"]; + string domain = 3 [json_name = "domain"]; } message StartTaskRequest { - string task_guid = 1 [(gogoproto.jsontag) = "task_guid"]; - string cell_id = 2 [(gogoproto.jsontag) = "cell_id"]; + string task_guid = 1 [json_name = "task_guid"]; + string cell_id = 2 [json_name = "cell_id"]; } message StartTaskResponse { Error error = 1; - bool should_start = 2 [(gogoproto.jsontag) = "should_start"]; + bool should_start = 2 [json_name = "should_start"]; } message FailTaskRequest { option deprecated = true; - string task_guid = 1 [(gogoproto.jsontag) = "task_guid"]; - string failure_reason = 2 [(gogoproto.jsontag) = "failure_reason"]; + string task_guid = 1 [json_name = "task_guid"]; + string failure_reason = 2 [json_name = "failure_reason"]; } message RejectTaskRequest { - string task_guid = 1 [(gogoproto.jsontag) = "task_guid"]; - string rejection_reason = 2 [(gogoproto.jsontag) = "rejection_reason"]; + string task_guid = 1 [json_name = "task_guid"]; + string rejection_reason = 2 [json_name = "rejection_reason"]; } message TaskGuidRequest { - string task_guid = 1 [(gogoproto.jsontag) = "task_guid"]; + string task_guid = 1 [json_name = "task_guid"]; } message CompleteTaskRequest { - string task_guid = 1 [(gogoproto.jsontag) = "task_guid"]; - string cell_id = 2 [(gogoproto.jsontag) = "cell_id"]; - bool failed = 3 [(gogoproto.jsontag) = "failed"]; - string failure_reason = 4 [(gogoproto.jsontag) = "failure_reason"]; - string result = 5 [(gogoproto.jsontag) = "result"]; + string task_guid = 1 [json_name = "task_guid"]; + string cell_id = 2 [json_name = "cell_id"]; + bool failed = 3 [json_name = "failed"]; + string failure_reason = 4 [json_name = "failure_reason"]; + string result = 5 [json_name = "result"]; } message TaskCallbackResponse { - string task_guid = 1 [(gogoproto.jsontag) = "task_guid"]; - bool failed = 2 [(gogoproto.jsontag) = "failed"]; - string failure_reason = 3 [(gogoproto.jsontag) = "failure_reason"]; - string result = 4 [(gogoproto.jsontag) = "result"]; + string task_guid = 1 [json_name = "task_guid"]; + bool failed = 2 [json_name = "failed"]; + string failure_reason = 3 [json_name = "failure_reason"]; + string result = 4 [json_name = "result"]; string annotation = 5; - int64 created_at = 6 [(gogoproto.jsontag) = "created_at"]; + int64 created_at = 6 [json_name = "created_at"]; } message TasksRequest{ - string domain = 1 [(gogoproto.jsontag) = "domain"]; - string cell_id = 2 [(gogoproto.jsontag) = "cell_id"]; + string domain = 1 [json_name = "domain"]; + string cell_id = 2 [json_name = "cell_id"]; } message TasksResponse{ @@ -69,7 +69,7 @@ message TasksResponse{ } message TaskByGuidRequest{ - string task_guid = 1 [(gogoproto.jsontag) = "task_guid"]; + string task_guid = 1 [json_name = "task_guid"]; } message TaskResponse{ diff --git a/models/volume_mount.proto b/models/volume_mount.proto index 0c92d01a..9097d3ff 100644 --- a/models/volume_mount.proto +++ b/models/volume_mount.proto @@ -7,22 +7,22 @@ option go_package="."; option (gogoproto.goproto_enum_prefix_all) = true; message SharedDevice { - string volume_id = 1 [(gogoproto.jsontag) = "volume_id"]; - string mount_config = 2 [(gogoproto.jsontag) = "mount_config"]; + string volume_id = 1 [json_name = "volume_id"]; + string mount_config = 2 [json_name = "mount_config"]; } message VolumeMount { reserved 2, 4, 5; - string driver = 1 [(gogoproto.jsontag) = "driver"]; - string container_dir = 3 [(gogoproto.jsontag) = "container_dir"]; - string mode = 6 [(gogoproto.jsontag) = "mode"]; + string driver = 1 [json_name = "driver"]; + string container_dir = 3 [json_name = "container_dir"]; + string mode = 6 [json_name = "mode"]; // oneof device { - SharedDevice shared = 7 [(gogoproto.jsontag) = "shared"]; + SharedDevice shared = 7 [json_name = "shared"]; // } } message VolumePlacement { - repeated string driver_names = 1 [(gogoproto.jsontag) = "driver_names"]; + repeated string driver_names = 1 [json_name = "driver_names"]; } From e5e054475fba6a991a454d1d52df0371cd0317a6 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 17:00:26 +0000 Subject: [PATCH 005/155] Protos: gogoproto.nullable true => optional --- models/desired_lrp.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 5486d47e..de919df9 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -57,7 +57,7 @@ message DesiredLRPRunInfo { int64 start_timeout_ms = 19 [json_name = "start_timeout_ms"]; - CertificateProperties certificate_properties = 20 [(gogoproto.nullable) = true]; + CertificateProperties certificate_properties = 20 [optional]; string image_username = 21; string image_password = 22; @@ -81,7 +81,7 @@ message DesiredLRPUpdate { oneof optional_instances { int32 instances = 1; } - ProtoRoutes routes = 2 [(gogoproto.nullable) = true, (gogoproto.customtype) = "Routes"]; + ProtoRoutes routes = 2 [optional, (gogoproto.customtype) = "Routes"]; oneof optional_annotation { string annotation = 3; } @@ -119,7 +119,7 @@ message DesiredLRP { uint32 cpu_weight = 12 [json_name = "cpu_weight"]; bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; - ProtoRoutes routes = 15 [(gogoproto.nullable) = true, (gogoproto.customtype) = "Routes"]; + ProtoRoutes routes = 15 [optional, (gogoproto.customtype) = "Routes"]; string log_source = 16 [json_name = "log_source"]; string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; @@ -134,7 +134,7 @@ message DesiredLRP { repeated string PlacementTags = 28 [json_name ="placement_tags,omitempty"]; int32 max_pids = 29 [json_name = "max_pids"]; - CertificateProperties certificate_properties = 30 [(gogoproto.nullable) = true]; + CertificateProperties certificate_properties = 30 [optional]; string image_username = 31; string image_password = 32; From 5fd44e1f1d07e79d0b7f9268edebaeee9a82c2e1 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 17:13:38 +0000 Subject: [PATCH 006/155] Protos: Remove gogoproto.nullable false (required fields are not valid in protobuf3) --- models/actual_lrp.proto | 8 ++++---- models/desired_lrp.proto | 14 +++++++------- models/events.proto | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index a62fe8ce..52435253 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -56,15 +56,15 @@ message ActualLRP { SUSPECT = 2 [(gogoproto.enumvalue_customname) = "Suspect"]; } - ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; - ActualLRPNetInfo actual_lrp_net_info = 3 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPKey actual_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "", (gogoproto.embed) = true]; + ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "", (gogoproto.embed) = true]; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ModificationTag modification_tag = 9 [(gogoproto.nullable) = false,json_name = "modification_tag"]; + ModificationTag modification_tag = 9 [,json_name = "modification_tag"]; Presence presence = 10 [json_name = "presence"]; repeated ActualLRPInternalRoute actual_lrp_internal_routes = 11; map metric_tags = 12; diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index de919df9..d73031cb 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -18,23 +18,23 @@ import "sidecar.proto"; import "log_rate_limit.proto"; message DesiredLRPSchedulingInfo { - DesiredLRPKey desired_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + DesiredLRPKey desired_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; string annotation = 2 [json_name = "annotation"]; int32 instances = 3 [json_name = "instances"]; - DesiredLRPResource desired_lrp_resource = 4 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + DesiredLRPResource desired_lrp_resource = 4 [json_name = "", (gogoproto.embed) = true]; - ProtoRoutes routes = 5 [(gogoproto.nullable) = false, (gogoproto.customtype) = "Routes"]; - ModificationTag modification_tag = 6 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ProtoRoutes routes = 5 [(gogoproto.customtype) = "Routes"]; + ModificationTag modification_tag = 6 [json_name = "", (gogoproto.embed) = true]; VolumePlacement volume_placement = 7; repeated string PlacementTags = 8 [json_name ="placement_tags,omitempty"]; } message DesiredLRPRunInfo { - DesiredLRPKey desired_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + DesiredLRPKey desired_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; - repeated EnvironmentVariable environment_variables = 2 [json_name = "env", (gogoproto.nullable) = false]; + repeated EnvironmentVariable environment_variables = 2 [json_name = "env"]; Action setup = 3; Action action = 4; Action monitor = 5; @@ -45,7 +45,7 @@ message DesiredLRPRunInfo { uint32 cpu_weight = 8 [json_name = "cpu_weight"]; repeated uint32 ports = 9 [packed = false]; - repeated SecurityGroupRule egress_rules = 10 [(gogoproto.nullable) = false]; + repeated SecurityGroupRule egress_rules = 10 []; string log_source = 11 [json_name = "log_source"]; string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid"]; int64 created_at = 13 [json_name = "created_at"]; diff --git a/models/events.proto b/models/events.proto index 7fbeb034..302ec85d 100644 --- a/models/events.proto +++ b/models/events.proto @@ -30,13 +30,13 @@ message ActualLRPInstanceCreatedEvent { } message ActualLRPInfo { - ActualLRPNetInfo actual_lrp_net_info = 3 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "", (gogoproto.embed) = true]; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ModificationTag modification_tag = 9 [(gogoproto.nullable) = false,json_name = "modification_tag"]; + ModificationTag modification_tag = 9 [,json_name = "modification_tag"]; ActualLRP.Presence presence = 10 [json_name = "presence"]; oneof optional_routable { bool Routable = 11; @@ -45,8 +45,8 @@ message ActualLRPInfo { } message ActualLRPInstanceChangedEvent { - ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPKey actual_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "", (gogoproto.embed) = true]; ActualLRPInfo before = 3; ActualLRPInfo after = 4; string trace_id = 5 [json_name = "trace_id"]; @@ -74,8 +74,8 @@ message DesiredLRPRemovedEvent { } message ActualLRPCrashedEvent { - ActualLRPKey actual_lrp_key = 1 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [(gogoproto.nullable) = false, json_name = "", (gogoproto.embed) = true]; + ActualLRPKey actual_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "", (gogoproto.embed) = true]; int32 crash_count = 3 [json_name = "crash_count"]; string crash_reason = 4; int64 since = 5 [json_name = "since"]; From 48cf8bc5a32f885d21f901a6f2ae3ea6638e868a Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 17:34:24 +0000 Subject: [PATCH 007/155] Protos: Remove gogoproto.embed --- models/actual_lrp.proto | 6 +++--- models/desired_lrp.proto | 8 ++++---- models/events.proto | 10 +++++----- models/task.proto | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 52435253..36cbf353 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -56,9 +56,9 @@ message ActualLRP { SUSPECT = 2 [(gogoproto.enumvalue_customname) = "Suspect"]; } - ActualLRPKey actual_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "", (gogoproto.embed) = true]; - ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "", (gogoproto.embed) = true]; + ActualLRPKey actual_lrp_key = 1 [json_name = ""]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = ""]; + ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = ""]; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index d73031cb..8dc157b8 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -18,21 +18,21 @@ import "sidecar.proto"; import "log_rate_limit.proto"; message DesiredLRPSchedulingInfo { - DesiredLRPKey desired_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; + DesiredLRPKey desired_lrp_key = 1 [json_name = ""]; string annotation = 2 [json_name = "annotation"]; int32 instances = 3 [json_name = "instances"]; - DesiredLRPResource desired_lrp_resource = 4 [json_name = "", (gogoproto.embed) = true]; + DesiredLRPResource desired_lrp_resource = 4 [json_name = ""]; ProtoRoutes routes = 5 [(gogoproto.customtype) = "Routes"]; - ModificationTag modification_tag = 6 [json_name = "", (gogoproto.embed) = true]; + ModificationTag modification_tag = 6 [json_name = ""]; VolumePlacement volume_placement = 7; repeated string PlacementTags = 8 [json_name ="placement_tags,omitempty"]; } message DesiredLRPRunInfo { - DesiredLRPKey desired_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; + DesiredLRPKey desired_lrp_key = 1 [json_name = ""]; repeated EnvironmentVariable environment_variables = 2 [json_name = "env"]; Action setup = 3; diff --git a/models/events.proto b/models/events.proto index 302ec85d..03066d9c 100644 --- a/models/events.proto +++ b/models/events.proto @@ -30,7 +30,7 @@ message ActualLRPInstanceCreatedEvent { } message ActualLRPInfo { - ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "", (gogoproto.embed) = true]; + ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = ""]; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; @@ -45,8 +45,8 @@ message ActualLRPInfo { } message ActualLRPInstanceChangedEvent { - ActualLRPKey actual_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "", (gogoproto.embed) = true]; + ActualLRPKey actual_lrp_key = 1 [json_name = ""]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = ""]; ActualLRPInfo before = 3; ActualLRPInfo after = 4; string trace_id = 5 [json_name = "trace_id"]; @@ -74,8 +74,8 @@ message DesiredLRPRemovedEvent { } message ActualLRPCrashedEvent { - ActualLRPKey actual_lrp_key = 1 [json_name = "", (gogoproto.embed) = true]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "", (gogoproto.embed) = true]; + ActualLRPKey actual_lrp_key = 1 [json_name = ""]; + ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = ""]; int32 crash_count = 3 [json_name = "crash_count"]; string crash_reason = 4; int64 since = 5 [json_name = "since"]; diff --git a/models/task.proto b/models/task.proto index 50e727c9..8d5cd4d9 100644 --- a/models/task.proto +++ b/models/task.proto @@ -55,7 +55,7 @@ message Task { Resolving = 4; } - TaskDefinition task_definition = 1 [json_name = "", (gogoproto.embed) = true]; + TaskDefinition task_definition = 1 [json_name = ""]; string task_guid = 2 [json_name = "task_guid"]; string domain = 3 [json_name = "domain"]; From 4877689c79c22dc7cf84b5ffaa80f8530f7003d0 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 18:41:11 +0000 Subject: [PATCH 008/155] Protos: Remove gogoproto.customtype --- models/desired_lrp.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 8dc157b8..5bddd4bd 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -25,7 +25,7 @@ message DesiredLRPSchedulingInfo { DesiredLRPResource desired_lrp_resource = 4 [json_name = ""]; - ProtoRoutes routes = 5 [(gogoproto.customtype) = "Routes"]; + ProtoRoutes routes = 5; ModificationTag modification_tag = 6 [json_name = ""]; VolumePlacement volume_placement = 7; repeated string PlacementTags = 8 [json_name ="placement_tags,omitempty"]; @@ -81,7 +81,7 @@ message DesiredLRPUpdate { oneof optional_instances { int32 instances = 1; } - ProtoRoutes routes = 2 [optional, (gogoproto.customtype) = "Routes"]; + ProtoRoutes routes = 2 [optional]; oneof optional_annotation { string annotation = 3; } @@ -119,7 +119,7 @@ message DesiredLRP { uint32 cpu_weight = 12 [json_name = "cpu_weight"]; bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; - ProtoRoutes routes = 15 [optional, (gogoproto.customtype) = "Routes"]; + ProtoRoutes routes = 15 [optional]; string log_source = 16 [json_name = "log_source"]; string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; From 00239cc092e14168e7bb2f567809cc7ac6681ffa Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 18:44:30 +0000 Subject: [PATCH 009/155] Protos: gogoproto.enumvalue_customname => string_name --- models/actual_lrp.proto | 12 ++++++------ models/image_layer.proto | 14 +++++++------- models/metric_tags.proto | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 36cbf353..d7c5bf28 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -37,9 +37,9 @@ message ActualLRPNetInfo { string instance_address = 3; enum PreferredAddress { - UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "PreferredAddressUnknown"]; - INSTANCE = 1 [(gogoproto.enumvalue_customname) = "PreferredAddressInstance"]; - HOST = 2 [(gogoproto.enumvalue_customname) = "PreferredAddressHost"]; + UNKNOWN = 0 [(string_name) = "PreferredAddressUnknown"]; + INSTANCE = 1 [(string_name) = "PreferredAddressInstance"]; + HOST = 2 [(string_name) = "PreferredAddressHost"]; } PreferredAddress preferred_address = 4 [json_name = "preferred_address"]; @@ -51,9 +51,9 @@ message ActualLRPInternalRoute { message ActualLRP { enum Presence { - ORDINARY = 0 [(gogoproto.enumvalue_customname) = "Ordinary"]; - EVACUATING = 1 [(gogoproto.enumvalue_customname) = "Evacuating"]; - SUSPECT = 2 [(gogoproto.enumvalue_customname) = "Suspect"]; + ORDINARY = 0 [(string_name) = "Ordinary"]; + EVACUATING = 1 [(string_name) = "Evacuating"]; + SUSPECT = 2 [(string_name) = "Suspect"]; } ActualLRPKey actual_lrp_key = 1 [json_name = ""]; diff --git a/models/image_layer.proto b/models/image_layer.proto index 3039cd2d..751c7cef 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -7,21 +7,21 @@ option go_package="."; message ImageLayer { enum DigestAlgorithm { DigestAlgorithmInvalid = 0; // not camel cased since it isn't supposed to be used by API users - SHA256 = 1 [(gogoproto.enumvalue_customname) = "DigestAlgorithmSha256"]; - SHA512 = 2 [(gogoproto.enumvalue_customname) = "DigestAlgorithmSha512", deprecated=true]; + SHA256 = 1 [(string_name) = "DigestAlgorithmSha256"]; + SHA512 = 2 [(string_name) = "DigestAlgorithmSha512", deprecated=true]; } enum MediaType { MediaTypeInvalid = 0; // not camel cased since it isn't supposed to be used by API users - TGZ = 1 [(gogoproto.enumvalue_customname) = "MediaTypeTgz"]; - TAR = 2 [(gogoproto.enumvalue_customname) = "MediaTypeTar"]; - ZIP = 3 [(gogoproto.enumvalue_customname) = "MediaTypeZip"]; + TGZ = 1 [(string_name) = "MediaTypeTgz"]; + TAR = 2 [(string_name) = "MediaTypeTar"]; + ZIP = 3 [(string_name) = "MediaTypeZip"]; } enum Type { LayerTypeInvalid = 0; // not camel cased since it isn't supposed to be used by API users - SHARED = 1 [(gogoproto.enumvalue_customname) = "LayerTypeShared"]; - EXCLUSIVE = 2 [(gogoproto.enumvalue_customname) = "LayerTypeExclusive"]; + SHARED = 1 [(string_name) = "LayerTypeShared"]; + EXCLUSIVE = 2 [(string_name) = "LayerTypeExclusive"]; } string name = 1; diff --git a/models/metric_tags.proto b/models/metric_tags.proto index a39741e3..f8fc11d7 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -7,8 +7,8 @@ option go_package="."; message MetricTagValue { enum DynamicValue { DynamicValueInvalid = 0; - INDEX = 1 [(gogoproto.enumvalue_customname) = "MetricTagDynamicValueIndex"]; - INSTANCE_GUID = 2 [(gogoproto.enumvalue_customname) = "MetricTagDynamicValueInstanceGuid"]; + INDEX = 1 [(string_name) = "MetricTagDynamicValueIndex"]; + INSTANCE_GUID = 2 [(string_name) = "MetricTagDynamicValueInstanceGuid"]; } // Note: we only expect one of the following set of fields to be From 9555f3c273efdf6801609846eb225b0be2fea382 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 19:05:08 +0000 Subject: [PATCH 010/155] Protos: Remove gogoproto.goproto_enum_prefix_all --- models/actual_lrp.proto | 2 -- models/cached_dependency.proto | 3 --- models/error.proto | 2 -- models/network.proto | 3 --- models/task.proto | 2 -- models/volume_mount.proto | 3 --- 6 files changed, 15 deletions(-) diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index d7c5bf28..1f28396d 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -5,8 +5,6 @@ option go_package="."; import "modification_tag.proto"; -option (gogoproto.goproto_enum_prefix_all) = true; - message ActualLRPGroup { option deprecated = true; ActualLRP instance = 1; diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index 7e5b124d..1801a0a4 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -3,9 +3,6 @@ syntax = "proto3"; package models; option go_package="."; - -option (gogoproto.goproto_enum_prefix_all) = true; - message CachedDependency { string name = 1 [json_name = "name"]; string from = 2 [json_name = "from"]; diff --git a/models/error.proto b/models/error.proto index 9b1c2d22..306c4c99 100644 --- a/models/error.proto +++ b/models/error.proto @@ -3,9 +3,7 @@ syntax = "proto3"; package models; option go_package="."; - option (gogoproto.equal_all) = false; -option (gogoproto.goproto_enum_prefix_all) = true; message Error { enum Type { diff --git a/models/network.proto b/models/network.proto index cf3db671..0459c7b2 100644 --- a/models/network.proto +++ b/models/network.proto @@ -3,9 +3,6 @@ syntax = "proto3"; package models; option go_package="."; - -option (gogoproto.goproto_enum_prefix_all) = true; - message Network { map properties = 1 [json_name = "properties,omitempty"]; } diff --git a/models/task.proto b/models/task.proto index 8d5cd4d9..f231304a 100644 --- a/models/task.proto +++ b/models/task.proto @@ -14,8 +14,6 @@ import "image_layer.proto"; import "log_rate_limit.proto"; import "metric_tags.proto"; -option (gogoproto.goproto_enum_prefix_all) = true; - message TaskDefinition { string root_fs = 1 [json_name = "rootfs"]; repeated EnvironmentVariable environment_variables = 2 [json_name = "env,omitempty"]; diff --git a/models/volume_mount.proto b/models/volume_mount.proto index 9097d3ff..070620df 100644 --- a/models/volume_mount.proto +++ b/models/volume_mount.proto @@ -3,9 +3,6 @@ syntax = "proto3"; package models; option go_package="."; - -option (gogoproto.goproto_enum_prefix_all) = true; - message SharedDevice { string volume_id = 1 [json_name = "volume_id"]; string mount_config = 2 [json_name = "mount_config"]; From 80c95023a3f31956c55ff9639fb20fd4892fcd9f Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 22:12:07 +0000 Subject: [PATCH 011/155] Protos: Remove string_name from enums (does not work) --- models/actual_lrp.proto | 12 ++++++------ models/desired_lrp.proto | 2 +- models/image_layer.proto | 14 +++++++------- models/metric_tags.proto | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 1f28396d..31de3f59 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -35,9 +35,9 @@ message ActualLRPNetInfo { string instance_address = 3; enum PreferredAddress { - UNKNOWN = 0 [(string_name) = "PreferredAddressUnknown"]; - INSTANCE = 1 [(string_name) = "PreferredAddressInstance"]; - HOST = 2 [(string_name) = "PreferredAddressHost"]; + UNKNOWN = 0; + INSTANCE = 1; + HOST = 2; } PreferredAddress preferred_address = 4 [json_name = "preferred_address"]; @@ -49,9 +49,9 @@ message ActualLRPInternalRoute { message ActualLRP { enum Presence { - ORDINARY = 0 [(string_name) = "Ordinary"]; - EVACUATING = 1 [(string_name) = "Evacuating"]; - SUSPECT = 2 [(string_name) = "Suspect"]; + ORDINARY = 0; + EVACUATING = 1; + SUSPECT = 2; } ActualLRPKey actual_lrp_key = 1 [json_name = ""]; diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 5bddd4bd..1db051ac 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -45,7 +45,7 @@ message DesiredLRPRunInfo { uint32 cpu_weight = 8 [json_name = "cpu_weight"]; repeated uint32 ports = 9 [packed = false]; - repeated SecurityGroupRule egress_rules = 10 []; + repeated SecurityGroupRule egress_rules = 10; string log_source = 11 [json_name = "log_source"]; string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid"]; int64 created_at = 13 [json_name = "created_at"]; diff --git a/models/image_layer.proto b/models/image_layer.proto index 751c7cef..c85d1f24 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -7,21 +7,21 @@ option go_package="."; message ImageLayer { enum DigestAlgorithm { DigestAlgorithmInvalid = 0; // not camel cased since it isn't supposed to be used by API users - SHA256 = 1 [(string_name) = "DigestAlgorithmSha256"]; - SHA512 = 2 [(string_name) = "DigestAlgorithmSha512", deprecated=true]; + SHA256 = 1; + SHA512 = 2 [deprecated=true]; } enum MediaType { MediaTypeInvalid = 0; // not camel cased since it isn't supposed to be used by API users - TGZ = 1 [(string_name) = "MediaTypeTgz"]; - TAR = 2 [(string_name) = "MediaTypeTar"]; - ZIP = 3 [(string_name) = "MediaTypeZip"]; + TGZ = 1; + TAR = 2; + ZIP = 3; } enum Type { LayerTypeInvalid = 0; // not camel cased since it isn't supposed to be used by API users - SHARED = 1 [(string_name) = "LayerTypeShared"]; - EXCLUSIVE = 2 [(string_name) = "LayerTypeExclusive"]; + SHARED = 1; + EXCLUSIVE = 2; } string name = 1; diff --git a/models/metric_tags.proto b/models/metric_tags.proto index f8fc11d7..bf14d701 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -7,8 +7,8 @@ option go_package="."; message MetricTagValue { enum DynamicValue { DynamicValueInvalid = 0; - INDEX = 1 [(string_name) = "MetricTagDynamicValueIndex"]; - INSTANCE_GUID = 2 [(string_name) = "MetricTagDynamicValueInstanceGuid"]; + INDEX = 1; + INSTANCE_GUID = 2; } // Note: we only expect one of the following set of fields to be From 36c0c749e49ebc7ed5dcf9ec36fd6d3feade519f Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 5 Mar 2024 22:22:48 +0000 Subject: [PATCH 012/155] Protos: Remove gogoproto.equal_all --- models/actual_lrp.proto | 2 +- models/domain.proto | 2 -- models/error.proto | 2 -- models/evacuation.proto | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 31de3f59..333e7217 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -62,7 +62,7 @@ message ActualLRP { string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ModificationTag modification_tag = 9 [,json_name = "modification_tag"]; + ModificationTag modification_tag = 9 [json_name = "modification_tag"]; Presence presence = 10 [json_name = "presence"]; repeated ActualLRPInternalRoute actual_lrp_internal_routes = 11; map metric_tags = 12; diff --git a/models/domain.proto b/models/domain.proto index 342deb05..305f53d2 100644 --- a/models/domain.proto +++ b/models/domain.proto @@ -5,8 +5,6 @@ option go_package="."; import "error.proto"; -option (gogoproto.equal_all) = false; - message DomainsResponse { Error error = 1; repeated string domains = 2; diff --git a/models/error.proto b/models/error.proto index 306c4c99..3cc47862 100644 --- a/models/error.proto +++ b/models/error.proto @@ -3,8 +3,6 @@ syntax = "proto3"; package models; option go_package="."; -option (gogoproto.equal_all) = false; - message Error { enum Type { reserved 1, 2, 10, 20, 22, 23, 25; // previously used and removed values diff --git a/models/evacuation.proto b/models/evacuation.proto index b5b5c8e1..7a4c1637 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -6,8 +6,6 @@ option go_package="."; import "actual_lrp.proto"; import "error.proto"; -option (gogoproto.equal_all) = false; - message EvacuationResponse { Error error = 1; bool keep_container = 2 [json_name = "keep_container"]; From cbd3c0f9fec89a380577389dc58463039bd47bc4 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 6 Mar 2024 16:59:01 +0000 Subject: [PATCH 013/155] Protos: Move optional to beginning of line Remove json_name definitions where not needed --- models/actual_lrp.proto | 6 +++--- models/desired_lrp.proto | 16 ++++++++-------- models/events.proto | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 333e7217..8f4f5623 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -54,9 +54,9 @@ message ActualLRP { SUSPECT = 2; } - ActualLRPKey actual_lrp_key = 1 [json_name = ""]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = ""]; - ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = ""]; + ActualLRPKey actual_lrp_key = 1; + ActualLRPInstanceKey actual_lrp_instance_key = 2; + ActualLRPNetInfo actual_lrp_net_info = 3; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 1db051ac..dc7e72e2 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -18,21 +18,21 @@ import "sidecar.proto"; import "log_rate_limit.proto"; message DesiredLRPSchedulingInfo { - DesiredLRPKey desired_lrp_key = 1 [json_name = ""]; + DesiredLRPKey desired_lrp_key = 1; string annotation = 2 [json_name = "annotation"]; int32 instances = 3 [json_name = "instances"]; - DesiredLRPResource desired_lrp_resource = 4 [json_name = ""]; + DesiredLRPResource desired_lrp_resource = 4; ProtoRoutes routes = 5; - ModificationTag modification_tag = 6 [json_name = ""]; + ModificationTag modification_tag = 6; VolumePlacement volume_placement = 7; repeated string PlacementTags = 8 [json_name ="placement_tags,omitempty"]; } message DesiredLRPRunInfo { - DesiredLRPKey desired_lrp_key = 1 [json_name = ""]; + DesiredLRPKey desired_lrp_key = 1; repeated EnvironmentVariable environment_variables = 2 [json_name = "env"]; Action setup = 3; @@ -57,7 +57,7 @@ message DesiredLRPRunInfo { int64 start_timeout_ms = 19 [json_name = "start_timeout_ms"]; - CertificateProperties certificate_properties = 20 [optional]; + optional CertificateProperties certificate_properties = 20; string image_username = 21; string image_password = 22; @@ -81,7 +81,7 @@ message DesiredLRPUpdate { oneof optional_instances { int32 instances = 1; } - ProtoRoutes routes = 2 [optional]; + optional ProtoRoutes routes = 2; oneof optional_annotation { string annotation = 3; } @@ -119,7 +119,7 @@ message DesiredLRP { uint32 cpu_weight = 12 [json_name = "cpu_weight"]; bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; - ProtoRoutes routes = 15 [optional]; + optional ProtoRoutes routes = 15; string log_source = 16 [json_name = "log_source"]; string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; @@ -134,7 +134,7 @@ message DesiredLRP { repeated string PlacementTags = 28 [json_name ="placement_tags,omitempty"]; int32 max_pids = 29 [json_name = "max_pids"]; - CertificateProperties certificate_properties = 30 [optional]; + optional CertificateProperties certificate_properties = 30; string image_username = 31; string image_password = 32; diff --git a/models/events.proto b/models/events.proto index 03066d9c..fb2285da 100644 --- a/models/events.proto +++ b/models/events.proto @@ -30,13 +30,13 @@ message ActualLRPInstanceCreatedEvent { } message ActualLRPInfo { - ActualLRPNetInfo actual_lrp_net_info = 3 [json_name = ""]; + ActualLRPNetInfo actual_lrp_net_info = 3; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ModificationTag modification_tag = 9 [,json_name = "modification_tag"]; + ModificationTag modification_tag = 9 [json_name = "modification_tag"]; ActualLRP.Presence presence = 10 [json_name = "presence"]; oneof optional_routable { bool Routable = 11; @@ -45,8 +45,8 @@ message ActualLRPInfo { } message ActualLRPInstanceChangedEvent { - ActualLRPKey actual_lrp_key = 1 [json_name = ""]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = ""]; + ActualLRPKey actual_lrp_key = 1; + ActualLRPInstanceKey actual_lrp_instance_key = 2; ActualLRPInfo before = 3; ActualLRPInfo after = 4; string trace_id = 5 [json_name = "trace_id"]; @@ -74,8 +74,8 @@ message DesiredLRPRemovedEvent { } message ActualLRPCrashedEvent { - ActualLRPKey actual_lrp_key = 1 [json_name = ""]; - ActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = ""]; + ActualLRPKey actual_lrp_key = 1; + ActualLRPInstanceKey actual_lrp_instance_key = 2; int32 crash_count = 3 [json_name = "crash_count"]; string crash_reason = 4; int64 since = 5 [json_name = "since"]; From ddc9896a999330ad5a27d4e98c06ce96fe9ca3eb Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 6 Mar 2024 21:09:42 +0000 Subject: [PATCH 014/155] Protos: Change option go_package to code.cloudfoundry.org/bbs/models --- models/actions.proto | 2 +- models/actual_lrp.proto | 2 +- models/actual_lrp_requests.proto | 2 +- models/cached_dependency.proto | 2 +- models/cells.proto | 2 +- models/certificate_properties.proto | 2 +- models/check_definition.proto | 2 +- models/desired_lrp.proto | 2 +- models/desired_lrp_requests.proto | 2 +- models/domain.proto | 2 +- models/environment_variables.proto | 2 +- models/error.proto | 2 +- models/evacuation.proto | 2 +- models/events.proto | 2 +- models/image_layer.proto | 2 +- models/log_rate_limit.proto | 2 +- models/metric_tags.proto | 2 +- models/modification_tag.proto | 2 +- models/network.proto | 2 +- models/ping.proto | 2 +- models/security_group.proto | 2 +- models/sidecar.proto | 2 +- models/task.proto | 2 +- models/task_requests.proto | 2 +- models/volume_mount.proto | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/models/actions.proto b/models/actions.proto index 36acbb9a..6a6bac12 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "environment_variables.proto"; diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 8f4f5623..c44b7eb5 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "modification_tag.proto"; diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index 1b387643..6bf48cf9 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "actual_lrp.proto"; import "error.proto"; diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index 1801a0a4..f4aa2ed7 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message CachedDependency { string name = 1 [json_name = "name"]; diff --git a/models/cells.proto b/models/cells.proto index 3431dc91..78e7799c 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "error.proto"; diff --git a/models/certificate_properties.proto b/models/certificate_properties.proto index 853faf70..0cfe3a4b 100644 --- a/models/certificate_properties.proto +++ b/models/certificate_properties.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message CertificateProperties { repeated string organizational_unit = 1; diff --git a/models/check_definition.proto b/models/check_definition.proto index 2f6740e6..e6f793d5 100644 --- a/models/check_definition.proto +++ b/models/check_definition.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message CheckDefinition { diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index dc7e72e2..5468f792 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "actions.proto"; import "cached_dependency.proto"; diff --git a/models/desired_lrp_requests.proto b/models/desired_lrp_requests.proto index 39ca2c84..02db6249 100644 --- a/models/desired_lrp_requests.proto +++ b/models/desired_lrp_requests.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "desired_lrp.proto"; import "error.proto"; diff --git a/models/domain.proto b/models/domain.proto index 305f53d2..2317c716 100644 --- a/models/domain.proto +++ b/models/domain.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "error.proto"; diff --git a/models/environment_variables.proto b/models/environment_variables.proto index 524bb23e..1954f164 100644 --- a/models/environment_variables.proto +++ b/models/environment_variables.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message EnvironmentVariable { diff --git a/models/error.proto b/models/error.proto index 3cc47862..789b4241 100644 --- a/models/error.proto +++ b/models/error.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message Error { enum Type { diff --git a/models/evacuation.proto b/models/evacuation.proto index 7a4c1637..9d1467b4 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "actual_lrp.proto"; import "error.proto"; diff --git a/models/events.proto b/models/events.proto index fb2285da..383054a0 100644 --- a/models/events.proto +++ b/models/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "actual_lrp.proto"; import "desired_lrp.proto"; diff --git a/models/image_layer.proto b/models/image_layer.proto index c85d1f24..67664b87 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message ImageLayer { diff --git a/models/log_rate_limit.proto b/models/log_rate_limit.proto index d2723ba1..27f0ab6c 100644 --- a/models/log_rate_limit.proto +++ b/models/log_rate_limit.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message LogRateLimit { int64 bytes_per_second = 1; diff --git a/models/metric_tags.proto b/models/metric_tags.proto index bf14d701..db82f7bb 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message MetricTagValue { diff --git a/models/modification_tag.proto b/models/modification_tag.proto index 428331b5..fab94553 100644 --- a/models/modification_tag.proto +++ b/models/modification_tag.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message ModificationTag { diff --git a/models/network.proto b/models/network.proto index 0459c7b2..9faf00b9 100644 --- a/models/network.proto +++ b/models/network.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message Network { map properties = 1 [json_name = "properties,omitempty"]; diff --git a/models/ping.proto b/models/ping.proto index 0711bfc0..54d5b834 100644 --- a/models/ping.proto +++ b/models/ping.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message PingResponse { diff --git a/models/security_group.proto b/models/security_group.proto index 12231965..4371ceb7 100644 --- a/models/security_group.proto +++ b/models/security_group.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message PortRange { diff --git a/models/sidecar.proto b/models/sidecar.proto index 12a06b97..8b126555 100644 --- a/models/sidecar.proto +++ b/models/sidecar.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "actions.proto"; diff --git a/models/task.proto b/models/task.proto index f231304a..f9bd9817 100644 --- a/models/task.proto +++ b/models/task.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "actions.proto"; import "environment_variables.proto"; diff --git a/models/task_requests.proto b/models/task_requests.proto index 88ceb036..3e1693a8 100644 --- a/models/task_requests.proto +++ b/models/task_requests.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; import "task.proto"; import "error.proto"; diff --git a/models/volume_mount.proto b/models/volume_mount.proto index 070620df..d352d41b 100644 --- a/models/volume_mount.proto +++ b/models/volume_mount.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package models; -option go_package="."; +option go_package="code.cloudfoundry.org/bbs/models"; message SharedDevice { string volume_id = 1 [json_name = "volume_id"]; From 4ded52368ad6cb68e79e6bbe4070242da7fd4ce5 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 6 Mar 2024 21:31:39 +0000 Subject: [PATCH 015/155] Protos: omitempty no longer needed (protobuf always adds it) --- models/actions.proto | 20 ++++++++++---------- models/cells.proto | 2 +- models/desired_lrp.proto | 8 ++++---- models/network.proto | 2 +- models/task.proto | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/actions.proto b/models/actions.proto index 6a6bac12..bdd90187 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -15,15 +15,15 @@ message Action { // disadvantages of using multiple optionals without onlyone: // - writing our own GetAction/SetAction methods // action oneof { - DownloadAction download_action = 1 [json_name = "download,omitempty"]; - UploadAction upload_action = 2 [json_name = "upload,omitempty"]; - RunAction run_action = 3 [json_name = "run,omitempty"]; - TimeoutAction timeout_action = 4 [json_name = "timeout,omitempty"]; - EmitProgressAction emit_progress_action = 5 [json_name = "emit_progress,omitempty"]; - TryAction try_action = 6 [json_name = "try,omitempty"]; - ParallelAction parallel_action = 7 [json_name = "parallel,omitempty"]; - SerialAction serial_action = 8 [json_name = "serial,omitempty"]; - CodependentAction codependent_action = 9 [json_name = "codependent,omitempty"]; + DownloadAction download_action = 1 [json_name="download"]; + UploadAction upload_action = 2 [json_name = "upload"]; + RunAction run_action = 3 [json_name = "run"]; + TimeoutAction timeout_action = 4 [json_name = "timeout"]; + EmitProgressAction emit_progress_action = 5 [json_name = "emit_progress"]; + TryAction try_action = 6 [json_name = "try"]; + ParallelAction parallel_action = 7 [json_name = "parallel"]; + SerialAction serial_action = 8 [json_name = "serial"]; + CodependentAction codependent_action = 9 [json_name = "codependent"]; // } } @@ -59,7 +59,7 @@ message RunAction { message TimeoutAction { Action action = 1; - int64 deprecated_timeout_ns = 2 [json_name = "timeout,omitempty", deprecated=true]; + int64 deprecated_timeout_ns = 2 [json_name = "timeout", deprecated=true]; string log_source = 3; int64 timeout_ms = 4 [json_name = "timeout_ms"]; } diff --git a/models/cells.proto b/models/cells.proto index 78e7799c..9dcdb4f9 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -16,7 +16,7 @@ message CellPresence { string rep_address = 2 [json_name = "rep_address"]; string zone = 3 [json_name = "zone"]; CellCapacity capacity = 4; - repeated Provider rootfs_providers = 5 [json_name = "rootfs_provider_list,omitempty"]; + repeated Provider rootfs_providers = 5 [json_name = "rootfs_provider_list"]; repeated string placement_tags = 6; repeated string optional_placement_tags = 7; string rep_url = 8 [json_name = "rep_url"]; diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 5468f792..0307a8db 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -28,7 +28,7 @@ message DesiredLRPSchedulingInfo { ProtoRoutes routes = 5; ModificationTag modification_tag = 6; VolumePlacement volume_placement = 7; - repeated string PlacementTags = 8 [json_name ="placement_tags,omitempty"]; + repeated string PlacementTags = 8 [json_name ="placement_tags"]; } message DesiredLRPRunInfo { @@ -39,7 +39,7 @@ message DesiredLRPRunInfo { Action action = 4; Action monitor = 5; - uint32 deprecated_start_timeout_s = 6 [json_name = "start_timeout,omitempty", deprecated=true]; + uint32 deprecated_start_timeout_s = 6 [json_name = "start_timeout", deprecated=true]; bool privileged = 7 [json_name = "privileged"]; @@ -111,7 +111,7 @@ message DesiredLRP { Action action = 7; int64 start_timeout_ms = 27 [json_name = "start_timeout_ms"]; - uint32 deprecated_start_timeout_s = 8 [json_name = "deprecated_timeout_ns,omitempty", deprecated=true]; + uint32 deprecated_start_timeout_s = 8 [json_name = "deprecated_timeout_ns", deprecated=true]; Action monitor = 9; int32 disk_mb = 10 [json_name = "disk_mb"]; @@ -131,7 +131,7 @@ message DesiredLRP { string trusted_system_certificates_path = 24; repeated VolumeMount volume_mounts = 25; Network network = 26; - repeated string PlacementTags = 28 [json_name ="placement_tags,omitempty"]; + repeated string PlacementTags = 28 [json_name ="placement_tags"]; int32 max_pids = 29 [json_name = "max_pids"]; optional CertificateProperties certificate_properties = 30; diff --git a/models/network.proto b/models/network.proto index 9faf00b9..d5161f6a 100644 --- a/models/network.proto +++ b/models/network.proto @@ -4,5 +4,5 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; message Network { - map properties = 1 [json_name = "properties,omitempty"]; + map properties = 1 [json_name = "properties"]; } diff --git a/models/task.proto b/models/task.proto index f9bd9817..a1ffb207 100644 --- a/models/task.proto +++ b/models/task.proto @@ -16,7 +16,7 @@ import "metric_tags.proto"; message TaskDefinition { string root_fs = 1 [json_name = "rootfs"]; - repeated EnvironmentVariable environment_variables = 2 [json_name = "env,omitempty"]; + repeated EnvironmentVariable environment_variables = 2 [json_name = "env"]; Action action = 3; int32 disk_mb = 4 [json_name = "disk_mb"]; int32 memory_mb = 5 [json_name = "memory_mb"]; From 8c79821af4da4d830a3b732a78b1cb7c83fa1c27 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 2 Apr 2024 15:04:29 +0000 Subject: [PATCH 016/155] Protos: Change oneof optionals to actual optionals (oneofs weren't being used correctly) --- models/actions.proto | 8 ++------ models/actual_lrp.proto | 4 +--- models/actual_lrp_requests.proto | 8 ++------ models/desired_lrp.proto | 8 ++------ models/evacuation.proto | 4 +--- models/events.proto | 4 +--- 6 files changed, 9 insertions(+), 27 deletions(-) diff --git a/models/actions.proto b/models/actions.proto index bdd90187..b5ac469f 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -93,10 +93,6 @@ message CodependentAction { } message ResourceLimits { - oneof optional_nofile { - uint64 nofile = 1; - } - oneof optional_nproc { - uint64 nproc = 2 [deprecated=true]; - } + optional uint64 nofile = 1; + optional uint64 nproc = 2 [deprecated=true]; } diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index c44b7eb5..370ffc1e 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -66,8 +66,6 @@ message ActualLRP { Presence presence = 10 [json_name = "presence"]; repeated ActualLRPInternalRoute actual_lrp_internal_routes = 11; map metric_tags = 12; - oneof optional_routable { - bool routable = 13 [json_name = "routable"]; - } + optional bool routable = 13 [json_name = "routable"]; string availability_zone = 14 [json_name = "availability_zone"]; } diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index 6bf48cf9..8e425498 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -51,9 +51,7 @@ message StartActualLRPRequest { ActualLRPNetInfo actual_lrp_net_info = 3; repeated ActualLRPInternalRoute actual_lrp_internal_routes = 4; map metric_tags = 5; - oneof optional_routable { - bool Routable = 6; - } + optional bool Routable = 6; string availability_zone = 7 [json_name= "availability_zone"]; } @@ -87,8 +85,6 @@ message ActualLRPsRequest { string domain = 1 [json_name = "domain"]; string cell_id = 2 [json_name = "cell_id"]; string process_guid = 3 [json_name = "process_guid"]; - oneof optional_index { - int32 index = 4 [json_name = "index"]; - } + optional int32 index = 4 [json_name = "index"]; } diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 0307a8db..039ff5ca 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -78,13 +78,9 @@ message ProtoRoutes { } message DesiredLRPUpdate { - oneof optional_instances { - int32 instances = 1; - } + optional int32 instances = 1; optional ProtoRoutes routes = 2; - oneof optional_annotation { - string annotation = 3; - } + optional string annotation = 3; map metric_tags = 4; } diff --git a/models/evacuation.proto b/models/evacuation.proto index 9d1467b4..65cba247 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -24,9 +24,7 @@ message EvacuateRunningActualLRPRequest { ActualLRPNetInfo actual_lrp_net_info = 3; repeated ActualLRPInternalRoute actual_lrp_internal_routes = 5; map metric_tags = 6; - oneof optional_routable { - bool Routable = 7; - } + optional bool Routable = 7; string availability_zone = 8 [json_name = "availability_zone"]; } diff --git a/models/events.proto b/models/events.proto index 383054a0..4c3fb28c 100644 --- a/models/events.proto +++ b/models/events.proto @@ -38,9 +38,7 @@ message ActualLRPInfo { int64 since = 8 [json_name = "since"]; ModificationTag modification_tag = 9 [json_name = "modification_tag"]; ActualLRP.Presence presence = 10 [json_name = "presence"]; - oneof optional_routable { - bool Routable = 11; - } + optional bool Routable = 11; string availability_zone = 12 [json_name = "availability_zone"]; } From dec68b327d1781006a748fcc6a285b3e5ca18067 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 4 Apr 2024 15:53:56 +0000 Subject: [PATCH 017/155] Move gogoproto files to their own directory --- {models => protomodels}/actions.gogoproto.go | 16 ++++------------ {models => protomodels}/actual_lrp.gogoproto.go | 2 +- .../actual_lrp_requests.gogoproto.go | 2 +- .../cached_dependency.gogoproto.go | 2 +- {models => protomodels}/cells.gogoproto.go | 2 +- .../certificate_properties.gogoproto.go | 2 +- .../check_definition.gogoproto.go | 2 +- {models => protomodels}/desired_lrp.gogoproto.go | 2 +- .../desired_lrp_requests.gogoproto.go | 2 +- {models => protomodels}/domain.gogoproto.go | 2 +- .../environment_variables.gogoproto.go | 2 +- {models => protomodels}/error.gogoproto.go | 2 +- {models => protomodels}/evacuation.gogoproto.go | 2 +- {models => protomodels}/events.gogoproto.go | 2 +- {models => protomodels}/image_layer.gogoproto.go | 2 +- .../log_rate_limit.gogoproto.go | 2 +- {models => protomodels}/metric_tags.gogoproto.go | 2 +- .../modification_tag.gogoproto.go | 2 +- {models => protomodels}/network.gogoproto.go | 2 +- {models => protomodels}/ping.gogoproto.go | 2 +- .../security_group.gogoproto.go | 2 +- {models => protomodels}/sidecar.gogoproto.go | 2 +- {models => protomodels}/task.gogoproto.go | 2 +- .../task_requests.gogoproto.go | 2 +- .../volume_mount.gogoproto.go | 2 +- 25 files changed, 28 insertions(+), 36 deletions(-) rename {models => protomodels}/actions.gogoproto.go (99%) rename {models => protomodels}/actual_lrp.gogoproto.go (99%) rename {models => protomodels}/actual_lrp_requests.gogoproto.go (99%) rename {models => protomodels}/cached_dependency.gogoproto.go (99%) rename {models => protomodels}/cells.gogoproto.go (99%) rename {models => protomodels}/certificate_properties.gogoproto.go (99%) rename {models => protomodels}/check_definition.gogoproto.go (99%) rename {models => protomodels}/desired_lrp.gogoproto.go (99%) rename {models => protomodels}/desired_lrp_requests.gogoproto.go (99%) rename {models => protomodels}/domain.gogoproto.go (99%) rename {models => protomodels}/environment_variables.gogoproto.go (99%) rename {models => protomodels}/error.gogoproto.go (99%) rename {models => protomodels}/evacuation.gogoproto.go (99%) rename {models => protomodels}/events.gogoproto.go (99%) rename {models => protomodels}/image_layer.gogoproto.go (99%) rename {models => protomodels}/log_rate_limit.gogoproto.go (99%) rename {models => protomodels}/metric_tags.gogoproto.go (99%) rename {models => protomodels}/modification_tag.gogoproto.go (99%) rename {models => protomodels}/network.gogoproto.go (99%) rename {models => protomodels}/ping.gogoproto.go (99%) rename {models => protomodels}/security_group.gogoproto.go (99%) rename {models => protomodels}/sidecar.gogoproto.go (99%) rename {models => protomodels}/task.gogoproto.go (99%) rename {models => protomodels}/task_requests.gogoproto.go (99%) rename {models => protomodels}/volume_mount.gogoproto.go (99%) diff --git a/models/actions.gogoproto.go b/protomodels/actions.gogoproto.go similarity index 99% rename from models/actions.gogoproto.go rename to protomodels/actions.gogoproto.go index 9d98e76c..50d66963 100644 --- a/models/actions.gogoproto.go +++ b/protomodels/actions.gogoproto.go @@ -1,17 +1,18 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: actions.proto -package models +package protomodels import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" reflect "reflect" strings "strings" + + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. @@ -26,15 +27,6 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Action struct { - // Note: we only expect one of the following set of fields to be - // set. Previously we used `option (gogoproto.onlyone) = true' but since this - // is now deprecated and oneof introduces a lot of structural changes, we - // deferred on switching to oneof for now until there is a good reason for it. - // disadvantages of using multiple optionals as opposed to oneof are: - // - less memory usage - // disadvantages of using multiple optionals without onlyone: - // - writing our own GetAction/SetAction methods - // action oneof { DownloadAction *DownloadAction `protobuf:"bytes,1,opt,name=download_action,json=downloadAction,proto3" json:"download,omitempty"` UploadAction *UploadAction `protobuf:"bytes,2,opt,name=upload_action,json=uploadAction,proto3" json:"upload,omitempty"` RunAction *RunAction `protobuf:"bytes,3,opt,name=run_action,json=runAction,proto3" json:"run,omitempty"` diff --git a/models/actual_lrp.gogoproto.go b/protomodels/actual_lrp.gogoproto.go similarity index 99% rename from models/actual_lrp.gogoproto.go rename to protomodels/actual_lrp.gogoproto.go index e9c46897..10c22cf5 100644 --- a/models/actual_lrp.gogoproto.go +++ b/protomodels/actual_lrp.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: actual_lrp.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/actual_lrp_requests.gogoproto.go b/protomodels/actual_lrp_requests.gogoproto.go similarity index 99% rename from models/actual_lrp_requests.gogoproto.go rename to protomodels/actual_lrp_requests.gogoproto.go index f34f6715..48b9f7dc 100644 --- a/models/actual_lrp_requests.gogoproto.go +++ b/protomodels/actual_lrp_requests.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: actual_lrp_requests.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/cached_dependency.gogoproto.go b/protomodels/cached_dependency.gogoproto.go similarity index 99% rename from models/cached_dependency.gogoproto.go rename to protomodels/cached_dependency.gogoproto.go index 2bd79438..0dcb7d86 100644 --- a/models/cached_dependency.gogoproto.go +++ b/protomodels/cached_dependency.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: cached_dependency.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/cells.gogoproto.go b/protomodels/cells.gogoproto.go similarity index 99% rename from models/cells.gogoproto.go rename to protomodels/cells.gogoproto.go index 36d9d7b7..88aecd20 100644 --- a/models/cells.gogoproto.go +++ b/protomodels/cells.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: cells.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/certificate_properties.gogoproto.go b/protomodels/certificate_properties.gogoproto.go similarity index 99% rename from models/certificate_properties.gogoproto.go rename to protomodels/certificate_properties.gogoproto.go index 7815f28f..d19a0960 100644 --- a/models/certificate_properties.gogoproto.go +++ b/protomodels/certificate_properties.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: certificate_properties.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/check_definition.gogoproto.go b/protomodels/check_definition.gogoproto.go similarity index 99% rename from models/check_definition.gogoproto.go rename to protomodels/check_definition.gogoproto.go index d4c6ff75..bccf34a3 100644 --- a/models/check_definition.gogoproto.go +++ b/protomodels/check_definition.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: check_definition.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/desired_lrp.gogoproto.go b/protomodels/desired_lrp.gogoproto.go similarity index 99% rename from models/desired_lrp.gogoproto.go rename to protomodels/desired_lrp.gogoproto.go index 7f32eb90..ce9de5c6 100644 --- a/models/desired_lrp.gogoproto.go +++ b/protomodels/desired_lrp.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: desired_lrp.proto -package models +package protomodels import ( bytes "bytes" diff --git a/models/desired_lrp_requests.gogoproto.go b/protomodels/desired_lrp_requests.gogoproto.go similarity index 99% rename from models/desired_lrp_requests.gogoproto.go rename to protomodels/desired_lrp_requests.gogoproto.go index 703679ff..f699b85d 100644 --- a/models/desired_lrp_requests.gogoproto.go +++ b/protomodels/desired_lrp_requests.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: desired_lrp_requests.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/domain.gogoproto.go b/protomodels/domain.gogoproto.go similarity index 99% rename from models/domain.gogoproto.go rename to protomodels/domain.gogoproto.go index 08777240..3f7fd775 100644 --- a/models/domain.gogoproto.go +++ b/protomodels/domain.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: domain.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/environment_variables.gogoproto.go b/protomodels/environment_variables.gogoproto.go similarity index 99% rename from models/environment_variables.gogoproto.go rename to protomodels/environment_variables.gogoproto.go index c3db470a..a292cfe4 100644 --- a/models/environment_variables.gogoproto.go +++ b/protomodels/environment_variables.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: environment_variables.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/error.gogoproto.go b/protomodels/error.gogoproto.go similarity index 99% rename from models/error.gogoproto.go rename to protomodels/error.gogoproto.go index 039ca6d6..d755a3ce 100644 --- a/models/error.gogoproto.go +++ b/protomodels/error.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: error.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/evacuation.gogoproto.go b/protomodels/evacuation.gogoproto.go similarity index 99% rename from models/evacuation.gogoproto.go rename to protomodels/evacuation.gogoproto.go index b759f031..45ec8a6b 100644 --- a/models/evacuation.gogoproto.go +++ b/protomodels/evacuation.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: evacuation.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/events.gogoproto.go b/protomodels/events.gogoproto.go similarity index 99% rename from models/events.gogoproto.go rename to protomodels/events.gogoproto.go index 1716470b..3b7511e4 100644 --- a/models/events.gogoproto.go +++ b/protomodels/events.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: events.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/image_layer.gogoproto.go b/protomodels/image_layer.gogoproto.go similarity index 99% rename from models/image_layer.gogoproto.go rename to protomodels/image_layer.gogoproto.go index 8dda5974..675dac02 100644 --- a/models/image_layer.gogoproto.go +++ b/protomodels/image_layer.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: image_layer.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/log_rate_limit.gogoproto.go b/protomodels/log_rate_limit.gogoproto.go similarity index 99% rename from models/log_rate_limit.gogoproto.go rename to protomodels/log_rate_limit.gogoproto.go index 0ccdf6db..8d2093ad 100644 --- a/models/log_rate_limit.gogoproto.go +++ b/protomodels/log_rate_limit.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: log_rate_limit.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/metric_tags.gogoproto.go b/protomodels/metric_tags.gogoproto.go similarity index 99% rename from models/metric_tags.gogoproto.go rename to protomodels/metric_tags.gogoproto.go index 1ab472f0..2f6f6c4c 100644 --- a/models/metric_tags.gogoproto.go +++ b/protomodels/metric_tags.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: metric_tags.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/modification_tag.gogoproto.go b/protomodels/modification_tag.gogoproto.go similarity index 99% rename from models/modification_tag.gogoproto.go rename to protomodels/modification_tag.gogoproto.go index e1fe576e..e9eb7dcb 100644 --- a/models/modification_tag.gogoproto.go +++ b/protomodels/modification_tag.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: modification_tag.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/network.gogoproto.go b/protomodels/network.gogoproto.go similarity index 99% rename from models/network.gogoproto.go rename to protomodels/network.gogoproto.go index 6bd2eb70..5865fb94 100644 --- a/models/network.gogoproto.go +++ b/protomodels/network.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: network.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/ping.gogoproto.go b/protomodels/ping.gogoproto.go similarity index 99% rename from models/ping.gogoproto.go rename to protomodels/ping.gogoproto.go index 6acb0b54..eeab9ae6 100644 --- a/models/ping.gogoproto.go +++ b/protomodels/ping.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: ping.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/security_group.gogoproto.go b/protomodels/security_group.gogoproto.go similarity index 99% rename from models/security_group.gogoproto.go rename to protomodels/security_group.gogoproto.go index 87b40e03..cd7ee310 100644 --- a/models/security_group.gogoproto.go +++ b/protomodels/security_group.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: security_group.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/sidecar.gogoproto.go b/protomodels/sidecar.gogoproto.go similarity index 99% rename from models/sidecar.gogoproto.go rename to protomodels/sidecar.gogoproto.go index 3a9f6ec1..e7b39886 100644 --- a/models/sidecar.gogoproto.go +++ b/protomodels/sidecar.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: sidecar.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/task.gogoproto.go b/protomodels/task.gogoproto.go similarity index 99% rename from models/task.gogoproto.go rename to protomodels/task.gogoproto.go index d41ff768..11fd879d 100644 --- a/models/task.gogoproto.go +++ b/protomodels/task.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: task.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/task_requests.gogoproto.go b/protomodels/task_requests.gogoproto.go similarity index 99% rename from models/task_requests.gogoproto.go rename to protomodels/task_requests.gogoproto.go index 0e1b642c..2d41c1b3 100644 --- a/models/task_requests.gogoproto.go +++ b/protomodels/task_requests.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: task_requests.proto -package models +package protomodels import ( fmt "fmt" diff --git a/models/volume_mount.gogoproto.go b/protomodels/volume_mount.gogoproto.go similarity index 99% rename from models/volume_mount.gogoproto.go rename to protomodels/volume_mount.gogoproto.go index 2193674d..12d6513a 100644 --- a/models/volume_mount.gogoproto.go +++ b/protomodels/volume_mount.gogoproto.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: volume_mount.proto -package models +package protomodels import ( fmt "fmt" From 5754545d05f6d0f6f31f74fd61d519437fcc001b Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 26 Apr 2024 19:19:18 +0000 Subject: [PATCH 018/155] New protoc plugin for BBS --- protoc-gen-go-bbs/bbs.go | 155 ++++++++++++++++++++++++++++++++++++++ protoc-gen-go-bbs/go.mod | 5 ++ protoc-gen-go-bbs/go.sum | 6 ++ protoc-gen-go-bbs/main.go | 44 +++++++++++ 4 files changed, 210 insertions(+) create mode 100644 protoc-gen-go-bbs/bbs.go create mode 100644 protoc-gen-go-bbs/go.mod create mode 100644 protoc-gen-go-bbs/go.sum create mode 100644 protoc-gen-go-bbs/main.go diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go new file mode 100644 index 00000000..960dab33 --- /dev/null +++ b/protoc-gen-go-bbs/bbs.go @@ -0,0 +1,155 @@ +package main + +import ( + "fmt" + "log" + "strings" + + "google.golang.org/protobuf/compiler/protogen" + "google.golang.org/protobuf/reflect/protoreflect" + "google.golang.org/protobuf/types/descriptorpb" +) + +type bbsGenerateHelperInterface interface { + genCopysafeStruct(g *protogen.GeneratedFile, msg *protogen.Message) + genToProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) + genProtoMapMethod(g *protogen.GeneratedFile, msg *protogen.Message) +} +type bbsGenerateHelper struct{} + +func getUnsafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) string { + return g.QualifiedGoIdent(ident) +} + +func getCopysafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) (string, bool) { + unsafeName := getUnsafeName(g, ident) + return strings.CutPrefix(unsafeName, *prefix) +} + +func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *protogen.Message) { + if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + g.P("// Prevent copylock errors when using ", msg.GoIdent.GoName, " directly") + g.P("type ", copysafeName, " struct {") + for _, field := range msg.Fields { + if *debug { + log.Printf("New Field Detected: %+v\n\n", field) + options := field.Desc.Options().(*descriptorpb.FieldOptions) + log.Printf("Field Options: %+v\n\n", options) + + } + var fieldType string + if field.Desc.Cardinality() == protoreflect.Repeated { + fieldType += "[]" + } + + if field.Message != nil { + if *debug { + log.Printf("Message Field Detected: %+v\n\n", field.Message) + log.Printf("Message Description: %+v\n\n", field.Message.Desc) + } + messageType, _ := getCopysafeName(g, field.Message.GoIdent) + fieldType += "*" + messageType + } else if field.Enum != nil { + if *debug { + log.Printf("Enum Field Detected: %+v\n\n", field.Enum) + log.Printf("Enum Description: %+v\n\n", field.Enum.Desc) + } + enumType := getUnsafeName(g, field.Enum.GoIdent) + fieldType += enumType + } else { + fieldType += field.Desc.Kind().String() + } + + g.P(field.GoName, " ", fieldType) + } + g.P("}") + } +} + +func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) { + unsafeName := getUnsafeName(g, msg.GoIdent) + if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + g.P("func(x *", copysafeName, ") ToProto() *", unsafeName, " {") + g.P("proto := &", unsafeName, "{") + for _, field := range msg.Fields { + if field.Message != nil { + if field.Desc.Cardinality() == protoreflect.Repeated { + fieldCopysafeName, _ := getCopysafeName(g, field.Message.GoIdent) + g.P(field.GoName, ": ", fieldCopysafeName, "ProtoMap(x.", field.GoName, "),") + } else { + g.P(field.GoName, ": x.", field.GoName, ".ToProto(),") + } + } else { + if field.Oneof != nil { + g.P(field.GoName, ": &x.", field.GoName, ",") + } else { + g.P(field.GoName, ": x.", field.GoName, ",") + } + } + } + g.P("}") + g.P("return proto") + g.P("}") + g.P() + } +} + +func (bbsGenerateHelper) genProtoMapMethod(g *protogen.GeneratedFile, msg *protogen.Message) { + unsafeName := getUnsafeName(g, msg.GoIdent) + if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + g.P("func ", copysafeName, "ProtoMap(values []*", copysafeName, ") []*", unsafeName, " {") + g.P("result := make([]*", unsafeName, ", len(values))") + g.P("for i, val := range values {") + g.P("result[i] = val.ToProto()") + g.P("}") + g.P("return result") + g.P("}") + g.P() + } +} + +var helper bbsGenerateHelperInterface = bbsGenerateHelper{} + +func generateFile(plugin *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile { + filename := file.GeneratedFilenamePrefix + "_bbs.pb.go" + g := plugin.NewGeneratedFile(filename, file.GoImportPath) + g.P("// Code generated by protoc-gen-go-bbs. DO NOT EDIT.") + g.P("// versions:") + g.P("// - protoc-gen-go-bbs v", version) // version from main.go + g.P("// - protoc ", protocVersion(plugin)) + + if file.Proto.GetOptions().GetDeprecated() { + g.P("// ", file.Desc.Path(), " is a deprecated file.") + } else { + g.P("// source: ", file.Desc.Path()) + } + g.P() + g.P("package ", file.GoPackageName) + g.P() + generateFileContent(file, g) + return g +} + +func protocVersion(plugin *protogen.Plugin) string { + v := plugin.Request.GetCompilerVersion() + if v == nil { + return "(unknown)" + } + var suffix string + if s := v.GetSuffix(); s != "" { + suffix = "-" + s + } + return fmt.Sprintf("v%d.%d.%d%s", v.GetMajor(), v.GetMinor(), v.GetPatch(), suffix) +} + +func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { + for _, msg := range file.Messages { + if *debug { + log.Printf("New Message Detected: %+v\n\n", msg) + } + + helper.genCopysafeStruct(g, msg) + helper.genToProtoMethod(g, msg) + helper.genProtoMapMethod(g, msg) + } +} diff --git a/protoc-gen-go-bbs/go.mod b/protoc-gen-go-bbs/go.mod new file mode 100644 index 00000000..1974eff3 --- /dev/null +++ b/protoc-gen-go-bbs/go.mod @@ -0,0 +1,5 @@ +module code.cloudfoundry.org/bbs/protoc-gen-go-bbs + +go 1.22.2 + +require google.golang.org/protobuf v1.33.0 diff --git a/protoc-gen-go-bbs/go.sum b/protoc-gen-go-bbs/go.sum new file mode 100644 index 00000000..2e26fa55 --- /dev/null +++ b/protoc-gen-go-bbs/go.sum @@ -0,0 +1,6 @@ +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= diff --git a/protoc-gen-go-bbs/main.go b/protoc-gen-go-bbs/main.go new file mode 100644 index 00000000..4ff0f695 --- /dev/null +++ b/protoc-gen-go-bbs/main.go @@ -0,0 +1,44 @@ +package main + +import ( + "flag" + "fmt" + "log" + + "google.golang.org/protobuf/compiler/protogen" + "google.golang.org/protobuf/types/pluginpb" +) + +const version = "0.0.1" + +var prefix *string +var debug *bool + +func main() { + showVersion := flag.Bool("version", false, "print the version and exit") + flag.Parse() + if *showVersion { + fmt.Printf("protoc-gen-go-bbs %v\n", version) + return + } + + var flags flag.FlagSet + prefix = flags.String("prefix", "Proto", "Prefix to strip from protobuf-generated structs") + debug = flags.Bool("debug", false, "Set to true to output codegen debugging lines") + + protogen.Options{ + ParamFunc: flags.Set, + }.Run(func(plugin *protogen.Plugin) error { + plugin.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL) + + for _, file := range plugin.Files { + if !file.Generate { + continue + } + log.Printf("Generating %s\n", file.Desc.Path()) + + generateFile(plugin, file) + } + return nil + }) +} From e5d56ea21517ec92994aec1a4968a1c1447b7e91 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 26 Apr 2024 19:19:38 +0000 Subject: [PATCH 019/155] proto changes --- models/actions.proto | 56 ++++++++--------- models/actual_lrp.proto | 33 +++++----- models/actual_lrp_requests.proto | 62 +++++++++---------- models/bbs.proto | 11 ++++ models/cached_dependency.proto | 2 +- models/cells.proto | 16 ++--- models/certificate_properties.proto | 2 +- models/check_definition.proto | 16 ++--- models/desired_lrp.proto | 94 ++++++++++++++--------------- models/desired_lrp_requests.proto | 42 ++++++------- models/domain.proto | 10 +-- models/environment_variables.proto | 2 +- models/error.proto | 2 +- models/evacuation.proto | 44 +++++++------- models/events.proto | 78 ++++++++++++------------ models/image_layer.proto | 2 +- models/log_rate_limit.proto | 2 +- models/metric_tags.proto | 2 +- models/modification_tag.proto | 2 +- models/network.proto | 2 +- models/ping.proto | 2 +- models/security_group.proto | 10 +-- models/sidecar.proto | 4 +- models/task.proto | 26 ++++---- models/task_requests.proto | 40 ++++++------ models/volume_mount.proto | 8 +-- 26 files changed, 291 insertions(+), 279 deletions(-) create mode 100644 models/bbs.proto diff --git a/models/actions.proto b/models/actions.proto index b5ac469f..88b38ca1 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -5,7 +5,7 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "environment_variables.proto"; -message Action { +message ProtoAction { // Note: we only expect one of the following set of fields to be // set. Previously we used `option (gogoproto.onlyone) = true' but since this // is now deprecated and oneof introduces a lot of structural changes, we @@ -15,19 +15,19 @@ message Action { // disadvantages of using multiple optionals without onlyone: // - writing our own GetAction/SetAction methods // action oneof { - DownloadAction download_action = 1 [json_name="download"]; - UploadAction upload_action = 2 [json_name = "upload"]; - RunAction run_action = 3 [json_name = "run"]; - TimeoutAction timeout_action = 4 [json_name = "timeout"]; - EmitProgressAction emit_progress_action = 5 [json_name = "emit_progress"]; - TryAction try_action = 6 [json_name = "try"]; - ParallelAction parallel_action = 7 [json_name = "parallel"]; - SerialAction serial_action = 8 [json_name = "serial"]; - CodependentAction codependent_action = 9 [json_name = "codependent"]; + ProtoDownloadAction download_action = 1 [json_name="download"]; + ProtoUploadAction upload_action = 2 [json_name = "upload"]; + ProtoRunAction run_action = 3 [json_name = "run"]; + ProtoTimeoutAction timeout_action = 4 [json_name = "timeout"]; + ProtoEmitProgressAction emit_progress_action = 5 [json_name = "emit_progress"]; + ProtoTryAction try_action = 6 [json_name = "try"]; + ProtoParallelAction parallel_action = 7 [json_name = "parallel"]; + ProtoSerialAction serial_action = 8 [json_name = "serial"]; + ProtoCodependentAction codependent_action = 9 [json_name = "codependent"]; // } } -message DownloadAction { +message ProtoDownloadAction { string artifact = 1; string from = 2 [json_name = "from"]; string to = 3 [json_name = "to"]; @@ -38,7 +38,7 @@ message DownloadAction { string checksum_value = 8; } -message UploadAction { +message ProtoUploadAction { string artifact = 1; string from = 2 [json_name = "from"]; string to = 3 [json_name = "to"]; @@ -46,53 +46,53 @@ message UploadAction { string user = 5 [json_name = "user"]; } -message RunAction { +message ProtoRunAction { string path = 1 [json_name = "path"]; repeated string args = 2; string dir = 3; - repeated EnvironmentVariable env = 4; - ResourceLimits resource_limits = 5; + repeated ProtoEnvironmentVariable env = 4; + ProtoResourceLimits resource_limits = 5; string user = 6 [json_name = "user"]; string log_source = 7; bool suppress_log_output = 8 [json_name = "suppress_log_output"]; } -message TimeoutAction { - Action action = 1; +message ProtoTimeoutAction { + ProtoAction action = 1; int64 deprecated_timeout_ns = 2 [json_name = "timeout", deprecated=true]; string log_source = 3; int64 timeout_ms = 4 [json_name = "timeout_ms"]; } -message EmitProgressAction { - Action action = 1; +message ProtoEmitProgressAction { + ProtoAction action = 1; string start_message = 2 [json_name = "start_message"]; string success_message = 3 [json_name = "success_message"]; string failure_message_prefix = 4 [json_name = "failure_message_prefix"]; string log_source = 5; } -message TryAction { - Action action = 1; +message ProtoTryAction { + ProtoAction action = 1; string log_source = 2; } -message ParallelAction { - repeated Action actions = 1; +message ProtoParallelAction { + repeated ProtoAction actions = 1; string log_source = 2; } -message SerialAction { - repeated Action actions = 1; +message ProtoSerialAction { + repeated ProtoAction actions = 1; string log_source = 2; } -message CodependentAction { - repeated Action actions = 1; +message ProtoCodependentAction { + repeated ProtoAction actions = 1; string log_source = 2; } -message ResourceLimits { +message ProtoResourceLimits { optional uint64 nofile = 1; optional uint64 nproc = 2 [deprecated=true]; } diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 370ffc1e..272b2b65 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -4,34 +4,35 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; import "modification_tag.proto"; +import "bbs.proto"; -message ActualLRPGroup { +message ProtoActualLRPGroup { option deprecated = true; - ActualLRP instance = 1; - ActualLRP evacuating = 2; + ProtoActualLRP instance = 1; + ProtoActualLRP evacuating = 2; } -message PortMapping { +message ProtoPortMapping { uint32 container_port = 1 [json_name = "container_port"]; uint32 host_port = 2 [json_name = "host_port"]; uint32 container_tls_proxy_port = 3 [json_name = "container_tls_proxy_port"]; uint32 host_tls_proxy_port = 4 [json_name = "host_tls_proxy_port"]; } -message ActualLRPKey { +message ProtoActualLRPKey { string process_guid = 1 [json_name = "process_guid"]; int32 index = 2 [json_name = "index"]; string domain = 3 [json_name = "domain"]; } -message ActualLRPInstanceKey { +message ProtoActualLRPInstanceKey { string instance_guid = 1 [json_name = "instance_guid"]; string cell_id = 2 [json_name = "cell_id"]; } -message ActualLRPNetInfo { +message ProtoActualLRPNetInfo { string address = 1 [json_name = "address"]; - repeated PortMapping ports = 2 [json_name = "ports"]; + repeated ProtoPortMapping ports = 2 [json_name = "ports"]; string instance_address = 3; enum PreferredAddress { @@ -40,31 +41,31 @@ message ActualLRPNetInfo { HOST = 2; } - PreferredAddress preferred_address = 4 [json_name = "preferred_address"]; + PreferredAddress preferred_address = 4 [json_name = "preferred_address", (bbs.bbs_json_name) = "PreferredAddressTesting"]; } -message ActualLRPInternalRoute { +message ProtoActualLRPInternalRoute { string hostname = 1 [json_name = "hostname"]; } -message ActualLRP { +message ProtoActualLRP { enum Presence { ORDINARY = 0; EVACUATING = 1; SUSPECT = 2; } - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; - ActualLRPNetInfo actual_lrp_net_info = 3; + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPNetInfo actual_lrp_net_info = 3; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ModificationTag modification_tag = 9 [json_name = "modification_tag"]; + ProtoModificationTag modification_tag = 9 [json_name = "modification_tag"]; Presence presence = 10 [json_name = "presence"]; - repeated ActualLRPInternalRoute actual_lrp_internal_routes = 11; + repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 11; map metric_tags = 12; optional bool routable = 13 [json_name = "routable"]; string availability_zone = 14 [json_name = "availability_zone"]; diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index 8e425498..5db4d8f6 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -6,82 +6,82 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "actual_lrp.proto"; import "error.proto"; -message ActualLRPLifecycleResponse { - Error error = 1; +message ProtoActualLRPLifecycleResponse { + ProtoError error = 1; } -message ActualLRPGroupsResponse { +message ProtoActualLRPGroupsResponse { option deprecated = true; - Error error = 1; - repeated ActualLRPGroup actual_lrp_groups = 2; + ProtoError error = 1; + repeated ProtoActualLRPGroup actual_lrp_groups = 2; } -message ActualLRPGroupResponse { +message ProtoActualLRPGroupResponse { option deprecated = true; - Error error = 1; - ActualLRPGroup actual_lrp_group = 2; + ProtoError error = 1; + ProtoActualLRPGroup actual_lrp_group = 2; } -message ActualLRPGroupsRequest { +message ProtoActualLRPGroupsRequest { option deprecated = true; string domain = 1 [json_name = "domain"]; string cell_id = 2 [json_name = "cell_id"]; } -message ActualLRPGroupsByProcessGuidRequest { +message ProtoActualLRPGroupsByProcessGuidRequest { option deprecated = true; string process_guid = 1 [json_name = "process_guid"]; } -message ActualLRPGroupByProcessGuidAndIndexRequest { +message ProtoActualLRPGroupByProcessGuidAndIndexRequest { option deprecated = true; string process_guid = 1 [json_name = "process_guid"]; int32 index = 2 [json_name = "index"]; } -message ClaimActualLRPRequest { +message ProtoClaimActualLRPRequest { string process_guid = 1 [json_name = "process_guid"]; int32 index = 2 [json_name = "index"]; - ActualLRPInstanceKey actual_lrp_instance_key = 3; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 3; } -message StartActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; - ActualLRPNetInfo actual_lrp_net_info = 3; - repeated ActualLRPInternalRoute actual_lrp_internal_routes = 4; +message ProtoStartActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPNetInfo actual_lrp_net_info = 3; + repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 4; map metric_tags = 5; optional bool Routable = 6; string availability_zone = 7 [json_name= "availability_zone"]; } -message CrashActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; +message ProtoCrashActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; string error_message = 3 [json_name = "error_message"]; } -message FailActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; +message ProtoFailActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; string error_message = 2 [json_name = "error_message"]; } -message RetireActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; +message ProtoRetireActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; } -message RemoveActualLRPRequest { +message ProtoRemoveActualLRPRequest { string process_guid = 1 [json_name = "process_guid"]; int32 index = 2 [json_name = "index"]; - ActualLRPInstanceKey actual_lrp_instance_key = 3; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 3; } -message ActualLRPsResponse { - Error error = 1; - repeated ActualLRP actual_lrps = 2; +message ProtoActualLRPsResponse { + ProtoError error = 1; + repeated ProtoActualLRP actual_lrps = 2; } -message ActualLRPsRequest { +message ProtoActualLRPsRequest { string domain = 1 [json_name = "domain"]; string cell_id = 2 [json_name = "cell_id"]; string process_guid = 3 [json_name = "process_guid"]; diff --git a/models/bbs.proto b/models/bbs.proto new file mode 100644 index 00000000..4dd16b4b --- /dev/null +++ b/models/bbs.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package bbs; +option go_package="code.cloudfoundry.org/bbs/models"; + +import "google/protobuf/descriptor.proto"; + +extend google.protobuf.FieldOptions { + optional string bbs_json_name = 1000; +} + diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index f4aa2ed7..33c90c8f 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; -message CachedDependency { +message ProtoCachedDependency { string name = 1 [json_name = "name"]; string from = 2 [json_name = "from"]; string to = 3 [json_name = "to"]; diff --git a/models/cells.proto b/models/cells.proto index 9dcdb4f9..371510f4 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -5,29 +5,29 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "error.proto"; -message CellCapacity { +message ProtoCellCapacity { int32 memory_mb = 1 [json_name = "memory_mb"]; int32 disk_mb = 2 [json_name = "disk_mb"]; int32 containers = 3 [json_name = "containers"]; } -message CellPresence { +message ProtoCellPresence { string cell_id = 1 [json_name = "cell_id"]; string rep_address = 2 [json_name = "rep_address"]; string zone = 3 [json_name = "zone"]; - CellCapacity capacity = 4; - repeated Provider rootfs_providers = 5 [json_name = "rootfs_provider_list"]; + ProtoCellCapacity capacity = 4; + repeated ProtoProvider rootfs_providers = 5 [json_name = "rootfs_provider_list"]; repeated string placement_tags = 6; repeated string optional_placement_tags = 7; string rep_url = 8 [json_name = "rep_url"]; } -message Provider { +message ProtoProvider { string name = 1 [json_name = "name"]; repeated string properties = 2; } -message CellsResponse { - Error error = 1; - repeated CellPresence cells = 2; +message ProtoCellsResponse { + ProtoError error = 1; + repeated ProtoCellPresence cells = 2; } diff --git a/models/certificate_properties.proto b/models/certificate_properties.proto index 0cfe3a4b..5396374a 100644 --- a/models/certificate_properties.proto +++ b/models/certificate_properties.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; -message CertificateProperties { +message ProtoCertificateProperties { repeated string organizational_unit = 1; } diff --git a/models/check_definition.proto b/models/check_definition.proto index e6f793d5..a647f515 100644 --- a/models/check_definition.proto +++ b/models/check_definition.proto @@ -5,27 +5,27 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; -message CheckDefinition { - repeated Check checks = 1; +message ProtoCheckDefinition { + repeated ProtoCheck checks = 1; string log_source = 2 [json_name = "log_source"]; - repeated Check readiness_checks = 3; + repeated ProtoCheck readiness_checks = 3; } -message Check { +message ProtoCheck { // oneof is hard to use right now, instead we can do this check in validation // oneof check { - TCPCheck tcp_check = 1; - HTTPCheck http_check = 2; + ProtoTCPCheck tcp_check = 1; + ProtoHTTPCheck http_check = 2; // } } -message TCPCheck { +message ProtoTCPCheck { uint32 port = 1 [json_name = "port"]; uint64 connect_timeout_ms = 2; uint64 interval_ms = 3; } -message HTTPCheck { +message ProtoHTTPCheck { uint32 port = 1 [json_name = "port"]; uint64 request_timeout_ms = 2; string path = 3 [json_name = "path"]; diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 039ff5ca..3ec151cc 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -17,27 +17,27 @@ import "metric_tags.proto"; import "sidecar.proto"; import "log_rate_limit.proto"; -message DesiredLRPSchedulingInfo { - DesiredLRPKey desired_lrp_key = 1; +message ProtoDesiredLRPSchedulingInfo { + ProtoDesiredLRPKey desired_lrp_key = 1; string annotation = 2 [json_name = "annotation"]; int32 instances = 3 [json_name = "instances"]; - DesiredLRPResource desired_lrp_resource = 4; + ProtoDesiredLRPResource desired_lrp_resource = 4; - ProtoRoutes routes = 5; - ModificationTag modification_tag = 6; - VolumePlacement volume_placement = 7; - repeated string PlacementTags = 8 [json_name ="placement_tags"]; + ProtoProtoRoutes routes = 5; + ProtoModificationTag modification_tag = 6; + ProtoVolumePlacement volume_placement = 7; + repeated string ProtoPlacementTags = 8 [json_name ="placement_tags"]; } -message DesiredLRPRunInfo { - DesiredLRPKey desired_lrp_key = 1; +message ProtoDesiredLRPRunInfo { + ProtoDesiredLRPKey desired_lrp_key = 1; - repeated EnvironmentVariable environment_variables = 2 [json_name = "env"]; - Action setup = 3; - Action action = 4; - Action monitor = 5; + repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env"]; + ProtoAction setup = 3; + ProtoAction action = 4; + ProtoAction monitor = 5; uint32 deprecated_start_timeout_s = 6 [json_name = "start_timeout", deprecated=true]; @@ -45,102 +45,102 @@ message DesiredLRPRunInfo { uint32 cpu_weight = 8 [json_name = "cpu_weight"]; repeated uint32 ports = 9 [packed = false]; - repeated SecurityGroupRule egress_rules = 10; + repeated ProtoSecurityGroupRule egress_rules = 10; string log_source = 11 [json_name = "log_source"]; string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid"]; int64 created_at = 13 [json_name = "created_at"]; - repeated CachedDependency cached_dependencies = 14; + repeated ProtoCachedDependency cached_dependencies = 14; string legacy_download_user = 15 [deprecated=true]; string trusted_system_certificates_path = 16; - repeated VolumeMount volume_mounts = 17; - Network network = 18; + repeated ProtoVolumeMount volume_mounts = 17; + ProtoNetwork network = 18; int64 start_timeout_ms = 19 [json_name = "start_timeout_ms"]; - optional CertificateProperties certificate_properties = 20; + optional ProtoCertificateProperties certificate_properties = 20; string image_username = 21; string image_password = 22; - CheckDefinition check_definition = 23; + ProtoCheckDefinition check_definition = 23; - repeated ImageLayer image_layers = 24; + repeated ProtoImageLayer image_layers = 24; - map metric_tags = 25 [deprecated=true]; + map metric_tags = 25 [deprecated=true]; - repeated Sidecar sidecars = 26; - LogRateLimit log_rate_limit = 27; + repeated ProtoSidecar sidecars = 26; + ProtoLogRateLimit log_rate_limit = 27; } // helper message for marshalling routes -message ProtoRoutes { +message ProtoProtoRoutes { map routes = 1; } -message DesiredLRPUpdate { +message ProtoDesiredLRPUpdate { optional int32 instances = 1; - optional ProtoRoutes routes = 2; + optional ProtoProtoRoutes routes = 2; optional string annotation = 3; - map metric_tags = 4; + map metric_tags = 4; } -message DesiredLRPKey { +message ProtoDesiredLRPKey { string process_guid = 1 [json_name = "process_guid"]; string domain = 2 [json_name = "domain"]; string log_guid = 3 [json_name = "log_guid"]; } -message DesiredLRPResource { +message ProtoDesiredLRPResource { int32 memory_mb = 1 [json_name = "memory_mb"]; int32 disk_mb = 2 [json_name = "disk_mb"]; string root_fs = 3 [json_name = "rootfs"]; int32 max_pids = 4 [json_name = "max_pids"]; } -message DesiredLRP { +message ProtoDesiredLRP { string process_guid = 1 [json_name = "process_guid"]; string domain = 2 [json_name = "domain"]; string root_fs = 3 [json_name = "rootfs"]; int32 instances = 4 [json_name = "instances"]; - repeated EnvironmentVariable environment_variables = 5 [json_name = "env"]; - Action setup = 6; - Action action = 7; + repeated ProtoEnvironmentVariable environment_variables = 5 [json_name = "env"]; + ProtoAction setup = 6; + ProtoAction action = 7; int64 start_timeout_ms = 27 [json_name = "start_timeout_ms"]; uint32 deprecated_start_timeout_s = 8 [json_name = "deprecated_timeout_ns", deprecated=true]; - Action monitor = 9; + ProtoAction monitor = 9; int32 disk_mb = 10 [json_name = "disk_mb"]; int32 memory_mb = 11 [json_name = "memory_mb"]; uint32 cpu_weight = 12 [json_name = "cpu_weight"]; bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; - optional ProtoRoutes routes = 15; + optional ProtoProtoRoutes routes = 15; string log_source = 16 [json_name = "log_source"]; string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; string annotation = 19 [json_name = "annotation"]; - repeated SecurityGroupRule egress_rules = 20; - ModificationTag modification_tag = 21; - repeated CachedDependency cached_dependencies = 22; + repeated ProtoSecurityGroupRule egress_rules = 20; + ProtoModificationTag modification_tag = 21; + repeated ProtoCachedDependency cached_dependencies = 22; string legacy_download_user = 23 [deprecated=true]; string trusted_system_certificates_path = 24; - repeated VolumeMount volume_mounts = 25; - Network network = 26; - repeated string PlacementTags = 28 [json_name ="placement_tags"]; + repeated ProtoVolumeMount volume_mounts = 25; + ProtoNetwork network = 26; + repeated string ProtoPlacementTags = 28 [json_name ="placement_tags"]; int32 max_pids = 29 [json_name = "max_pids"]; - optional CertificateProperties certificate_properties = 30; + optional ProtoCertificateProperties certificate_properties = 30; string image_username = 31; string image_password = 32; - CheckDefinition check_definition = 33; + ProtoCheckDefinition check_definition = 33; - repeated ImageLayer image_layers = 34; + repeated ProtoImageLayer image_layers = 34; - map metric_tags = 35; + map metric_tags = 35; - repeated Sidecar sidecars = 36; - LogRateLimit log_rate_limit = 37; + repeated ProtoSidecar sidecars = 36; + ProtoLogRateLimit log_rate_limit = 37; } diff --git a/models/desired_lrp_requests.proto b/models/desired_lrp_requests.proto index 02db6249..8f462134 100644 --- a/models/desired_lrp_requests.proto +++ b/models/desired_lrp_requests.proto @@ -6,48 +6,48 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "desired_lrp.proto"; import "error.proto"; -message DesiredLRPLifecycleResponse { - Error error = 1; +message ProtoDesiredLRPLifecycleResponse { + ProtoError error = 1; } -message DesiredLRPsResponse { - Error error = 1; - repeated DesiredLRP desired_lrps = 2; +message ProtoDesiredLRPsResponse { + ProtoError error = 1; + repeated ProtoDesiredLRP desired_lrps = 2; } -message DesiredLRPsRequest { +message ProtoDesiredLRPsRequest { string domain = 1 [json_name = "domain"]; repeated string process_guids = 2; } -message DesiredLRPResponse { - Error error = 1; - DesiredLRP desired_lrp = 2; +message ProtoDesiredLRPResponse { + ProtoError error = 1; + ProtoDesiredLRP desired_lrp = 2; } -message DesiredLRPSchedulingInfosResponse { - Error error = 1; - repeated DesiredLRPSchedulingInfo desired_lrp_scheduling_infos = 2; +message ProtoDesiredLRPSchedulingInfosResponse { + ProtoError error = 1; + repeated ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_infos = 2; } -message DesiredLRPSchedulingInfoByProcessGuidResponse { - Error error = 1; - DesiredLRPSchedulingInfo desired_lrp_scheduling_info = 2; +message ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { + ProtoError error = 1; + ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_info = 2; } -message DesiredLRPByProcessGuidRequest { +message ProtoDesiredLRPByProcessGuidRequest { string process_guid = 1 [json_name = "process_guid"]; } -message DesireLRPRequest { - DesiredLRP desired_lrp = 1; +message ProtoDesireLRPRequest { + ProtoDesiredLRP desired_lrp = 1; } -message UpdateDesiredLRPRequest { +message ProtoUpdateDesiredLRPRequest { string process_guid = 1 [json_name = "process_guid"]; - DesiredLRPUpdate update = 2; + ProtoDesiredLRPUpdate update = 2; } -message RemoveDesiredLRPRequest { +message ProtoRemoveDesiredLRPRequest { string process_guid = 1 [json_name = "process_guid"]; } diff --git a/models/domain.proto b/models/domain.proto index 2317c716..80b364e5 100644 --- a/models/domain.proto +++ b/models/domain.proto @@ -5,16 +5,16 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "error.proto"; -message DomainsResponse { - Error error = 1; +message ProtoDomainsResponse { + ProtoError error = 1; repeated string domains = 2; } -message UpsertDomainResponse { - Error error = 1; +message ProtoUpsertDomainResponse { + ProtoError error = 1; } -message UpsertDomainRequest { +message ProtoUpsertDomainRequest { string domain = 1 [json_name = "domain"]; uint32 ttl = 2 [json_name = "ttl"]; } diff --git a/models/environment_variables.proto b/models/environment_variables.proto index 1954f164..942b00dc 100644 --- a/models/environment_variables.proto +++ b/models/environment_variables.proto @@ -4,7 +4,7 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; -message EnvironmentVariable { +message ProtoEnvironmentVariable { string name = 1 [json_name = "name"]; string value = 2 [json_name = "value"]; } diff --git a/models/error.proto b/models/error.proto index 789b4241..e278c03d 100644 --- a/models/error.proto +++ b/models/error.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; -message Error { +message ProtoError { enum Type { reserved 1, 2, 10, 20, 22, 23, 25; // previously used and removed values diff --git a/models/evacuation.proto b/models/evacuation.proto index 65cba247..c3195f20 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -6,44 +6,44 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "actual_lrp.proto"; import "error.proto"; -message EvacuationResponse { - Error error = 1; +message ProtoEvacuationResponse { + ProtoError error = 1; bool keep_container = 2 [json_name = "keep_container"]; } -message EvacuateClaimedActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; +message ProtoEvacuateClaimedActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; } -message EvacuateRunningActualLRPRequest { +message ProtoEvacuateRunningActualLRPRequest { reserved 4; // previously removed ttl value - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; - ActualLRPNetInfo actual_lrp_net_info = 3; - repeated ActualLRPInternalRoute actual_lrp_internal_routes = 5; + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPNetInfo actual_lrp_net_info = 3; + repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 5; map metric_tags = 6; - optional bool Routable = 7; + optional bool ProtoRoutable = 7; string availability_zone = 8 [json_name = "availability_zone"]; } -message EvacuateStoppedActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; +message ProtoEvacuateStoppedActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; } -message EvacuateCrashedActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; +message ProtoEvacuateCrashedActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; string error_message = 3 [json_name = "error_message"]; } -message RemoveEvacuatingActualLRPRequest { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; +message ProtoRemoveEvacuatingActualLRPRequest { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; } -message RemoveEvacuatingActualLRPResponse { - Error error = 1; +message ProtoRemoveEvacuatingActualLRPResponse { + ProtoError error = 1; } diff --git a/models/events.proto b/models/events.proto index 4c3fb28c..2fdec811 100644 --- a/models/events.proto +++ b/models/events.proto @@ -8,90 +8,90 @@ import "desired_lrp.proto"; import "task.proto"; import "modification_tag.proto"; -message ActualLRPCreatedEvent { +message ProtoActualLRPCreatedEvent { option deprecated = true; - ActualLRPGroup actual_lrp_group = 1; + ProtoActualLRPGroup actual_lrp_group = 1; } -message ActualLRPChangedEvent { +message ProtoActualLRPChangedEvent { option deprecated = true; - ActualLRPGroup before = 1; - ActualLRPGroup after = 2; + ProtoActualLRPGroup before = 1; + ProtoActualLRPGroup after = 2; } -message ActualLRPRemovedEvent { +message ProtoActualLRPRemovedEvent { option deprecated = true; - ActualLRPGroup actual_lrp_group = 1; + ProtoActualLRPGroup actual_lrp_group = 1; } -message ActualLRPInstanceCreatedEvent { - ActualLRP actual_lrp = 1; +message ProtoActualLRPInstanceCreatedEvent { + ProtoActualLRP actual_lrp = 1; string trace_id = 2 [json_name = "trace_id"]; } -message ActualLRPInfo { - ActualLRPNetInfo actual_lrp_net_info = 3; +message ProtoActualLRPInfo { + ProtoActualLRPNetInfo actual_lrp_net_info = 3; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ModificationTag modification_tag = 9 [json_name = "modification_tag"]; - ActualLRP.Presence presence = 10 [json_name = "presence"]; - optional bool Routable = 11; + ProtoModificationTag modification_tag = 9 [json_name = "modification_tag"]; + ProtoActualLRP.Presence presence = 10 [json_name = "presence"]; + optional bool ProtoRoutable = 11; string availability_zone = 12 [json_name = "availability_zone"]; } -message ActualLRPInstanceChangedEvent { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; - ActualLRPInfo before = 3; - ActualLRPInfo after = 4; +message ProtoActualLRPInstanceChangedEvent { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPInfo before = 3; + ProtoActualLRPInfo after = 4; string trace_id = 5 [json_name = "trace_id"]; } -message ActualLRPInstanceRemovedEvent { - ActualLRP actual_lrp = 1; +message ProtoActualLRPInstanceRemovedEvent { + ProtoActualLRP actual_lrp = 1; string trace_id = 2 [json_name = "trace_id"]; } -message DesiredLRPCreatedEvent { - DesiredLRP desired_lrp = 1; +message ProtoDesiredLRPCreatedEvent { + ProtoDesiredLRP desired_lrp = 1; string trace_id = 2 [json_name = "trace_id"]; } -message DesiredLRPChangedEvent { - DesiredLRP before = 1; - DesiredLRP after = 2; +message ProtoDesiredLRPChangedEvent { + ProtoDesiredLRP before = 1; + ProtoDesiredLRP after = 2; string trace_id = 3 [json_name = "trace_id"]; } -message DesiredLRPRemovedEvent { - DesiredLRP desired_lrp = 1; +message ProtoDesiredLRPRemovedEvent { + ProtoDesiredLRP desired_lrp = 1; string trace_id = 2 [json_name = "trace_id"]; } -message ActualLRPCrashedEvent { - ActualLRPKey actual_lrp_key = 1; - ActualLRPInstanceKey actual_lrp_instance_key = 2; +message ProtoActualLRPCrashedEvent { + ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; int32 crash_count = 3 [json_name = "crash_count"]; string crash_reason = 4; int64 since = 5 [json_name = "since"]; } -message EventsByCellId { +message ProtoEventsByCellId { string cell_id = 1 [json_name = "cell_id"]; } -message TaskCreatedEvent { - Task task = 1; +message ProtoTaskCreatedEvent { + ProtoTask task = 1; } -message TaskChangedEvent { - Task before = 1; - Task after = 2; +message ProtoTaskChangedEvent { + ProtoTask before = 1; + ProtoTask after = 2; } -message TaskRemovedEvent { - Task task = 1; +message ProtoTaskRemovedEvent { + ProtoTask task = 1; } diff --git a/models/image_layer.proto b/models/image_layer.proto index 67664b87..76ed622d 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -4,7 +4,7 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; -message ImageLayer { +message ProtoImageLayer { enum DigestAlgorithm { DigestAlgorithmInvalid = 0; // not camel cased since it isn't supposed to be used by API users SHA256 = 1; diff --git a/models/log_rate_limit.proto b/models/log_rate_limit.proto index 27f0ab6c..08dc0637 100644 --- a/models/log_rate_limit.proto +++ b/models/log_rate_limit.proto @@ -3,6 +3,6 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; -message LogRateLimit { +message ProtoLogRateLimit { int64 bytes_per_second = 1; } diff --git a/models/metric_tags.proto b/models/metric_tags.proto index db82f7bb..189afad4 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -4,7 +4,7 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; -message MetricTagValue { +message ProtoMetricTagValue { enum DynamicValue { DynamicValueInvalid = 0; INDEX = 1; diff --git a/models/modification_tag.proto b/models/modification_tag.proto index fab94553..79fe2fa9 100644 --- a/models/modification_tag.proto +++ b/models/modification_tag.proto @@ -4,7 +4,7 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; -message ModificationTag { +message ProtoModificationTag { string epoch = 1 [json_name = "epoch"]; uint32 index = 2 [json_name = "index"]; } diff --git a/models/network.proto b/models/network.proto index d5161f6a..ff2f91e8 100644 --- a/models/network.proto +++ b/models/network.proto @@ -3,6 +3,6 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; -message Network { +message ProtoNetwork { map properties = 1 [json_name = "properties"]; } diff --git a/models/ping.proto b/models/ping.proto index 54d5b834..2df3a8f0 100644 --- a/models/ping.proto +++ b/models/ping.proto @@ -4,6 +4,6 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; -message PingResponse { +message ProtoPingResponse { bool available = 1 [json_name = "available"]; } diff --git a/models/security_group.proto b/models/security_group.proto index 4371ceb7..e4da27fa 100644 --- a/models/security_group.proto +++ b/models/security_group.proto @@ -4,22 +4,22 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; -message PortRange { +message ProtoPortRange { uint32 start = 1 [json_name = "start"]; uint32 end = 2 [json_name = "end"]; } -message ICMPInfo { +message ProtoICMPInfo { int32 type = 1 [json_name = "type"]; int32 code = 2 [json_name = "code"]; } -message SecurityGroupRule { +message ProtoSecurityGroupRule { string protocol = 1; repeated string destinations = 2; repeated uint32 ports = 3 [packed = false]; - PortRange port_range = 4; - ICMPInfo icmp_info = 5; + ProtoPortRange port_range = 4; + ProtoICMPInfo icmp_info = 5; bool log = 6 [json_name = "log"]; repeated string annotations = 7; } diff --git a/models/sidecar.proto b/models/sidecar.proto index 8b126555..83a5e237 100644 --- a/models/sidecar.proto +++ b/models/sidecar.proto @@ -5,8 +5,8 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "actions.proto"; -message Sidecar { - Action action = 1; +message ProtoSidecar { + ProtoAction action = 1; int32 disk_mb = 2 [json_name = "disk_mb"]; int32 memory_mb = 3 [json_name = "memory_mb"]; diff --git a/models/task.proto b/models/task.proto index a1ffb207..a7b98122 100644 --- a/models/task.proto +++ b/models/task.proto @@ -14,10 +14,10 @@ import "image_layer.proto"; import "log_rate_limit.proto"; import "metric_tags.proto"; -message TaskDefinition { +message ProtoTaskDefinition { string root_fs = 1 [json_name = "rootfs"]; - repeated EnvironmentVariable environment_variables = 2 [json_name = "env"]; - Action action = 3; + repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env"]; + ProtoAction action = 3; int32 disk_mb = 4 [json_name = "disk_mb"]; int32 memory_mb = 5 [json_name = "memory_mb"]; uint32 cpu_weight = 6 [json_name = "cpu_weight"]; @@ -28,23 +28,23 @@ message TaskDefinition { string result_file = 11 [json_name = "result_file"]; string completion_callback_url = 12; string annotation = 13; - repeated SecurityGroupRule egress_rules = 14; - repeated CachedDependency cached_dependencies = 15; + repeated ProtoSecurityGroupRule egress_rules = 14; + repeated ProtoCachedDependency cached_dependencies = 15; string legacy_download_user = 16 [deprecated=true]; string trusted_system_certificates_path = 17; - repeated VolumeMount volume_mounts = 18; - Network network = 19; + repeated ProtoVolumeMount volume_mounts = 18; + ProtoNetwork network = 19; repeated string placement_tags = 20; int32 max_pids = 21 [json_name = "max_pids"]; - CertificateProperties certificate_properties = 22; + ProtoCertificateProperties certificate_properties = 22; string image_username = 23 [json_name = "image_username"]; string image_password = 24 [json_name = "image_password"]; - repeated ImageLayer image_layers = 25; - LogRateLimit log_rate_limit = 26; - map metric_tags = 27; + repeated ProtoImageLayer image_layers = 25; + ProtoLogRateLimit log_rate_limit = 26; + map metric_tags = 27; } -message Task { +message ProtoTask { enum State { Invalid = 0; Pending = 1; @@ -53,7 +53,7 @@ message Task { Resolving = 4; } - TaskDefinition task_definition = 1 [json_name = ""]; + ProtoTaskDefinition task_definition = 1 [json_name = ""]; string task_guid = 2 [json_name = "task_guid"]; string domain = 3 [json_name = "domain"]; diff --git a/models/task_requests.proto b/models/task_requests.proto index 3e1693a8..b87b08cf 100644 --- a/models/task_requests.proto +++ b/models/task_requests.proto @@ -6,42 +6,42 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "task.proto"; import "error.proto"; -message TaskLifecycleResponse { - Error error = 1; +message ProtoTaskLifecycleResponse { + ProtoError error = 1; } -message DesireTaskRequest { - TaskDefinition task_definition = 1 [json_name = "task_definition"]; +message ProtoDesireTaskRequest { + ProtoTaskDefinition task_definition = 1 [json_name = "task_definition"]; string task_guid = 2 [json_name = "task_guid"]; string domain = 3 [json_name = "domain"]; } -message StartTaskRequest { +message ProtoStartTaskRequest { string task_guid = 1 [json_name = "task_guid"]; string cell_id = 2 [json_name = "cell_id"]; } -message StartTaskResponse { - Error error = 1; +message ProtoStartTaskResponse { + ProtoError error = 1; bool should_start = 2 [json_name = "should_start"]; } -message FailTaskRequest { +message ProtoFailTaskRequest { option deprecated = true; string task_guid = 1 [json_name = "task_guid"]; string failure_reason = 2 [json_name = "failure_reason"]; } -message RejectTaskRequest { +message ProtoRejectTaskRequest { string task_guid = 1 [json_name = "task_guid"]; string rejection_reason = 2 [json_name = "rejection_reason"]; } -message TaskGuidRequest { +message ProtoTaskGuidRequest { string task_guid = 1 [json_name = "task_guid"]; } -message CompleteTaskRequest { +message ProtoCompleteTaskRequest { string task_guid = 1 [json_name = "task_guid"]; string cell_id = 2 [json_name = "cell_id"]; bool failed = 3 [json_name = "failed"]; @@ -49,7 +49,7 @@ message CompleteTaskRequest { string result = 5 [json_name = "result"]; } -message TaskCallbackResponse { +message ProtoTaskCallbackResponse { string task_guid = 1 [json_name = "task_guid"]; bool failed = 2 [json_name = "failed"]; string failure_reason = 3 [json_name = "failure_reason"]; @@ -58,21 +58,21 @@ message TaskCallbackResponse { int64 created_at = 6 [json_name = "created_at"]; } -message TasksRequest{ +message ProtoTasksRequest{ string domain = 1 [json_name = "domain"]; string cell_id = 2 [json_name = "cell_id"]; } -message TasksResponse{ - Error error = 1; - repeated Task tasks = 2; +message ProtoTasksResponse{ + ProtoError error = 1; + repeated ProtoTask tasks = 2; } -message TaskByGuidRequest{ +message ProtoTaskByGuidRequest{ string task_guid = 1 [json_name = "task_guid"]; } -message TaskResponse{ - Error error = 1; - Task task = 2; +message ProtoTaskResponse{ + ProtoError error = 1; + ProtoTask task = 2; } diff --git a/models/volume_mount.proto b/models/volume_mount.proto index d352d41b..a3bb09e4 100644 --- a/models/volume_mount.proto +++ b/models/volume_mount.proto @@ -3,12 +3,12 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; -message SharedDevice { +message ProtoSharedDevice { string volume_id = 1 [json_name = "volume_id"]; string mount_config = 2 [json_name = "mount_config"]; } -message VolumeMount { +message ProtoVolumeMount { reserved 2, 4, 5; string driver = 1 [json_name = "driver"]; @@ -16,10 +16,10 @@ message VolumeMount { string mode = 6 [json_name = "mode"]; // oneof device { - SharedDevice shared = 7 [json_name = "shared"]; + ProtoSharedDevice shared = 7 [json_name = "shared"]; // } } -message VolumePlacement { +message ProtoVolumePlacement { repeated string driver_names = 1 [json_name = "driver_names"]; } From f3514cfe9f914fd98c4962282c006392ea2000ef Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 29 Apr 2024 21:30:10 +0000 Subject: [PATCH 020/155] Add new protoc plugin for bbs code generation --- protoc-gen-go-bbs/bbs.go | 119 +++++++++++++++++++++++++++++------- protoc-gen-go-bbs/bbs.pb.go | 114 ++++++++++++++++++++++++++++++++++ protoc-gen-go-bbs/bbs.proto | 14 +++++ protoc-gen-go-bbs/go.mod | 11 ++++ protoc-gen-go-bbs/go.sum | 57 +++++++++++++++++ 5 files changed, 292 insertions(+), 23 deletions(-) create mode 100644 protoc-gen-go-bbs/bbs.pb.go create mode 100644 protoc-gen-go-bbs/bbs.proto diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 960dab33..d7e05ee1 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -3,9 +3,11 @@ package main import ( "fmt" "log" + "slices" "strings" "google.golang.org/protobuf/compiler/protogen" + "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/descriptorpb" ) @@ -14,6 +16,7 @@ type bbsGenerateHelperInterface interface { genCopysafeStruct(g *protogen.GeneratedFile, msg *protogen.Message) genToProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) genProtoMapMethod(g *protogen.GeneratedFile, msg *protogen.Message) + genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) } type bbsGenerateHelper struct{} @@ -37,35 +40,90 @@ func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *proto log.Printf("Field Options: %+v\n\n", options) } - var fieldType string - if field.Desc.Cardinality() == protoreflect.Repeated { - fieldType += "[]" - } + fieldType := getActualType(g, field) + g.P(field.GoName, " ", fieldType) + } + g.P("}") + } +} - if field.Message != nil { - if *debug { - log.Printf("Message Field Detected: %+v\n\n", field.Message) - log.Printf("Message Description: %+v\n\n", field.Message.Desc) - } - messageType, _ := getCopysafeName(g, field.Message.GoIdent) - fieldType += "*" + messageType - } else if field.Enum != nil { - if *debug { - log.Printf("Enum Field Detected: %+v\n\n", field.Enum) - log.Printf("Enum Description: %+v\n\n", field.Enum.Desc) - } - enumType := getUnsafeName(g, field.Enum.GoIdent) - fieldType += enumType - } else { - fieldType += field.Desc.Kind().String() +func getActualType(g *protogen.GeneratedFile, field *protogen.Field) string { + var fieldType string + if field.Desc.Cardinality() == protoreflect.Repeated { + fieldType = "[]" + } + + if field.Desc.IsMap() { + // check for maps first because legacy protobuf would generate "Entry" messages, + // and for some reason the Message field is still populated + if *debug { + log.Printf("Map Field Detected: %+v\n\n", field.Message) + } + mapValueType := field.Desc.MapValue().Kind().String() + if mapValueType == protoreflect.BytesKind.String() { + mapValueType = "[]byte" + } else if mapValueType == protoreflect.MessageKind.String() { + mapValueType = "*" + string(field.Desc.MapValue().Message().Name()) + } + + fieldType = "map[" + field.Desc.MapKey().Kind().String() + "]" + mapValueType + } else if field.Message != nil { + if *debug { + log.Printf("Message Field Detected: %+v\n\n", field.Message) + log.Printf("Message Description: %+v\n\n", field.Message.Desc) + } + messageType, _ := getCopysafeName(g, field.Message.GoIdent) + fieldType += "*" + messageType + } else if field.Enum != nil { + if *debug { + log.Printf("Enum Field Detected: %+v\n\n", field.Enum) + log.Printf("Enum Description: %+v\n\n", field.Enum.Desc) + } + enumType, _ := getCopysafeName(g, field.Enum.GoIdent) + fieldType += enumType + } else { + fieldType += field.Desc.Kind().String() + } + + return fieldType +} + +func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) { + if len(msg.Enums) > 0 { + for _, eNuM := range msg.Enums { + if *debug { + log.Printf("Nested Enum: %+v\n", eNuM) } - g.P(field.GoName, " ", fieldType) + copysafeName, _ := getCopysafeName(g, eNuM.GoIdent) + log.Printf("%s\n", copysafeName) + g.P("type ", copysafeName, " int32") + g.P("const (") + for _, enumValue := range eNuM.Values { + enumValueName := getEnumValueName(g, msg, enumValue) + actualValue := enumValue.Desc.Number() + + g.P(enumValueName, " ", copysafeName, "=", actualValue) + } + g.P(")") } - g.P("}") } } +func getEnumValueName(g *protogen.GeneratedFile, msg *protogen.Message, enumValue *protogen.EnumValue) string { + copysafeParentName, _ := getCopysafeName(g, msg.GoIdent) + copysafeEnumValueName, _ := getCopysafeName(g, enumValue.GoIdent) + customName := proto.GetExtension(enumValue.Desc.Options().(*descriptorpb.EnumValueOptions), E_BbsEnumvalueCustomname) + log.Printf("%+v\n", customName) + + result := copysafeEnumValueName + if len(customName.(string)) > 0 { + result = copysafeParentName + "_" + customName.(string) + } + return result + +} + func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) { unsafeName := getUnsafeName(g, msg.GoIdent) if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { @@ -75,10 +133,18 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog if field.Message != nil { if field.Desc.Cardinality() == protoreflect.Repeated { fieldCopysafeName, _ := getCopysafeName(g, field.Message.GoIdent) - g.P(field.GoName, ": ", fieldCopysafeName, "ProtoMap(x.", field.GoName, "),") + if field.Desc.IsList() { + g.P(field.GoName, ": ", fieldCopysafeName, "ProtoMap(x.", field.GoName, "),") + } else if field.Desc.IsMap() { + g.P(field.GoName, ": ", "x.", field.GoName, ",") + } else { + panic("Unrecognized Repeated field found") + } } else { g.P(field.GoName, ": x.", field.GoName, ".ToProto(),") } + } else if field.Enum != nil { + g.P(field.GoName, ": ", field.GoIdent, "(x.", field.GoName, "),") } else { if field.Oneof != nil { g.P(field.GoName, ": &x.", field.GoName, ",") @@ -142,12 +208,19 @@ func protocVersion(plugin *protogen.Plugin) string { return fmt.Sprintf("v%d.%d.%d%s", v.GetMajor(), v.GetMinor(), v.GetPatch(), suffix) } +var ignoredMessages []string = []string{"ProtoRoutes"} + func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { for _, msg := range file.Messages { if *debug { log.Printf("New Message Detected: %+v\n\n", msg) } + if slices.Contains(ignoredMessages, getUnsafeName(g, msg.GoIdent)) { + log.Printf("Ignoring message %s", msg.GoIdent) + continue + } + helper.genFriendlyEnums(g, msg) helper.genCopysafeStruct(g, msg) helper.genToProtoMethod(g, msg) helper.genProtoMapMethod(g, msg) diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go new file mode 100644 index 00000000..6d7aa073 --- /dev/null +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -0,0 +1,114 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: bbs.proto + +package main + +import ( + reflect "reflect" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1000, + Name: "bbs.bbs_json_name", + Tag: "bytes,1000,opt,name=bbs_json_name", + Filename: "bbs.proto", + }, + { + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), + ExtensionType: (*string)(nil), + Field: 2000, + Name: "bbs.bbs_enumvalue_customname", + Tag: "bytes,2000,opt,name=bbs_enumvalue_customname", + Filename: "bbs.proto", + }, +} + +// Extension fields to descriptorpb.FieldOptions. +var ( + // optional string bbs_json_name = 1000; + E_BbsJsonName = &file_bbs_proto_extTypes[0] +) + +// Extension fields to descriptorpb.EnumValueOptions. +var ( + // optional string bbs_enumvalue_customname = 2000; + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[1] +) + +var File_bbs_proto protoreflect.FileDescriptor + +var file_bbs_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, + 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x3a, 0x45, 0x0a, 0x0d, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x62, 0x73, 0x4a, 0x73, + 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, + 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, + 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var file_bbs_proto_goTypes = []interface{}{ + (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions + (*descriptorpb.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions +} +var file_bbs_proto_depIdxs = []int32{ + 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions + 1, // 1: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 0, // [0:2] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_bbs_proto_init() } +func file_bbs_proto_init() { + if File_bbs_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_bbs_proto_rawDesc, + NumEnums: 0, + NumMessages: 0, + NumExtensions: 2, + NumServices: 0, + }, + GoTypes: file_bbs_proto_goTypes, + DependencyIndexes: file_bbs_proto_depIdxs, + ExtensionInfos: file_bbs_proto_extTypes, + }.Build() + File_bbs_proto = out.File + file_bbs_proto_rawDesc = nil + file_bbs_proto_goTypes = nil + file_bbs_proto_depIdxs = nil +} diff --git a/protoc-gen-go-bbs/bbs.proto b/protoc-gen-go-bbs/bbs.proto new file mode 100644 index 00000000..1181f36c --- /dev/null +++ b/protoc-gen-go-bbs/bbs.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +package bbs; +option go_package="main"; + +import "google/protobuf/descriptor.proto"; + +extend google.protobuf.FieldOptions { + optional string bbs_json_name = 1000; +} + +extend google.protobuf.EnumValueOptions { + optional string bbs_enumvalue_customname = 2000; +} diff --git a/protoc-gen-go-bbs/go.mod b/protoc-gen-go-bbs/go.mod index 1974eff3..1bdafbde 100644 --- a/protoc-gen-go-bbs/go.mod +++ b/protoc-gen-go-bbs/go.mod @@ -3,3 +3,14 @@ module code.cloudfoundry.org/bbs/protoc-gen-go-bbs go 1.22.2 require google.golang.org/protobuf v1.33.0 + +require ( + code.cloudfoundry.org/bbs v0.0.0-20240418184526-a7ed0dccd9f7 // indirect + code.cloudfoundry.org/lager/v3 v3.0.3 // indirect + github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect + github.com/onsi/ginkgo/v2 v2.13.2 // indirect + github.com/openzipkin/zipkin-go v0.4.2 // indirect + golang.org/x/tools v0.14.0 // indirect +) diff --git a/protoc-gen-go-bbs/go.sum b/protoc-gen-go-bbs/go.sum index 2e26fa55..793164b2 100644 --- a/protoc-gen-go-bbs/go.sum +++ b/protoc-gen-go-bbs/go.sum @@ -1,6 +1,63 @@ +code.cloudfoundry.org/bbs v0.0.0-20240418184526-a7ed0dccd9f7 h1:vmwkTM1T0Hx6V4LgOGrU6dgkwNNJg5yf8Wyk1I6ptpg= +code.cloudfoundry.org/bbs v0.0.0-20240418184526-a7ed0dccd9f7/go.mod h1:XKlGVVXFi5EcHHMPzw3xgONK9PeEZuUbIC43XNwxD10= +code.cloudfoundry.org/lager/v3 v3.0.3 h1:/UTmadZfIaKuT/whEinSxK1mzRfNu1uPfvjFfGqiwzM= +code.cloudfoundry.org/lager/v3 v3.0.3/go.mod h1:Zn5q1SrIuuHjEUE7xerMKt3ztunrJQCZETAo7rV0CH8= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs= +github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= +github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= +github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From fb1e14db9e7c76a3a46936a4b1c4d29103d7fbcb Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 29 Apr 2024 21:33:24 +0000 Subject: [PATCH 021/155] Move bbs.proto to protoc plugin folder --- models/bbs.proto | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 models/bbs.proto diff --git a/models/bbs.proto b/models/bbs.proto deleted file mode 100644 index 4dd16b4b..00000000 --- a/models/bbs.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -package bbs; -option go_package="code.cloudfoundry.org/bbs/models"; - -import "google/protobuf/descriptor.proto"; - -extend google.protobuf.FieldOptions { - optional string bbs_json_name = 1000; -} - From 756bc4ea0926ab3c335361a8635855df40825986 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 29 Apr 2024 21:39:10 +0000 Subject: [PATCH 022/155] Make use of enumvalue_customvalue extension Remove extra Proto for ProtoRoutes Regen protos --- models/actions.pb.go | 1218 ++++++++++++++++++ models/actions_bbs.pb.go | 303 +++++ models/actual_lrp.pb.go | 927 ++++++++++++++ models/actual_lrp.proto | 14 +- models/actual_lrp_bbs.pb.go | 209 ++++ models/actual_lrp_requests.pb.go | 1273 +++++++++++++++++++ models/actual_lrp_requests_bbs.pb.go | 329 +++++ models/cached_dependency.pb.go | 204 +++ models/cached_dependency_bbs.pb.go | 39 + models/cells.pb.go | 455 +++++++ models/cells_bbs.pb.go | 109 ++ models/certificate_properties.pb.go | 147 +++ models/certificate_properties_bbs.pb.go | 27 + models/check_definition.pb.go | 425 +++++++ models/check_definition_bbs.pb.go | 103 ++ models/desired_lrp.pb.go | 1520 +++++++++++++++++++++++ models/desired_lrp.proto | 8 +- models/desired_lrp_bbs.pb.go | 281 +++++ models/desired_lrp_requests.pb.go | 821 ++++++++++++ models/desired_lrp_requests_bbs.pb.go | 219 ++++ models/domain.pb.go | 296 +++++ models/domain_bbs.pb.go | 71 ++ models/environment_variables.pb.go | 154 +++ models/environment_variables_bbs.pb.go | 29 + models/error.pb.go | 312 +++++ models/error_bbs.pb.go | 59 + models/evacuation.pb.go | 726 +++++++++++ models/evacuation_bbs.pb.go | 171 +++ models/events.pb.go | 1373 ++++++++++++++++++++ models/events_bbs.pb.go | 357 ++++++ models/image_layer.pb.go | 382 ++++++ models/image_layer.proto | 18 +- models/image_layer_bbs.pb.go | 64 + models/log_rate_limit.pb.go | 145 +++ models/log_rate_limit_bbs.pb.go | 27 + models/metric_tags.pb.go | 216 ++++ models/metric_tags.proto | 4 +- models/metric_tags_bbs.pb.go | 37 + models/modification_tag.pb.go | 153 +++ models/modification_tag_bbs.pb.go | 29 + models/network.pb.go | 152 +++ models/network_bbs.pb.go | 27 + models/ping.pb.go | 144 +++ models/ping_bbs.pb.go | 27 + models/security_group.pb.go | 352 ++++++ models/security_group_bbs.pb.go | 83 ++ models/sidecar.pb.go | 168 +++ models/sidecar_bbs.pb.go | 31 + models/task.pb.go | 736 +++++++++++ models/task_bbs.pb.go | 133 ++ models/task_requests.pb.go | 1106 +++++++++++++++++ models/task_requests_bbs.pb.go | 303 +++++ models/volume_mount.pb.go | 315 +++++ models/volume_mount_bbs.pb.go | 75 ++ 54 files changed, 16884 insertions(+), 22 deletions(-) create mode 100644 models/actions.pb.go create mode 100644 models/actions_bbs.pb.go create mode 100644 models/actual_lrp.pb.go create mode 100644 models/actual_lrp_bbs.pb.go create mode 100644 models/actual_lrp_requests.pb.go create mode 100644 models/actual_lrp_requests_bbs.pb.go create mode 100644 models/cached_dependency.pb.go create mode 100644 models/cached_dependency_bbs.pb.go create mode 100644 models/cells.pb.go create mode 100644 models/cells_bbs.pb.go create mode 100644 models/certificate_properties.pb.go create mode 100644 models/certificate_properties_bbs.pb.go create mode 100644 models/check_definition.pb.go create mode 100644 models/check_definition_bbs.pb.go create mode 100644 models/desired_lrp.pb.go create mode 100644 models/desired_lrp_bbs.pb.go create mode 100644 models/desired_lrp_requests.pb.go create mode 100644 models/desired_lrp_requests_bbs.pb.go create mode 100644 models/domain.pb.go create mode 100644 models/domain_bbs.pb.go create mode 100644 models/environment_variables.pb.go create mode 100644 models/environment_variables_bbs.pb.go create mode 100644 models/error.pb.go create mode 100644 models/error_bbs.pb.go create mode 100644 models/evacuation.pb.go create mode 100644 models/evacuation_bbs.pb.go create mode 100644 models/events.pb.go create mode 100644 models/events_bbs.pb.go create mode 100644 models/image_layer.pb.go create mode 100644 models/image_layer_bbs.pb.go create mode 100644 models/log_rate_limit.pb.go create mode 100644 models/log_rate_limit_bbs.pb.go create mode 100644 models/metric_tags.pb.go create mode 100644 models/metric_tags_bbs.pb.go create mode 100644 models/modification_tag.pb.go create mode 100644 models/modification_tag_bbs.pb.go create mode 100644 models/network.pb.go create mode 100644 models/network_bbs.pb.go create mode 100644 models/ping.pb.go create mode 100644 models/ping_bbs.pb.go create mode 100644 models/security_group.pb.go create mode 100644 models/security_group_bbs.pb.go create mode 100644 models/sidecar.pb.go create mode 100644 models/sidecar_bbs.pb.go create mode 100644 models/task.pb.go create mode 100644 models/task_bbs.pb.go create mode 100644 models/task_requests.pb.go create mode 100644 models/task_requests_bbs.pb.go create mode 100644 models/volume_mount.pb.go create mode 100644 models/volume_mount_bbs.pb.go diff --git a/models/actions.pb.go b/models/actions.pb.go new file mode 100644 index 00000000..d73476ad --- /dev/null +++ b/models/actions.pb.go @@ -0,0 +1,1218 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: actions.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Note: we only expect one of the following set of fields to be + // set. Previously we used `option (gogoproto.onlyone) = true' but since this + // is now deprecated and oneof introduces a lot of structural changes, we + // deferred on switching to oneof for now until there is a good reason for it. + // disadvantages of using multiple optionals as opposed to oneof are: + // - less memory usage + // + // disadvantages of using multiple optionals without onlyone: + // - writing our own GetAction/SetAction methods + // + // action oneof { + DownloadAction *ProtoDownloadAction `protobuf:"bytes,1,opt,name=download_action,json=download,proto3" json:"download_action,omitempty"` + UploadAction *ProtoUploadAction `protobuf:"bytes,2,opt,name=upload_action,json=upload,proto3" json:"upload_action,omitempty"` + RunAction *ProtoRunAction `protobuf:"bytes,3,opt,name=run_action,json=run,proto3" json:"run_action,omitempty"` + TimeoutAction *ProtoTimeoutAction `protobuf:"bytes,4,opt,name=timeout_action,json=timeout,proto3" json:"timeout_action,omitempty"` + EmitProgressAction *ProtoEmitProgressAction `protobuf:"bytes,5,opt,name=emit_progress_action,json=emit_progress,proto3" json:"emit_progress_action,omitempty"` + TryAction *ProtoTryAction `protobuf:"bytes,6,opt,name=try_action,json=try,proto3" json:"try_action,omitempty"` + ParallelAction *ProtoParallelAction `protobuf:"bytes,7,opt,name=parallel_action,json=parallel,proto3" json:"parallel_action,omitempty"` + SerialAction *ProtoSerialAction `protobuf:"bytes,8,opt,name=serial_action,json=serial,proto3" json:"serial_action,omitempty"` + CodependentAction *ProtoCodependentAction `protobuf:"bytes,9,opt,name=codependent_action,json=codependent,proto3" json:"codependent_action,omitempty"` // } +} + +func (x *ProtoAction) Reset() { + *x = ProtoAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoAction) ProtoMessage() {} + +func (x *ProtoAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoAction.ProtoReflect.Descriptor instead. +func (*ProtoAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoAction) GetDownloadAction() *ProtoDownloadAction { + if x != nil { + return x.DownloadAction + } + return nil +} + +func (x *ProtoAction) GetUploadAction() *ProtoUploadAction { + if x != nil { + return x.UploadAction + } + return nil +} + +func (x *ProtoAction) GetRunAction() *ProtoRunAction { + if x != nil { + return x.RunAction + } + return nil +} + +func (x *ProtoAction) GetTimeoutAction() *ProtoTimeoutAction { + if x != nil { + return x.TimeoutAction + } + return nil +} + +func (x *ProtoAction) GetEmitProgressAction() *ProtoEmitProgressAction { + if x != nil { + return x.EmitProgressAction + } + return nil +} + +func (x *ProtoAction) GetTryAction() *ProtoTryAction { + if x != nil { + return x.TryAction + } + return nil +} + +func (x *ProtoAction) GetParallelAction() *ProtoParallelAction { + if x != nil { + return x.ParallelAction + } + return nil +} + +func (x *ProtoAction) GetSerialAction() *ProtoSerialAction { + if x != nil { + return x.SerialAction + } + return nil +} + +func (x *ProtoAction) GetCodependentAction() *ProtoCodependentAction { + if x != nil { + return x.CodependentAction + } + return nil +} + +type ProtoDownloadAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` + ChecksumAlgorithm string `protobuf:"bytes,7,opt,name=checksum_algorithm,json=checksumAlgorithm,proto3" json:"checksum_algorithm,omitempty"` + ChecksumValue string `protobuf:"bytes,8,opt,name=checksum_value,json=checksumValue,proto3" json:"checksum_value,omitempty"` +} + +func (x *ProtoDownloadAction) Reset() { + *x = ProtoDownloadAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDownloadAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDownloadAction) ProtoMessage() {} + +func (x *ProtoDownloadAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDownloadAction.ProtoReflect.Descriptor instead. +func (*ProtoDownloadAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoDownloadAction) GetArtifact() string { + if x != nil { + return x.Artifact + } + return "" +} + +func (x *ProtoDownloadAction) GetFrom() string { + if x != nil { + return x.From + } + return "" +} + +func (x *ProtoDownloadAction) GetTo() string { + if x != nil { + return x.To + } + return "" +} + +func (x *ProtoDownloadAction) GetCacheKey() string { + if x != nil { + return x.CacheKey + } + return "" +} + +func (x *ProtoDownloadAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoDownloadAction) GetUser() string { + if x != nil { + return x.User + } + return "" +} + +func (x *ProtoDownloadAction) GetChecksumAlgorithm() string { + if x != nil { + return x.ChecksumAlgorithm + } + return "" +} + +func (x *ProtoDownloadAction) GetChecksumValue() string { + if x != nil { + return x.ChecksumValue + } + return "" +} + +type ProtoUploadAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + LogSource string `protobuf:"bytes,4,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + User string `protobuf:"bytes,5,opt,name=user,proto3" json:"user,omitempty"` +} + +func (x *ProtoUploadAction) Reset() { + *x = ProtoUploadAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoUploadAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoUploadAction) ProtoMessage() {} + +func (x *ProtoUploadAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoUploadAction.ProtoReflect.Descriptor instead. +func (*ProtoUploadAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoUploadAction) GetArtifact() string { + if x != nil { + return x.Artifact + } + return "" +} + +func (x *ProtoUploadAction) GetFrom() string { + if x != nil { + return x.From + } + return "" +} + +func (x *ProtoUploadAction) GetTo() string { + if x != nil { + return x.To + } + return "" +} + +func (x *ProtoUploadAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoUploadAction) GetUser() string { + if x != nil { + return x.User + } + return "" +} + +type ProtoRunAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` + Dir string `protobuf:"bytes,3,opt,name=dir,proto3" json:"dir,omitempty"` + Env []*ProtoEnvironmentVariable `protobuf:"bytes,4,rep,name=env,proto3" json:"env,omitempty"` + ResourceLimits *ProtoResourceLimits `protobuf:"bytes,5,opt,name=resource_limits,json=resourceLimits,proto3" json:"resource_limits,omitempty"` + User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` + LogSource string `protobuf:"bytes,7,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + SuppressLogOutput bool `protobuf:"varint,8,opt,name=suppress_log_output,proto3" json:"suppress_log_output,omitempty"` +} + +func (x *ProtoRunAction) Reset() { + *x = ProtoRunAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRunAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRunAction) ProtoMessage() {} + +func (x *ProtoRunAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRunAction.ProtoReflect.Descriptor instead. +func (*ProtoRunAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoRunAction) GetPath() string { + if x != nil { + return x.Path + } + return "" +} + +func (x *ProtoRunAction) GetArgs() []string { + if x != nil { + return x.Args + } + return nil +} + +func (x *ProtoRunAction) GetDir() string { + if x != nil { + return x.Dir + } + return "" +} + +func (x *ProtoRunAction) GetEnv() []*ProtoEnvironmentVariable { + if x != nil { + return x.Env + } + return nil +} + +func (x *ProtoRunAction) GetResourceLimits() *ProtoResourceLimits { + if x != nil { + return x.ResourceLimits + } + return nil +} + +func (x *ProtoRunAction) GetUser() string { + if x != nil { + return x.User + } + return "" +} + +func (x *ProtoRunAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoRunAction) GetSuppressLogOutput() bool { + if x != nil { + return x.SuppressLogOutput + } + return false +} + +type ProtoTimeoutAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + // Deprecated: Marked as deprecated in actions.proto. + DeprecatedTimeoutNs int64 `protobuf:"varint,2,opt,name=deprecated_timeout_ns,json=timeout,proto3" json:"deprecated_timeout_ns,omitempty"` + LogSource string `protobuf:"bytes,3,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + TimeoutMs int64 `protobuf:"varint,4,opt,name=timeout_ms,proto3" json:"timeout_ms,omitempty"` +} + +func (x *ProtoTimeoutAction) Reset() { + *x = ProtoTimeoutAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTimeoutAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTimeoutAction) ProtoMessage() {} + +func (x *ProtoTimeoutAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTimeoutAction.ProtoReflect.Descriptor instead. +func (*ProtoTimeoutAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoTimeoutAction) GetAction() *ProtoAction { + if x != nil { + return x.Action + } + return nil +} + +// Deprecated: Marked as deprecated in actions.proto. +func (x *ProtoTimeoutAction) GetDeprecatedTimeoutNs() int64 { + if x != nil { + return x.DeprecatedTimeoutNs + } + return 0 +} + +func (x *ProtoTimeoutAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoTimeoutAction) GetTimeoutMs() int64 { + if x != nil { + return x.TimeoutMs + } + return 0 +} + +type ProtoEmitProgressAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + StartMessage string `protobuf:"bytes,2,opt,name=start_message,proto3" json:"start_message,omitempty"` + SuccessMessage string `protobuf:"bytes,3,opt,name=success_message,proto3" json:"success_message,omitempty"` + FailureMessagePrefix string `protobuf:"bytes,4,opt,name=failure_message_prefix,proto3" json:"failure_message_prefix,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` +} + +func (x *ProtoEmitProgressAction) Reset() { + *x = ProtoEmitProgressAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEmitProgressAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEmitProgressAction) ProtoMessage() {} + +func (x *ProtoEmitProgressAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEmitProgressAction.ProtoReflect.Descriptor instead. +func (*ProtoEmitProgressAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoEmitProgressAction) GetAction() *ProtoAction { + if x != nil { + return x.Action + } + return nil +} + +func (x *ProtoEmitProgressAction) GetStartMessage() string { + if x != nil { + return x.StartMessage + } + return "" +} + +func (x *ProtoEmitProgressAction) GetSuccessMessage() string { + if x != nil { + return x.SuccessMessage + } + return "" +} + +func (x *ProtoEmitProgressAction) GetFailureMessagePrefix() string { + if x != nil { + return x.FailureMessagePrefix + } + return "" +} + +func (x *ProtoEmitProgressAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +type ProtoTryAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` +} + +func (x *ProtoTryAction) Reset() { + *x = ProtoTryAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTryAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTryAction) ProtoMessage() {} + +func (x *ProtoTryAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTryAction.ProtoReflect.Descriptor instead. +func (*ProtoTryAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoTryAction) GetAction() *ProtoAction { + if x != nil { + return x.Action + } + return nil +} + +func (x *ProtoTryAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +type ProtoParallelAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` +} + +func (x *ProtoParallelAction) Reset() { + *x = ProtoParallelAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoParallelAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoParallelAction) ProtoMessage() {} + +func (x *ProtoParallelAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoParallelAction.ProtoReflect.Descriptor instead. +func (*ProtoParallelAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{7} +} + +func (x *ProtoParallelAction) GetActions() []*ProtoAction { + if x != nil { + return x.Actions + } + return nil +} + +func (x *ProtoParallelAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +type ProtoSerialAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` +} + +func (x *ProtoSerialAction) Reset() { + *x = ProtoSerialAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoSerialAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoSerialAction) ProtoMessage() {} + +func (x *ProtoSerialAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[8] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoSerialAction.ProtoReflect.Descriptor instead. +func (*ProtoSerialAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{8} +} + +func (x *ProtoSerialAction) GetActions() []*ProtoAction { + if x != nil { + return x.Actions + } + return nil +} + +func (x *ProtoSerialAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +type ProtoCodependentAction struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` +} + +func (x *ProtoCodependentAction) Reset() { + *x = ProtoCodependentAction{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCodependentAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCodependentAction) ProtoMessage() {} + +func (x *ProtoCodependentAction) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCodependentAction.ProtoReflect.Descriptor instead. +func (*ProtoCodependentAction) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{9} +} + +func (x *ProtoCodependentAction) GetActions() []*ProtoAction { + if x != nil { + return x.Actions + } + return nil +} + +func (x *ProtoCodependentAction) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +type ProtoResourceLimits struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Nofile *uint64 `protobuf:"varint,1,opt,name=nofile,proto3,oneof" json:"nofile,omitempty"` + // Deprecated: Marked as deprecated in actions.proto. + Nproc *uint64 `protobuf:"varint,2,opt,name=nproc,proto3,oneof" json:"nproc,omitempty"` +} + +func (x *ProtoResourceLimits) Reset() { + *x = ProtoResourceLimits{} + if protoimpl.UnsafeEnabled { + mi := &file_actions_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoResourceLimits) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoResourceLimits) ProtoMessage() {} + +func (x *ProtoResourceLimits) ProtoReflect() protoreflect.Message { + mi := &file_actions_proto_msgTypes[10] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoResourceLimits.ProtoReflect.Descriptor instead. +func (*ProtoResourceLimits) Descriptor() ([]byte, []int) { + return file_actions_proto_rawDescGZIP(), []int{10} +} + +func (x *ProtoResourceLimits) GetNofile() uint64 { + if x != nil && x.Nofile != nil { + return *x.Nofile + } + return 0 +} + +// Deprecated: Marked as deprecated in actions.proto. +func (x *ProtoResourceLimits) GetNproc() uint64 { + if x != nil && x.Nproc != nil { + return *x.Nproc + } + return 0 +} + +var File_actions_proto protoreflect.FileDescriptor + +var file_actions_proto_rawDesc = []byte{ + 0x0a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, + 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb7, 0x04, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, + 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, + 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x64, 0x6f, 0x77, 0x6e, + 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x38, 0x0a, 0x0d, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2f, + 0x0a, 0x0a, 0x72, 0x75, 0x6e, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x72, 0x75, 0x6e, 0x12, + 0x3b, 0x0a, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4c, 0x0a, 0x14, + 0x65, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, + 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x65, 0x6d, 0x69, + 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2f, 0x0a, 0x0a, 0x74, 0x72, + 0x79, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x72, 0x79, 0x12, 0x3e, 0x0a, 0x0f, 0x70, + 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x08, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x12, 0x38, 0x0a, 0x0d, 0x73, + 0x65, 0x72, 0x69, 0x61, 0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x73, + 0x65, 0x72, 0x69, 0x61, 0x6c, 0x12, 0x47, 0x0a, 0x12, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x0b, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x22, 0xfc, + 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, + 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, + 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, + 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, + 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x41, 0x6c, 0x67, + 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, + 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x86, 0x01, + 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x12, + 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, + 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x74, 0x6f, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xa9, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, + 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, + 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x67, + 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x64, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, + 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, + 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x44, 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, 0x0e, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x12, 0x0a, + 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, + 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x12, 0x30, 0x0a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, + 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x73, + 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, + 0x75, 0x74, 0x22, 0xac, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, + 0x75, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, + 0x73, 0x22, 0xed, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, 0x50, + 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, + 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x0a, 0x16, 0x66, 0x61, + 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, + 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x66, 0x61, 0x69, 0x6c, + 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, + 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x22, 0x5c, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, + 0x63, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x22, 0x61, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, + 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, + 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, + 0x66, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, + 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x04, 0x42, 0x02, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, + 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, + 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, +} + +var ( + file_actions_proto_rawDescOnce sync.Once + file_actions_proto_rawDescData = file_actions_proto_rawDesc +) + +func file_actions_proto_rawDescGZIP() []byte { + file_actions_proto_rawDescOnce.Do(func() { + file_actions_proto_rawDescData = protoimpl.X.CompressGZIP(file_actions_proto_rawDescData) + }) + return file_actions_proto_rawDescData +} + +var file_actions_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_actions_proto_goTypes = []interface{}{ + (*ProtoAction)(nil), // 0: models.ProtoAction + (*ProtoDownloadAction)(nil), // 1: models.ProtoDownloadAction + (*ProtoUploadAction)(nil), // 2: models.ProtoUploadAction + (*ProtoRunAction)(nil), // 3: models.ProtoRunAction + (*ProtoTimeoutAction)(nil), // 4: models.ProtoTimeoutAction + (*ProtoEmitProgressAction)(nil), // 5: models.ProtoEmitProgressAction + (*ProtoTryAction)(nil), // 6: models.ProtoTryAction + (*ProtoParallelAction)(nil), // 7: models.ProtoParallelAction + (*ProtoSerialAction)(nil), // 8: models.ProtoSerialAction + (*ProtoCodependentAction)(nil), // 9: models.ProtoCodependentAction + (*ProtoResourceLimits)(nil), // 10: models.ProtoResourceLimits + (*ProtoEnvironmentVariable)(nil), // 11: models.ProtoEnvironmentVariable +} +var file_actions_proto_depIdxs = []int32{ + 1, // 0: models.ProtoAction.download_action:type_name -> models.ProtoDownloadAction + 2, // 1: models.ProtoAction.upload_action:type_name -> models.ProtoUploadAction + 3, // 2: models.ProtoAction.run_action:type_name -> models.ProtoRunAction + 4, // 3: models.ProtoAction.timeout_action:type_name -> models.ProtoTimeoutAction + 5, // 4: models.ProtoAction.emit_progress_action:type_name -> models.ProtoEmitProgressAction + 6, // 5: models.ProtoAction.try_action:type_name -> models.ProtoTryAction + 7, // 6: models.ProtoAction.parallel_action:type_name -> models.ProtoParallelAction + 8, // 7: models.ProtoAction.serial_action:type_name -> models.ProtoSerialAction + 9, // 8: models.ProtoAction.codependent_action:type_name -> models.ProtoCodependentAction + 11, // 9: models.ProtoRunAction.env:type_name -> models.ProtoEnvironmentVariable + 10, // 10: models.ProtoRunAction.resource_limits:type_name -> models.ProtoResourceLimits + 0, // 11: models.ProtoTimeoutAction.action:type_name -> models.ProtoAction + 0, // 12: models.ProtoEmitProgressAction.action:type_name -> models.ProtoAction + 0, // 13: models.ProtoTryAction.action:type_name -> models.ProtoAction + 0, // 14: models.ProtoParallelAction.actions:type_name -> models.ProtoAction + 0, // 15: models.ProtoSerialAction.actions:type_name -> models.ProtoAction + 0, // 16: models.ProtoCodependentAction.actions:type_name -> models.ProtoAction + 17, // [17:17] is the sub-list for method output_type + 17, // [17:17] is the sub-list for method input_type + 17, // [17:17] is the sub-list for extension type_name + 17, // [17:17] is the sub-list for extension extendee + 0, // [0:17] is the sub-list for field type_name +} + +func init() { file_actions_proto_init() } +func file_actions_proto_init() { + if File_actions_proto != nil { + return + } + file_environment_variables_proto_init() + if !protoimpl.UnsafeEnabled { + file_actions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDownloadAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoUploadAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRunAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTimeoutAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEmitProgressAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTryAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoParallelAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoSerialAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCodependentAction); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actions_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoResourceLimits); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_actions_proto_msgTypes[10].OneofWrappers = []interface{}{} + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_actions_proto_rawDesc, + NumEnums: 0, + NumMessages: 11, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_actions_proto_goTypes, + DependencyIndexes: file_actions_proto_depIdxs, + MessageInfos: file_actions_proto_msgTypes, + }.Build() + File_actions_proto = out.File + file_actions_proto_rawDesc = nil + file_actions_proto_goTypes = nil + file_actions_proto_depIdxs = nil +} diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go new file mode 100644 index 00000000..df3099a6 --- /dev/null +++ b/models/actions_bbs.pb.go @@ -0,0 +1,303 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: actions.proto + +package models + +// Prevent copylock errors when using ProtoAction directly +type Action struct { + DownloadAction *DownloadAction + UploadAction *UploadAction + RunAction *RunAction + TimeoutAction *TimeoutAction + EmitProgressAction *EmitProgressAction + TryAction *TryAction + ParallelAction *ParallelAction + SerialAction *SerialAction + CodependentAction *CodependentAction +} + +func (x *Action) ToProto() *ProtoAction { + proto := &ProtoAction{ + DownloadAction: x.DownloadAction.ToProto(), + UploadAction: x.UploadAction.ToProto(), + RunAction: x.RunAction.ToProto(), + TimeoutAction: x.TimeoutAction.ToProto(), + EmitProgressAction: x.EmitProgressAction.ToProto(), + TryAction: x.TryAction.ToProto(), + ParallelAction: x.ParallelAction.ToProto(), + SerialAction: x.SerialAction.ToProto(), + CodependentAction: x.CodependentAction.ToProto(), + } + return proto +} + +func ActionProtoMap(values []*Action) []*ProtoAction { + result := make([]*ProtoAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDownloadAction directly +type DownloadAction struct { + Artifact string + From string + To string + CacheKey string + LogSource string + User string + ChecksumAlgorithm string + ChecksumValue string +} + +func (x *DownloadAction) ToProto() *ProtoDownloadAction { + proto := &ProtoDownloadAction{ + Artifact: x.Artifact, + From: x.From, + To: x.To, + CacheKey: x.CacheKey, + LogSource: x.LogSource, + User: x.User, + ChecksumAlgorithm: x.ChecksumAlgorithm, + ChecksumValue: x.ChecksumValue, + } + return proto +} + +func DownloadActionProtoMap(values []*DownloadAction) []*ProtoDownloadAction { + result := make([]*ProtoDownloadAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoUploadAction directly +type UploadAction struct { + Artifact string + From string + To string + LogSource string + User string +} + +func (x *UploadAction) ToProto() *ProtoUploadAction { + proto := &ProtoUploadAction{ + Artifact: x.Artifact, + From: x.From, + To: x.To, + LogSource: x.LogSource, + User: x.User, + } + return proto +} + +func UploadActionProtoMap(values []*UploadAction) []*ProtoUploadAction { + result := make([]*ProtoUploadAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoRunAction directly +type RunAction struct { + Path string + Args []string + Dir string + Env []*EnvironmentVariable + ResourceLimits *ResourceLimits + User string + LogSource string + SuppressLogOutput bool +} + +func (x *RunAction) ToProto() *ProtoRunAction { + proto := &ProtoRunAction{ + Path: x.Path, + Args: x.Args, + Dir: x.Dir, + Env: EnvironmentVariableProtoMap(x.Env), + ResourceLimits: x.ResourceLimits.ToProto(), + User: x.User, + LogSource: x.LogSource, + SuppressLogOutput: x.SuppressLogOutput, + } + return proto +} + +func RunActionProtoMap(values []*RunAction) []*ProtoRunAction { + result := make([]*ProtoRunAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTimeoutAction directly +type TimeoutAction struct { + Action *Action + DeprecatedTimeoutNs int64 + LogSource string + TimeoutMs int64 +} + +func (x *TimeoutAction) ToProto() *ProtoTimeoutAction { + proto := &ProtoTimeoutAction{ + Action: x.Action.ToProto(), + DeprecatedTimeoutNs: x.DeprecatedTimeoutNs, + LogSource: x.LogSource, + TimeoutMs: x.TimeoutMs, + } + return proto +} + +func TimeoutActionProtoMap(values []*TimeoutAction) []*ProtoTimeoutAction { + result := make([]*ProtoTimeoutAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoEmitProgressAction directly +type EmitProgressAction struct { + Action *Action + StartMessage string + SuccessMessage string + FailureMessagePrefix string + LogSource string +} + +func (x *EmitProgressAction) ToProto() *ProtoEmitProgressAction { + proto := &ProtoEmitProgressAction{ + Action: x.Action.ToProto(), + StartMessage: x.StartMessage, + SuccessMessage: x.SuccessMessage, + FailureMessagePrefix: x.FailureMessagePrefix, + LogSource: x.LogSource, + } + return proto +} + +func EmitProgressActionProtoMap(values []*EmitProgressAction) []*ProtoEmitProgressAction { + result := make([]*ProtoEmitProgressAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTryAction directly +type TryAction struct { + Action *Action + LogSource string +} + +func (x *TryAction) ToProto() *ProtoTryAction { + proto := &ProtoTryAction{ + Action: x.Action.ToProto(), + LogSource: x.LogSource, + } + return proto +} + +func TryActionProtoMap(values []*TryAction) []*ProtoTryAction { + result := make([]*ProtoTryAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoParallelAction directly +type ParallelAction struct { + Actions []*Action + LogSource string +} + +func (x *ParallelAction) ToProto() *ProtoParallelAction { + proto := &ProtoParallelAction{ + Actions: ActionProtoMap(x.Actions), + LogSource: x.LogSource, + } + return proto +} + +func ParallelActionProtoMap(values []*ParallelAction) []*ProtoParallelAction { + result := make([]*ProtoParallelAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoSerialAction directly +type SerialAction struct { + Actions []*Action + LogSource string +} + +func (x *SerialAction) ToProto() *ProtoSerialAction { + proto := &ProtoSerialAction{ + Actions: ActionProtoMap(x.Actions), + LogSource: x.LogSource, + } + return proto +} + +func SerialActionProtoMap(values []*SerialAction) []*ProtoSerialAction { + result := make([]*ProtoSerialAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoCodependentAction directly +type CodependentAction struct { + Actions []*Action + LogSource string +} + +func (x *CodependentAction) ToProto() *ProtoCodependentAction { + proto := &ProtoCodependentAction{ + Actions: ActionProtoMap(x.Actions), + LogSource: x.LogSource, + } + return proto +} + +func CodependentActionProtoMap(values []*CodependentAction) []*ProtoCodependentAction { + result := make([]*ProtoCodependentAction, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoResourceLimits directly +type ResourceLimits struct { + Nofile uint64 + Nproc uint64 +} + +func (x *ResourceLimits) ToProto() *ProtoResourceLimits { + proto := &ProtoResourceLimits{ + Nofile: &x.Nofile, + Nproc: &x.Nproc, + } + return proto +} + +func ResourceLimitsProtoMap(values []*ResourceLimits) []*ProtoResourceLimits { + result := make([]*ProtoResourceLimits, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go new file mode 100644 index 00000000..038c13de --- /dev/null +++ b/models/actual_lrp.pb.go @@ -0,0 +1,927 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: actual_lrp.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoActualLRPNetInfo_PreferredAddress int32 + +const ( + ProtoActualLRPNetInfo_UNKNOWN ProtoActualLRPNetInfo_PreferredAddress = 0 + ProtoActualLRPNetInfo_INSTANCE ProtoActualLRPNetInfo_PreferredAddress = 1 + ProtoActualLRPNetInfo_HOST ProtoActualLRPNetInfo_PreferredAddress = 2 +) + +// Enum value maps for ProtoActualLRPNetInfo_PreferredAddress. +var ( + ProtoActualLRPNetInfo_PreferredAddress_name = map[int32]string{ + 0: "UNKNOWN", + 1: "INSTANCE", + 2: "HOST", + } + ProtoActualLRPNetInfo_PreferredAddress_value = map[string]int32{ + "UNKNOWN": 0, + "INSTANCE": 1, + "HOST": 2, + } +) + +func (x ProtoActualLRPNetInfo_PreferredAddress) Enum() *ProtoActualLRPNetInfo_PreferredAddress { + p := new(ProtoActualLRPNetInfo_PreferredAddress) + *p = x + return p +} + +func (x ProtoActualLRPNetInfo_PreferredAddress) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoActualLRPNetInfo_PreferredAddress) Descriptor() protoreflect.EnumDescriptor { + return file_actual_lrp_proto_enumTypes[0].Descriptor() +} + +func (ProtoActualLRPNetInfo_PreferredAddress) Type() protoreflect.EnumType { + return &file_actual_lrp_proto_enumTypes[0] +} + +func (x ProtoActualLRPNetInfo_PreferredAddress) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoActualLRPNetInfo_PreferredAddress.Descriptor instead. +func (ProtoActualLRPNetInfo_PreferredAddress) EnumDescriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{4, 0} +} + +type ProtoActualLRP_Presence int32 + +const ( + ProtoActualLRP_ORDINARY ProtoActualLRP_Presence = 0 + ProtoActualLRP_EVACUATING ProtoActualLRP_Presence = 1 + ProtoActualLRP_SUSPECT ProtoActualLRP_Presence = 2 +) + +// Enum value maps for ProtoActualLRP_Presence. +var ( + ProtoActualLRP_Presence_name = map[int32]string{ + 0: "ORDINARY", + 1: "EVACUATING", + 2: "SUSPECT", + } + ProtoActualLRP_Presence_value = map[string]int32{ + "ORDINARY": 0, + "EVACUATING": 1, + "SUSPECT": 2, + } +) + +func (x ProtoActualLRP_Presence) Enum() *ProtoActualLRP_Presence { + p := new(ProtoActualLRP_Presence) + *p = x + return p +} + +func (x ProtoActualLRP_Presence) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoActualLRP_Presence) Descriptor() protoreflect.EnumDescriptor { + return file_actual_lrp_proto_enumTypes[1].Descriptor() +} + +func (ProtoActualLRP_Presence) Type() protoreflect.EnumType { + return &file_actual_lrp_proto_enumTypes[1] +} + +func (x ProtoActualLRP_Presence) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoActualLRP_Presence.Descriptor instead. +func (ProtoActualLRP_Presence) EnumDescriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{6, 0} +} + +// Deprecated: Marked as deprecated in actual_lrp.proto. +type ProtoActualLRPGroup struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Instance *ProtoActualLRP `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"` + Evacuating *ProtoActualLRP `protobuf:"bytes,2,opt,name=evacuating,proto3" json:"evacuating,omitempty"` +} + +func (x *ProtoActualLRPGroup) Reset() { + *x = ProtoActualLRPGroup{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPGroup) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPGroup) ProtoMessage() {} + +func (x *ProtoActualLRPGroup) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPGroup.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPGroup) Descriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoActualLRPGroup) GetInstance() *ProtoActualLRP { + if x != nil { + return x.Instance + } + return nil +} + +func (x *ProtoActualLRPGroup) GetEvacuating() *ProtoActualLRP { + if x != nil { + return x.Evacuating + } + return nil +} + +type ProtoPortMapping struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ContainerPort uint32 `protobuf:"varint,1,opt,name=container_port,proto3" json:"container_port,omitempty"` + HostPort uint32 `protobuf:"varint,2,opt,name=host_port,proto3" json:"host_port,omitempty"` + ContainerTlsProxyPort uint32 `protobuf:"varint,3,opt,name=container_tls_proxy_port,proto3" json:"container_tls_proxy_port,omitempty"` + HostTlsProxyPort uint32 `protobuf:"varint,4,opt,name=host_tls_proxy_port,proto3" json:"host_tls_proxy_port,omitempty"` +} + +func (x *ProtoPortMapping) Reset() { + *x = ProtoPortMapping{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoPortMapping) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoPortMapping) ProtoMessage() {} + +func (x *ProtoPortMapping) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoPortMapping.ProtoReflect.Descriptor instead. +func (*ProtoPortMapping) Descriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoPortMapping) GetContainerPort() uint32 { + if x != nil { + return x.ContainerPort + } + return 0 +} + +func (x *ProtoPortMapping) GetHostPort() uint32 { + if x != nil { + return x.HostPort + } + return 0 +} + +func (x *ProtoPortMapping) GetContainerTlsProxyPort() uint32 { + if x != nil { + return x.ContainerTlsProxyPort + } + return 0 +} + +func (x *ProtoPortMapping) GetHostTlsProxyPort() uint32 { + if x != nil { + return x.HostTlsProxyPort + } + return 0 +} + +type ProtoActualLRPKey struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` +} + +func (x *ProtoActualLRPKey) Reset() { + *x = ProtoActualLRPKey{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPKey) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPKey) ProtoMessage() {} + +func (x *ProtoActualLRPKey) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPKey.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPKey) Descriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoActualLRPKey) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoActualLRPKey) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +func (x *ProtoActualLRPKey) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +type ProtoActualLRPInstanceKey struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + InstanceGuid string `protobuf:"bytes,1,opt,name=instance_guid,proto3" json:"instance_guid,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` +} + +func (x *ProtoActualLRPInstanceKey) Reset() { + *x = ProtoActualLRPInstanceKey{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPInstanceKey) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPInstanceKey) ProtoMessage() {} + +func (x *ProtoActualLRPInstanceKey) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPInstanceKey.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPInstanceKey) Descriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoActualLRPInstanceKey) GetInstanceGuid() string { + if x != nil { + return x.InstanceGuid + } + return "" +} + +func (x *ProtoActualLRPInstanceKey) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +type ProtoActualLRPNetInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Ports []*ProtoPortMapping `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty"` + InstanceAddress string `protobuf:"bytes,3,opt,name=instance_address,json=instanceAddress,proto3" json:"instance_address,omitempty"` + PreferredAddress ProtoActualLRPNetInfo_PreferredAddress `protobuf:"varint,4,opt,name=preferred_address,proto3,enum=models.ProtoActualLRPNetInfo_PreferredAddress" json:"preferred_address,omitempty"` +} + +func (x *ProtoActualLRPNetInfo) Reset() { + *x = ProtoActualLRPNetInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPNetInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPNetInfo) ProtoMessage() {} + +func (x *ProtoActualLRPNetInfo) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPNetInfo.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPNetInfo) Descriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoActualLRPNetInfo) GetAddress() string { + if x != nil { + return x.Address + } + return "" +} + +func (x *ProtoActualLRPNetInfo) GetPorts() []*ProtoPortMapping { + if x != nil { + return x.Ports + } + return nil +} + +func (x *ProtoActualLRPNetInfo) GetInstanceAddress() string { + if x != nil { + return x.InstanceAddress + } + return "" +} + +func (x *ProtoActualLRPNetInfo) GetPreferredAddress() ProtoActualLRPNetInfo_PreferredAddress { + if x != nil { + return x.PreferredAddress + } + return ProtoActualLRPNetInfo_UNKNOWN +} + +type ProtoActualLRPInternalRoute struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hostname string `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"` +} + +func (x *ProtoActualLRPInternalRoute) Reset() { + *x = ProtoActualLRPInternalRoute{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPInternalRoute) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPInternalRoute) ProtoMessage() {} + +func (x *ProtoActualLRPInternalRoute) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPInternalRoute.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPInternalRoute) Descriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoActualLRPInternalRoute) GetHostname() string { + if x != nil { + return x.Hostname + } + return "" +} + +type ProtoActualLRP struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` + CrashCount int32 `protobuf:"varint,4,opt,name=crash_count,proto3" json:"crash_count,omitempty"` + CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` + State string `protobuf:"bytes,6,opt,name=state,proto3" json:"state,omitempty"` + PlacementError string `protobuf:"bytes,7,opt,name=placement_error,json=placementError,proto3" json:"placement_error,omitempty"` + Since int64 `protobuf:"varint,8,opt,name=since,proto3" json:"since,omitempty"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,9,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` + Presence ProtoActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ProtoActualLRP_Presence" json:"presence,omitempty"` + ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,11,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` + MetricTags map[string]string `protobuf:"bytes,12,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Routable *bool `protobuf:"varint,13,opt,name=routable,proto3,oneof" json:"routable,omitempty"` + AvailabilityZone string `protobuf:"bytes,14,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` +} + +func (x *ProtoActualLRP) Reset() { + *x = ProtoActualLRP{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRP) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRP) ProtoMessage() {} + +func (x *ProtoActualLRP) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRP.ProtoReflect.Descriptor instead. +func (*ProtoActualLRP) Descriptor() ([]byte, []int) { + return file_actual_lrp_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoActualLRP) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoActualLRP) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +func (x *ProtoActualLRP) GetActualLrpNetInfo() *ProtoActualLRPNetInfo { + if x != nil { + return x.ActualLrpNetInfo + } + return nil +} + +func (x *ProtoActualLRP) GetCrashCount() int32 { + if x != nil { + return x.CrashCount + } + return 0 +} + +func (x *ProtoActualLRP) GetCrashReason() string { + if x != nil { + return x.CrashReason + } + return "" +} + +func (x *ProtoActualLRP) GetState() string { + if x != nil { + return x.State + } + return "" +} + +func (x *ProtoActualLRP) GetPlacementError() string { + if x != nil { + return x.PlacementError + } + return "" +} + +func (x *ProtoActualLRP) GetSince() int64 { + if x != nil { + return x.Since + } + return 0 +} + +func (x *ProtoActualLRP) GetModificationTag() *ProtoModificationTag { + if x != nil { + return x.ModificationTag + } + return nil +} + +func (x *ProtoActualLRP) GetPresence() ProtoActualLRP_Presence { + if x != nil { + return x.Presence + } + return ProtoActualLRP_ORDINARY +} + +func (x *ProtoActualLRP) GetActualLrpInternalRoutes() []*ProtoActualLRPInternalRoute { + if x != nil { + return x.ActualLrpInternalRoutes + } + return nil +} + +func (x *ProtoActualLRP) GetMetricTags() map[string]string { + if x != nil { + return x.MetricTags + } + return nil +} + +func (x *ProtoActualLRP) GetRoutable() bool { + if x != nil && x.Routable != nil { + return *x.Routable + } + return false +} + +func (x *ProtoActualLRP) GetAvailabilityZone() string { + if x != nil { + return x.AvailabilityZone + } + return "" +} + +var File_actual_lrp_proto protoreflect.FileDescriptor + +var file_actual_lrp_proto_rawDesc = []byte{ + 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85, 0x01, + 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x32, 0x0a, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, + 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x0a, 0x65, 0x76, 0x61, + 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x65, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, + 0x67, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xc6, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x70, 0x6f, + 0x72, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, + 0x12, 0x3a, 0x0a, 0x18, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, + 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x18, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, + 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x30, 0x0a, 0x13, + 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, + 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x68, 0x6f, 0x73, 0x74, 0x5f, + 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x65, + 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x5b, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, + 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, + 0x69, 0x64, 0x22, 0xf6, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, + 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2e, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, + 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x12, 0x5c, 0x0a, 0x11, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x72, 0x65, 0x66, + 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x11, 0x70, 0x72, + 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, + 0x89, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x12, 0x27, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, + 0x00, 0x1a, 0x1a, 0x82, 0x7d, 0x17, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x29, 0x0a, + 0x08, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x01, 0x1a, 0x1b, 0x82, 0x7d, 0x18, + 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, + 0x10, 0x02, 0x1a, 0x17, 0x82, 0x7d, 0x14, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x6f, 0x73, 0x74, 0x22, 0x39, 0x0a, 0x1b, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, + 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, + 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xbf, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x4b, 0x65, 0x79, 0x12, 0x4c, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, + 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, + 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x27, 0x0a, + 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x10, + 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, + 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, + 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, + 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1f, + 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, + 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, + 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, + 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, + 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, + 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5d, 0x0a, 0x08, + 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x4f, 0x52, 0x44, 0x49, + 0x4e, 0x41, 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, 0x82, 0x7d, 0x08, 0x4f, 0x72, 0x64, 0x69, 0x6e, + 0x61, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, 0x56, 0x41, 0x43, 0x55, 0x41, 0x54, 0x49, 0x4e, + 0x47, 0x10, 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, + 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, 0x53, 0x50, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, + 0x0a, 0x82, 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, 0x65, 0x63, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, + 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, + 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_actual_lrp_proto_rawDescOnce sync.Once + file_actual_lrp_proto_rawDescData = file_actual_lrp_proto_rawDesc +) + +func file_actual_lrp_proto_rawDescGZIP() []byte { + file_actual_lrp_proto_rawDescOnce.Do(func() { + file_actual_lrp_proto_rawDescData = protoimpl.X.CompressGZIP(file_actual_lrp_proto_rawDescData) + }) + return file_actual_lrp_proto_rawDescData +} + +var file_actual_lrp_proto_enumTypes = make([]protoimpl.EnumInfo, 2) +var file_actual_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_actual_lrp_proto_goTypes = []interface{}{ + (ProtoActualLRPNetInfo_PreferredAddress)(0), // 0: models.ProtoActualLRPNetInfo.PreferredAddress + (ProtoActualLRP_Presence)(0), // 1: models.ProtoActualLRP.Presence + (*ProtoActualLRPGroup)(nil), // 2: models.ProtoActualLRPGroup + (*ProtoPortMapping)(nil), // 3: models.ProtoPortMapping + (*ProtoActualLRPKey)(nil), // 4: models.ProtoActualLRPKey + (*ProtoActualLRPInstanceKey)(nil), // 5: models.ProtoActualLRPInstanceKey + (*ProtoActualLRPNetInfo)(nil), // 6: models.ProtoActualLRPNetInfo + (*ProtoActualLRPInternalRoute)(nil), // 7: models.ProtoActualLRPInternalRoute + (*ProtoActualLRP)(nil), // 8: models.ProtoActualLRP + nil, // 9: models.ProtoActualLRP.MetricTagsEntry + (*ProtoModificationTag)(nil), // 10: models.ProtoModificationTag +} +var file_actual_lrp_proto_depIdxs = []int32{ + 8, // 0: models.ProtoActualLRPGroup.instance:type_name -> models.ProtoActualLRP + 8, // 1: models.ProtoActualLRPGroup.evacuating:type_name -> models.ProtoActualLRP + 3, // 2: models.ProtoActualLRPNetInfo.ports:type_name -> models.ProtoPortMapping + 0, // 3: models.ProtoActualLRPNetInfo.preferred_address:type_name -> models.ProtoActualLRPNetInfo.PreferredAddress + 4, // 4: models.ProtoActualLRP.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 5, // 5: models.ProtoActualLRP.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 6, // 6: models.ProtoActualLRP.actual_lrp_net_info:type_name -> models.ProtoActualLRPNetInfo + 10, // 7: models.ProtoActualLRP.modification_tag:type_name -> models.ProtoModificationTag + 1, // 8: models.ProtoActualLRP.presence:type_name -> models.ProtoActualLRP.Presence + 7, // 9: models.ProtoActualLRP.actual_lrp_internal_routes:type_name -> models.ProtoActualLRPInternalRoute + 9, // 10: models.ProtoActualLRP.metric_tags:type_name -> models.ProtoActualLRP.MetricTagsEntry + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name +} + +func init() { file_actual_lrp_proto_init() } +func file_actual_lrp_proto_init() { + if File_actual_lrp_proto != nil { + return + } + file_modification_tag_proto_init() + file_bbs_proto_init() + if !protoimpl.UnsafeEnabled { + file_actual_lrp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPGroup); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoPortMapping); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPKey); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPInstanceKey); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPNetInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPInternalRoute); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRP); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_actual_lrp_proto_msgTypes[6].OneofWrappers = []interface{}{} + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_actual_lrp_proto_rawDesc, + NumEnums: 2, + NumMessages: 8, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_actual_lrp_proto_goTypes, + DependencyIndexes: file_actual_lrp_proto_depIdxs, + EnumInfos: file_actual_lrp_proto_enumTypes, + MessageInfos: file_actual_lrp_proto_msgTypes, + }.Build() + File_actual_lrp_proto = out.File + file_actual_lrp_proto_rawDesc = nil + file_actual_lrp_proto_goTypes = nil + file_actual_lrp_proto_depIdxs = nil +} diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index 272b2b65..bb6ea0c2 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -36,12 +36,12 @@ message ProtoActualLRPNetInfo { string instance_address = 3; enum PreferredAddress { - UNKNOWN = 0; - INSTANCE = 1; - HOST = 2; + UNKNOWN = 0 [(bbs.bbs_enumvalue_customname) = "PreferredAddressUnknown"]; + INSTANCE = 1 [(bbs.bbs_enumvalue_customname) = "PreferredAddressInstance"]; + HOST = 2 [(bbs.bbs_enumvalue_customname) = "PreferredAddressHost"]; } - PreferredAddress preferred_address = 4 [json_name = "preferred_address", (bbs.bbs_json_name) = "PreferredAddressTesting"]; + PreferredAddress preferred_address = 4 [json_name = "preferred_address"]; } message ProtoActualLRPInternalRoute { @@ -50,9 +50,9 @@ message ProtoActualLRPInternalRoute { message ProtoActualLRP { enum Presence { - ORDINARY = 0; - EVACUATING = 1; - SUSPECT = 2; + ORDINARY = 0 [(bbs.bbs_enumvalue_customname) = "Ordinary"]; + EVACUATING = 1 [(bbs.bbs_enumvalue_customname) = "Evacuating"]; + SUSPECT = 2 [(bbs.bbs_enumvalue_customname) = "Suspect"]; } ProtoActualLRPKey actual_lrp_key = 1; diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go new file mode 100644 index 00000000..ca459f05 --- /dev/null +++ b/models/actual_lrp_bbs.pb.go @@ -0,0 +1,209 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: actual_lrp.proto + +package models + +// Prevent copylock errors when using ProtoActualLRPGroup directly +type ActualLRPGroup struct { + Instance *ActualLRP + Evacuating *ActualLRP +} + +func (x *ActualLRPGroup) ToProto() *ProtoActualLRPGroup { + proto := &ProtoActualLRPGroup{ + Instance: x.Instance.ToProto(), + Evacuating: x.Evacuating.ToProto(), + } + return proto +} + +func ActualLRPGroupProtoMap(values []*ActualLRPGroup) []*ProtoActualLRPGroup { + result := make([]*ProtoActualLRPGroup, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoPortMapping directly +type PortMapping struct { + ContainerPort uint32 + HostPort uint32 + ContainerTlsProxyPort uint32 + HostTlsProxyPort uint32 +} + +func (x *PortMapping) ToProto() *ProtoPortMapping { + proto := &ProtoPortMapping{ + ContainerPort: x.ContainerPort, + HostPort: x.HostPort, + ContainerTlsProxyPort: x.ContainerTlsProxyPort, + HostTlsProxyPort: x.HostTlsProxyPort, + } + return proto +} + +func PortMappingProtoMap(values []*PortMapping) []*ProtoPortMapping { + result := make([]*ProtoPortMapping, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPKey directly +type ActualLRPKey struct { + ProcessGuid string + Index int32 + Domain string +} + +func (x *ActualLRPKey) ToProto() *ProtoActualLRPKey { + proto := &ProtoActualLRPKey{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + Domain: x.Domain, + } + return proto +} + +func ActualLRPKeyProtoMap(values []*ActualLRPKey) []*ProtoActualLRPKey { + result := make([]*ProtoActualLRPKey, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPInstanceKey directly +type ActualLRPInstanceKey struct { + InstanceGuid string + CellId string +} + +func (x *ActualLRPInstanceKey) ToProto() *ProtoActualLRPInstanceKey { + proto := &ProtoActualLRPInstanceKey{ + InstanceGuid: x.InstanceGuid, + CellId: x.CellId, + } + return proto +} + +func ActualLRPInstanceKeyProtoMap(values []*ActualLRPInstanceKey) []*ProtoActualLRPInstanceKey { + result := make([]*ProtoActualLRPInstanceKey, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +type ActualLRPNetInfo_PreferredAddress int32 + +const ( + ActualLRPNetInfo_PreferredAddressUnknown ActualLRPNetInfo_PreferredAddress = 0 + ActualLRPNetInfo_PreferredAddressInstance ActualLRPNetInfo_PreferredAddress = 1 + ActualLRPNetInfo_PreferredAddressHost ActualLRPNetInfo_PreferredAddress = 2 +) + +// Prevent copylock errors when using ProtoActualLRPNetInfo directly +type ActualLRPNetInfo struct { + Address string + Ports []*PortMapping + InstanceAddress string + PreferredAddress ActualLRPNetInfo_PreferredAddress +} + +func (x *ActualLRPNetInfo) ToProto() *ProtoActualLRPNetInfo { + proto := &ProtoActualLRPNetInfo{ + Address: x.Address, + Ports: PortMappingProtoMap(x.Ports), + InstanceAddress: x.InstanceAddress, + PreferredAddress: ProtoActualLRPNetInfo_PreferredAddress(x.PreferredAddress), + } + return proto +} + +func ActualLRPNetInfoProtoMap(values []*ActualLRPNetInfo) []*ProtoActualLRPNetInfo { + result := make([]*ProtoActualLRPNetInfo, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPInternalRoute directly +type ActualLRPInternalRoute struct { + Hostname string +} + +func (x *ActualLRPInternalRoute) ToProto() *ProtoActualLRPInternalRoute { + proto := &ProtoActualLRPInternalRoute{ + Hostname: x.Hostname, + } + return proto +} + +func ActualLRPInternalRouteProtoMap(values []*ActualLRPInternalRoute) []*ProtoActualLRPInternalRoute { + result := make([]*ProtoActualLRPInternalRoute, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +type ActualLRP_Presence int32 + +const ( + ActualLRP_Ordinary ActualLRP_Presence = 0 + ActualLRP_Evacuating ActualLRP_Presence = 1 + ActualLRP_Suspect ActualLRP_Presence = 2 +) + +// Prevent copylock errors when using ProtoActualLRP directly +type ActualLRP struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpNetInfo *ActualLRPNetInfo + CrashCount int32 + CrashReason string + State string + PlacementError string + Since int64 + ModificationTag *ModificationTag + Presence ActualLRP_Presence + ActualLrpInternalRoutes []*ActualLRPInternalRoute + MetricTags map[string]string + Routable bool + AvailabilityZone string +} + +func (x *ActualLRP) ToProto() *ProtoActualLRP { + proto := &ProtoActualLRP{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + CrashCount: x.CrashCount, + CrashReason: x.CrashReason, + State: x.State, + PlacementError: x.PlacementError, + Since: x.Since, + ModificationTag: x.ModificationTag.ToProto(), + Presence: ProtoActualLRP_Presence(x.Presence), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + MetricTags: x.MetricTags, + Routable: &x.Routable, + AvailabilityZone: x.AvailabilityZone, + } + return proto +} + +func ActualLRPProtoMap(values []*ActualLRP) []*ProtoActualLRP { + result := make([]*ProtoActualLRP, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go new file mode 100644 index 00000000..5981e220 --- /dev/null +++ b/models/actual_lrp_requests.pb.go @@ -0,0 +1,1273 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: actual_lrp_requests.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoActualLRPLifecycleResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` +} + +func (x *ProtoActualLRPLifecycleResponse) Reset() { + *x = ProtoActualLRPLifecycleResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPLifecycleResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPLifecycleResponse) ProtoMessage() {} + +func (x *ProtoActualLRPLifecycleResponse) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPLifecycleResponse.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPLifecycleResponse) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoActualLRPLifecycleResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +// Deprecated: Marked as deprecated in actual_lrp_requests.proto. +type ProtoActualLRPGroupsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + ActualLrpGroups []*ProtoActualLRPGroup `protobuf:"bytes,2,rep,name=actual_lrp_groups,json=actualLrpGroups,proto3" json:"actual_lrp_groups,omitempty"` +} + +func (x *ProtoActualLRPGroupsResponse) Reset() { + *x = ProtoActualLRPGroupsResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPGroupsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPGroupsResponse) ProtoMessage() {} + +func (x *ProtoActualLRPGroupsResponse) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPGroupsResponse.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPGroupsResponse) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoActualLRPGroupsResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoActualLRPGroupsResponse) GetActualLrpGroups() []*ProtoActualLRPGroup { + if x != nil { + return x.ActualLrpGroups + } + return nil +} + +// Deprecated: Marked as deprecated in actual_lrp_requests.proto. +type ProtoActualLRPGroupResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` +} + +func (x *ProtoActualLRPGroupResponse) Reset() { + *x = ProtoActualLRPGroupResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPGroupResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPGroupResponse) ProtoMessage() {} + +func (x *ProtoActualLRPGroupResponse) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPGroupResponse.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPGroupResponse) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoActualLRPGroupResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoActualLRPGroupResponse) GetActualLrpGroup() *ProtoActualLRPGroup { + if x != nil { + return x.ActualLrpGroup + } + return nil +} + +// Deprecated: Marked as deprecated in actual_lrp_requests.proto. +type ProtoActualLRPGroupsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` +} + +func (x *ProtoActualLRPGroupsRequest) Reset() { + *x = ProtoActualLRPGroupsRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPGroupsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPGroupsRequest) ProtoMessage() {} + +func (x *ProtoActualLRPGroupsRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPGroupsRequest.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPGroupsRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoActualLRPGroupsRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoActualLRPGroupsRequest) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +// Deprecated: Marked as deprecated in actual_lrp_requests.proto. +type ProtoActualLRPGroupsByProcessGuidRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` +} + +func (x *ProtoActualLRPGroupsByProcessGuidRequest) Reset() { + *x = ProtoActualLRPGroupsByProcessGuidRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPGroupsByProcessGuidRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPGroupsByProcessGuidRequest) ProtoMessage() {} + +func (x *ProtoActualLRPGroupsByProcessGuidRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPGroupsByProcessGuidRequest.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPGroupsByProcessGuidRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoActualLRPGroupsByProcessGuidRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +// Deprecated: Marked as deprecated in actual_lrp_requests.proto. +type ProtoActualLRPGroupByProcessGuidAndIndexRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` +} + +func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) Reset() { + *x = ProtoActualLRPGroupByProcessGuidAndIndexRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPGroupByProcessGuidAndIndexRequest) ProtoMessage() {} + +func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPGroupByProcessGuidAndIndexRequest.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPGroupByProcessGuidAndIndexRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +type ProtoClaimActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` +} + +func (x *ProtoClaimActualLRPRequest) Reset() { + *x = ProtoClaimActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoClaimActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoClaimActualLRPRequest) ProtoMessage() {} + +func (x *ProtoClaimActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoClaimActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoClaimActualLRPRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoClaimActualLRPRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoClaimActualLRPRequest) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +func (x *ProtoClaimActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +type ProtoStartActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` + ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,4,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` + MetricTags map[string]string `protobuf:"bytes,5,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Routable *bool `protobuf:"varint,6,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` + AvailabilityZone string `protobuf:"bytes,7,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` +} + +func (x *ProtoStartActualLRPRequest) Reset() { + *x = ProtoStartActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoStartActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoStartActualLRPRequest) ProtoMessage() {} + +func (x *ProtoStartActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoStartActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoStartActualLRPRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{7} +} + +func (x *ProtoStartActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoStartActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +func (x *ProtoStartActualLRPRequest) GetActualLrpNetInfo() *ProtoActualLRPNetInfo { + if x != nil { + return x.ActualLrpNetInfo + } + return nil +} + +func (x *ProtoStartActualLRPRequest) GetActualLrpInternalRoutes() []*ProtoActualLRPInternalRoute { + if x != nil { + return x.ActualLrpInternalRoutes + } + return nil +} + +func (x *ProtoStartActualLRPRequest) GetMetricTags() map[string]string { + if x != nil { + return x.MetricTags + } + return nil +} + +func (x *ProtoStartActualLRPRequest) GetRoutable() bool { + if x != nil && x.Routable != nil { + return *x.Routable + } + return false +} + +func (x *ProtoStartActualLRPRequest) GetAvailabilityZone() string { + if x != nil { + return x.AvailabilityZone + } + return "" +} + +type ProtoCrashActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,proto3" json:"error_message,omitempty"` +} + +func (x *ProtoCrashActualLRPRequest) Reset() { + *x = ProtoCrashActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCrashActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCrashActualLRPRequest) ProtoMessage() {} + +func (x *ProtoCrashActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[8] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCrashActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoCrashActualLRPRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{8} +} + +func (x *ProtoCrashActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoCrashActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +func (x *ProtoCrashActualLRPRequest) GetErrorMessage() string { + if x != nil { + return x.ErrorMessage + } + return "" +} + +type ProtoFailActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,proto3" json:"error_message,omitempty"` +} + +func (x *ProtoFailActualLRPRequest) Reset() { + *x = ProtoFailActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoFailActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoFailActualLRPRequest) ProtoMessage() {} + +func (x *ProtoFailActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoFailActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoFailActualLRPRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{9} +} + +func (x *ProtoFailActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoFailActualLRPRequest) GetErrorMessage() string { + if x != nil { + return x.ErrorMessage + } + return "" +} + +type ProtoRetireActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` +} + +func (x *ProtoRetireActualLRPRequest) Reset() { + *x = ProtoRetireActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRetireActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRetireActualLRPRequest) ProtoMessage() {} + +func (x *ProtoRetireActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[10] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRetireActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoRetireActualLRPRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{10} +} + +func (x *ProtoRetireActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +type ProtoRemoveActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` +} + +func (x *ProtoRemoveActualLRPRequest) Reset() { + *x = ProtoRemoveActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRemoveActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRemoveActualLRPRequest) ProtoMessage() {} + +func (x *ProtoRemoveActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[11] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRemoveActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoRemoveActualLRPRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{11} +} + +func (x *ProtoRemoveActualLRPRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoRemoveActualLRPRequest) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +func (x *ProtoRemoveActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +type ProtoActualLRPsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + ActualLrps []*ProtoActualLRP `protobuf:"bytes,2,rep,name=actual_lrps,json=actualLrps,proto3" json:"actual_lrps,omitempty"` +} + +func (x *ProtoActualLRPsResponse) Reset() { + *x = ProtoActualLRPsResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPsResponse) ProtoMessage() {} + +func (x *ProtoActualLRPsResponse) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[12] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPsResponse.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPsResponse) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{12} +} + +func (x *ProtoActualLRPsResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoActualLRPsResponse) GetActualLrps() []*ProtoActualLRP { + if x != nil { + return x.ActualLrps + } + return nil +} + +type ProtoActualLRPsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + ProcessGuid string `protobuf:"bytes,3,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index *int32 `protobuf:"varint,4,opt,name=index,proto3,oneof" json:"index,omitempty"` +} + +func (x *ProtoActualLRPsRequest) Reset() { + *x = ProtoActualLRPsRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_actual_lrp_requests_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPsRequest) ProtoMessage() {} + +func (x *ProtoActualLRPsRequest) ProtoReflect() protoreflect.Message { + mi := &file_actual_lrp_requests_proto_msgTypes[13] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPsRequest.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPsRequest) Descriptor() ([]byte, []int) { + return file_actual_lrp_requests_proto_rawDescGZIP(), []int{13} +} + +func (x *ProtoActualLRPsRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoActualLRPsRequest) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +func (x *ProtoActualLRPsRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoActualLRPsRequest) GetIndex() int32 { + if x != nil && x.Index != nil { + return *x.Index + } + return 0 +} + +var File_actual_lrp_requests_proto protoreflect.FileDescriptor + +var file_actual_lrp_requests_proto_rawDesc = []byte{ + 0x0a, 0x19, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x4b, 0x0a, 0x1f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, + 0x95, 0x01, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, + 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x47, 0x0a, 0x11, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x73, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x92, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x12, 0x45, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x53, 0x0a, 0x1b, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x3a, 0x02, 0x18, + 0x01, 0x22, 0x52, 0x0a, 0x28, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, + 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x6f, 0x0a, 0x2f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x50, 0x72, + 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x41, 0x6e, 0x64, 0x49, 0x6e, 0x64, 0x65, + 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, + 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, + 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xb0, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, + 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0xd7, 0x04, 0x0a, 0x1a, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x4b, 0x65, 0x79, 0x12, 0x4c, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x12, 0x53, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, + 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, + 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x22, 0xdd, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x72, 0x61, + 0x73, 0x68, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, + 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, + 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x22, 0x82, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, + 0x6c, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, + 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5e, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x22, 0xb1, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, + 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, + 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, + 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0x7c, 0x0a, 0x17, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x12, 0x37, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x16, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, + 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_actual_lrp_requests_proto_rawDescOnce sync.Once + file_actual_lrp_requests_proto_rawDescData = file_actual_lrp_requests_proto_rawDesc +) + +func file_actual_lrp_requests_proto_rawDescGZIP() []byte { + file_actual_lrp_requests_proto_rawDescOnce.Do(func() { + file_actual_lrp_requests_proto_rawDescData = protoimpl.X.CompressGZIP(file_actual_lrp_requests_proto_rawDescData) + }) + return file_actual_lrp_requests_proto_rawDescData +} + +var file_actual_lrp_requests_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_actual_lrp_requests_proto_goTypes = []interface{}{ + (*ProtoActualLRPLifecycleResponse)(nil), // 0: models.ProtoActualLRPLifecycleResponse + (*ProtoActualLRPGroupsResponse)(nil), // 1: models.ProtoActualLRPGroupsResponse + (*ProtoActualLRPGroupResponse)(nil), // 2: models.ProtoActualLRPGroupResponse + (*ProtoActualLRPGroupsRequest)(nil), // 3: models.ProtoActualLRPGroupsRequest + (*ProtoActualLRPGroupsByProcessGuidRequest)(nil), // 4: models.ProtoActualLRPGroupsByProcessGuidRequest + (*ProtoActualLRPGroupByProcessGuidAndIndexRequest)(nil), // 5: models.ProtoActualLRPGroupByProcessGuidAndIndexRequest + (*ProtoClaimActualLRPRequest)(nil), // 6: models.ProtoClaimActualLRPRequest + (*ProtoStartActualLRPRequest)(nil), // 7: models.ProtoStartActualLRPRequest + (*ProtoCrashActualLRPRequest)(nil), // 8: models.ProtoCrashActualLRPRequest + (*ProtoFailActualLRPRequest)(nil), // 9: models.ProtoFailActualLRPRequest + (*ProtoRetireActualLRPRequest)(nil), // 10: models.ProtoRetireActualLRPRequest + (*ProtoRemoveActualLRPRequest)(nil), // 11: models.ProtoRemoveActualLRPRequest + (*ProtoActualLRPsResponse)(nil), // 12: models.ProtoActualLRPsResponse + (*ProtoActualLRPsRequest)(nil), // 13: models.ProtoActualLRPsRequest + nil, // 14: models.ProtoStartActualLRPRequest.MetricTagsEntry + (*ProtoError)(nil), // 15: models.ProtoError + (*ProtoActualLRPGroup)(nil), // 16: models.ProtoActualLRPGroup + (*ProtoActualLRPInstanceKey)(nil), // 17: models.ProtoActualLRPInstanceKey + (*ProtoActualLRPKey)(nil), // 18: models.ProtoActualLRPKey + (*ProtoActualLRPNetInfo)(nil), // 19: models.ProtoActualLRPNetInfo + (*ProtoActualLRPInternalRoute)(nil), // 20: models.ProtoActualLRPInternalRoute + (*ProtoActualLRP)(nil), // 21: models.ProtoActualLRP +} +var file_actual_lrp_requests_proto_depIdxs = []int32{ + 15, // 0: models.ProtoActualLRPLifecycleResponse.error:type_name -> models.ProtoError + 15, // 1: models.ProtoActualLRPGroupsResponse.error:type_name -> models.ProtoError + 16, // 2: models.ProtoActualLRPGroupsResponse.actual_lrp_groups:type_name -> models.ProtoActualLRPGroup + 15, // 3: models.ProtoActualLRPGroupResponse.error:type_name -> models.ProtoError + 16, // 4: models.ProtoActualLRPGroupResponse.actual_lrp_group:type_name -> models.ProtoActualLRPGroup + 17, // 5: models.ProtoClaimActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 18, // 6: models.ProtoStartActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 17, // 7: models.ProtoStartActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 19, // 8: models.ProtoStartActualLRPRequest.actual_lrp_net_info:type_name -> models.ProtoActualLRPNetInfo + 20, // 9: models.ProtoStartActualLRPRequest.actual_lrp_internal_routes:type_name -> models.ProtoActualLRPInternalRoute + 14, // 10: models.ProtoStartActualLRPRequest.metric_tags:type_name -> models.ProtoStartActualLRPRequest.MetricTagsEntry + 18, // 11: models.ProtoCrashActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 17, // 12: models.ProtoCrashActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 18, // 13: models.ProtoFailActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 18, // 14: models.ProtoRetireActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 17, // 15: models.ProtoRemoveActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 15, // 16: models.ProtoActualLRPsResponse.error:type_name -> models.ProtoError + 21, // 17: models.ProtoActualLRPsResponse.actual_lrps:type_name -> models.ProtoActualLRP + 18, // [18:18] is the sub-list for method output_type + 18, // [18:18] is the sub-list for method input_type + 18, // [18:18] is the sub-list for extension type_name + 18, // [18:18] is the sub-list for extension extendee + 0, // [0:18] is the sub-list for field type_name +} + +func init() { file_actual_lrp_requests_proto_init() } +func file_actual_lrp_requests_proto_init() { + if File_actual_lrp_requests_proto != nil { + return + } + file_actual_lrp_proto_init() + file_error_proto_init() + if !protoimpl.UnsafeEnabled { + file_actual_lrp_requests_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPLifecycleResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPGroupsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPGroupResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPGroupsRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPGroupsByProcessGuidRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPGroupByProcessGuidAndIndexRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoClaimActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoStartActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCrashActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoFailActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRetireActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRemoveActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_actual_lrp_requests_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPsRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_actual_lrp_requests_proto_msgTypes[7].OneofWrappers = []interface{}{} + file_actual_lrp_requests_proto_msgTypes[13].OneofWrappers = []interface{}{} + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_actual_lrp_requests_proto_rawDesc, + NumEnums: 0, + NumMessages: 15, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_actual_lrp_requests_proto_goTypes, + DependencyIndexes: file_actual_lrp_requests_proto_depIdxs, + MessageInfos: file_actual_lrp_requests_proto_msgTypes, + }.Build() + File_actual_lrp_requests_proto = out.File + file_actual_lrp_requests_proto_rawDesc = nil + file_actual_lrp_requests_proto_goTypes = nil + file_actual_lrp_requests_proto_depIdxs = nil +} diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go new file mode 100644 index 00000000..62d2cc58 --- /dev/null +++ b/models/actual_lrp_requests_bbs.pb.go @@ -0,0 +1,329 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: actual_lrp_requests.proto + +package models + +// Prevent copylock errors when using ProtoActualLRPLifecycleResponse directly +type ActualLRPLifecycleResponse struct { + Error *Error +} + +func (x *ActualLRPLifecycleResponse) ToProto() *ProtoActualLRPLifecycleResponse { + proto := &ProtoActualLRPLifecycleResponse{ + Error: x.Error.ToProto(), + } + return proto +} + +func ActualLRPLifecycleResponseProtoMap(values []*ActualLRPLifecycleResponse) []*ProtoActualLRPLifecycleResponse { + result := make([]*ProtoActualLRPLifecycleResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPGroupsResponse directly +type ActualLRPGroupsResponse struct { + Error *Error + ActualLrpGroups []*ActualLRPGroup +} + +func (x *ActualLRPGroupsResponse) ToProto() *ProtoActualLRPGroupsResponse { + proto := &ProtoActualLRPGroupsResponse{ + Error: x.Error.ToProto(), + ActualLrpGroups: ActualLRPGroupProtoMap(x.ActualLrpGroups), + } + return proto +} + +func ActualLRPGroupsResponseProtoMap(values []*ActualLRPGroupsResponse) []*ProtoActualLRPGroupsResponse { + result := make([]*ProtoActualLRPGroupsResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPGroupResponse directly +type ActualLRPGroupResponse struct { + Error *Error + ActualLrpGroup *ActualLRPGroup +} + +func (x *ActualLRPGroupResponse) ToProto() *ProtoActualLRPGroupResponse { + proto := &ProtoActualLRPGroupResponse{ + Error: x.Error.ToProto(), + ActualLrpGroup: x.ActualLrpGroup.ToProto(), + } + return proto +} + +func ActualLRPGroupResponseProtoMap(values []*ActualLRPGroupResponse) []*ProtoActualLRPGroupResponse { + result := make([]*ProtoActualLRPGroupResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPGroupsRequest directly +type ActualLRPGroupsRequest struct { + Domain string + CellId string +} + +func (x *ActualLRPGroupsRequest) ToProto() *ProtoActualLRPGroupsRequest { + proto := &ProtoActualLRPGroupsRequest{ + Domain: x.Domain, + CellId: x.CellId, + } + return proto +} + +func ActualLRPGroupsRequestProtoMap(values []*ActualLRPGroupsRequest) []*ProtoActualLRPGroupsRequest { + result := make([]*ProtoActualLRPGroupsRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPGroupsByProcessGuidRequest directly +type ActualLRPGroupsByProcessGuidRequest struct { + ProcessGuid string +} + +func (x *ActualLRPGroupsByProcessGuidRequest) ToProto() *ProtoActualLRPGroupsByProcessGuidRequest { + proto := &ProtoActualLRPGroupsByProcessGuidRequest{ + ProcessGuid: x.ProcessGuid, + } + return proto +} + +func ActualLRPGroupsByProcessGuidRequestProtoMap(values []*ActualLRPGroupsByProcessGuidRequest) []*ProtoActualLRPGroupsByProcessGuidRequest { + result := make([]*ProtoActualLRPGroupsByProcessGuidRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPGroupByProcessGuidAndIndexRequest directly +type ActualLRPGroupByProcessGuidAndIndexRequest struct { + ProcessGuid string + Index int32 +} + +func (x *ActualLRPGroupByProcessGuidAndIndexRequest) ToProto() *ProtoActualLRPGroupByProcessGuidAndIndexRequest { + proto := &ProtoActualLRPGroupByProcessGuidAndIndexRequest{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + } + return proto +} + +func ActualLRPGroupByProcessGuidAndIndexRequestProtoMap(values []*ActualLRPGroupByProcessGuidAndIndexRequest) []*ProtoActualLRPGroupByProcessGuidAndIndexRequest { + result := make([]*ProtoActualLRPGroupByProcessGuidAndIndexRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoClaimActualLRPRequest directly +type ClaimActualLRPRequest struct { + ProcessGuid string + Index int32 + ActualLrpInstanceKey *ActualLRPInstanceKey +} + +func (x *ClaimActualLRPRequest) ToProto() *ProtoClaimActualLRPRequest { + proto := &ProtoClaimActualLRPRequest{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + } + return proto +} + +func ClaimActualLRPRequestProtoMap(values []*ClaimActualLRPRequest) []*ProtoClaimActualLRPRequest { + result := make([]*ProtoClaimActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoStartActualLRPRequest directly +type StartActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpNetInfo *ActualLRPNetInfo + ActualLrpInternalRoutes []*ActualLRPInternalRoute + MetricTags map[string]string + Routable bool + AvailabilityZone string +} + +func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { + proto := &ProtoStartActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + MetricTags: x.MetricTags, + Routable: &x.Routable, + AvailabilityZone: x.AvailabilityZone, + } + return proto +} + +func StartActualLRPRequestProtoMap(values []*StartActualLRPRequest) []*ProtoStartActualLRPRequest { + result := make([]*ProtoStartActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoCrashActualLRPRequest directly +type CrashActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ErrorMessage string +} + +func (x *CrashActualLRPRequest) ToProto() *ProtoCrashActualLRPRequest { + proto := &ProtoCrashActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ErrorMessage: x.ErrorMessage, + } + return proto +} + +func CrashActualLRPRequestProtoMap(values []*CrashActualLRPRequest) []*ProtoCrashActualLRPRequest { + result := make([]*ProtoCrashActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoFailActualLRPRequest directly +type FailActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ErrorMessage string +} + +func (x *FailActualLRPRequest) ToProto() *ProtoFailActualLRPRequest { + proto := &ProtoFailActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ErrorMessage: x.ErrorMessage, + } + return proto +} + +func FailActualLRPRequestProtoMap(values []*FailActualLRPRequest) []*ProtoFailActualLRPRequest { + result := make([]*ProtoFailActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoRetireActualLRPRequest directly +type RetireActualLRPRequest struct { + ActualLrpKey *ActualLRPKey +} + +func (x *RetireActualLRPRequest) ToProto() *ProtoRetireActualLRPRequest { + proto := &ProtoRetireActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + } + return proto +} + +func RetireActualLRPRequestProtoMap(values []*RetireActualLRPRequest) []*ProtoRetireActualLRPRequest { + result := make([]*ProtoRetireActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoRemoveActualLRPRequest directly +type RemoveActualLRPRequest struct { + ProcessGuid string + Index int32 + ActualLrpInstanceKey *ActualLRPInstanceKey +} + +func (x *RemoveActualLRPRequest) ToProto() *ProtoRemoveActualLRPRequest { + proto := &ProtoRemoveActualLRPRequest{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + } + return proto +} + +func RemoveActualLRPRequestProtoMap(values []*RemoveActualLRPRequest) []*ProtoRemoveActualLRPRequest { + result := make([]*ProtoRemoveActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPsResponse directly +type ActualLRPsResponse struct { + Error *Error + ActualLrps []*ActualLRP +} + +func (x *ActualLRPsResponse) ToProto() *ProtoActualLRPsResponse { + proto := &ProtoActualLRPsResponse{ + Error: x.Error.ToProto(), + ActualLrps: ActualLRPProtoMap(x.ActualLrps), + } + return proto +} + +func ActualLRPsResponseProtoMap(values []*ActualLRPsResponse) []*ProtoActualLRPsResponse { + result := make([]*ProtoActualLRPsResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPsRequest directly +type ActualLRPsRequest struct { + Domain string + CellId string + ProcessGuid string + Index int32 +} + +func (x *ActualLRPsRequest) ToProto() *ProtoActualLRPsRequest { + proto := &ProtoActualLRPsRequest{ + Domain: x.Domain, + CellId: x.CellId, + ProcessGuid: x.ProcessGuid, + Index: &x.Index, + } + return proto +} + +func ActualLRPsRequestProtoMap(values []*ActualLRPsRequest) []*ProtoActualLRPsRequest { + result := make([]*ProtoActualLRPsRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go new file mode 100644 index 00000000..582107ef --- /dev/null +++ b/models/cached_dependency.pb.go @@ -0,0 +1,204 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: cached_dependency.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoCachedDependency struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` + ChecksumAlgorithm string `protobuf:"bytes,6,opt,name=checksum_algorithm,json=checksumAlgorithm,proto3" json:"checksum_algorithm,omitempty"` + ChecksumValue string `protobuf:"bytes,7,opt,name=checksum_value,json=checksumValue,proto3" json:"checksum_value,omitempty"` +} + +func (x *ProtoCachedDependency) Reset() { + *x = ProtoCachedDependency{} + if protoimpl.UnsafeEnabled { + mi := &file_cached_dependency_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCachedDependency) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCachedDependency) ProtoMessage() {} + +func (x *ProtoCachedDependency) ProtoReflect() protoreflect.Message { + mi := &file_cached_dependency_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCachedDependency.ProtoReflect.Descriptor instead. +func (*ProtoCachedDependency) Descriptor() ([]byte, []int) { + return file_cached_dependency_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoCachedDependency) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ProtoCachedDependency) GetFrom() string { + if x != nil { + return x.From + } + return "" +} + +func (x *ProtoCachedDependency) GetTo() string { + if x != nil { + return x.To + } + return "" +} + +func (x *ProtoCachedDependency) GetCacheKey() string { + if x != nil { + return x.CacheKey + } + return "" +} + +func (x *ProtoCachedDependency) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoCachedDependency) GetChecksumAlgorithm() string { + if x != nil { + return x.ChecksumAlgorithm + } + return "" +} + +func (x *ProtoCachedDependency) GetChecksumValue() string { + if x != nil { + return x.ChecksumValue + } + return "" +} + +var File_cached_dependency_proto protoreflect.FileDescriptor + +var file_cached_dependency_proto_rawDesc = []byte{ + 0x0a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x22, 0xe3, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, + 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x74, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, + 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, + 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, + 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, + 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, +} + +var ( + file_cached_dependency_proto_rawDescOnce sync.Once + file_cached_dependency_proto_rawDescData = file_cached_dependency_proto_rawDesc +) + +func file_cached_dependency_proto_rawDescGZIP() []byte { + file_cached_dependency_proto_rawDescOnce.Do(func() { + file_cached_dependency_proto_rawDescData = protoimpl.X.CompressGZIP(file_cached_dependency_proto_rawDescData) + }) + return file_cached_dependency_proto_rawDescData +} + +var file_cached_dependency_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_cached_dependency_proto_goTypes = []interface{}{ + (*ProtoCachedDependency)(nil), // 0: models.ProtoCachedDependency +} +var file_cached_dependency_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_cached_dependency_proto_init() } +func file_cached_dependency_proto_init() { + if File_cached_dependency_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_cached_dependency_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCachedDependency); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_cached_dependency_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_cached_dependency_proto_goTypes, + DependencyIndexes: file_cached_dependency_proto_depIdxs, + MessageInfos: file_cached_dependency_proto_msgTypes, + }.Build() + File_cached_dependency_proto = out.File + file_cached_dependency_proto_rawDesc = nil + file_cached_dependency_proto_goTypes = nil + file_cached_dependency_proto_depIdxs = nil +} diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go new file mode 100644 index 00000000..108f5ba8 --- /dev/null +++ b/models/cached_dependency_bbs.pb.go @@ -0,0 +1,39 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: cached_dependency.proto + +package models + +// Prevent copylock errors when using ProtoCachedDependency directly +type CachedDependency struct { + Name string + From string + To string + CacheKey string + LogSource string + ChecksumAlgorithm string + ChecksumValue string +} + +func (x *CachedDependency) ToProto() *ProtoCachedDependency { + proto := &ProtoCachedDependency{ + Name: x.Name, + From: x.From, + To: x.To, + CacheKey: x.CacheKey, + LogSource: x.LogSource, + ChecksumAlgorithm: x.ChecksumAlgorithm, + ChecksumValue: x.ChecksumValue, + } + return proto +} + +func CachedDependencyProtoMap(values []*CachedDependency) []*ProtoCachedDependency { + result := make([]*ProtoCachedDependency, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/cells.pb.go b/models/cells.pb.go new file mode 100644 index 00000000..235b8088 --- /dev/null +++ b/models/cells.pb.go @@ -0,0 +1,455 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: cells.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoCellCapacity struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` + DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + Containers int32 `protobuf:"varint,3,opt,name=containers,proto3" json:"containers,omitempty"` +} + +func (x *ProtoCellCapacity) Reset() { + *x = ProtoCellCapacity{} + if protoimpl.UnsafeEnabled { + mi := &file_cells_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCellCapacity) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCellCapacity) ProtoMessage() {} + +func (x *ProtoCellCapacity) ProtoReflect() protoreflect.Message { + mi := &file_cells_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCellCapacity.ProtoReflect.Descriptor instead. +func (*ProtoCellCapacity) Descriptor() ([]byte, []int) { + return file_cells_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoCellCapacity) GetMemoryMb() int32 { + if x != nil { + return x.MemoryMb + } + return 0 +} + +func (x *ProtoCellCapacity) GetDiskMb() int32 { + if x != nil { + return x.DiskMb + } + return 0 +} + +func (x *ProtoCellCapacity) GetContainers() int32 { + if x != nil { + return x.Containers + } + return 0 +} + +type ProtoCellPresence struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + CellId string `protobuf:"bytes,1,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + RepAddress string `protobuf:"bytes,2,opt,name=rep_address,proto3" json:"rep_address,omitempty"` + Zone string `protobuf:"bytes,3,opt,name=zone,proto3" json:"zone,omitempty"` + Capacity *ProtoCellCapacity `protobuf:"bytes,4,opt,name=capacity,proto3" json:"capacity,omitempty"` + RootfsProviders []*ProtoProvider `protobuf:"bytes,5,rep,name=rootfs_providers,json=rootfs_provider_list,proto3" json:"rootfs_providers,omitempty"` + PlacementTags []string `protobuf:"bytes,6,rep,name=placement_tags,json=placementTags,proto3" json:"placement_tags,omitempty"` + OptionalPlacementTags []string `protobuf:"bytes,7,rep,name=optional_placement_tags,json=optionalPlacementTags,proto3" json:"optional_placement_tags,omitempty"` + RepUrl string `protobuf:"bytes,8,opt,name=rep_url,proto3" json:"rep_url,omitempty"` +} + +func (x *ProtoCellPresence) Reset() { + *x = ProtoCellPresence{} + if protoimpl.UnsafeEnabled { + mi := &file_cells_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCellPresence) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCellPresence) ProtoMessage() {} + +func (x *ProtoCellPresence) ProtoReflect() protoreflect.Message { + mi := &file_cells_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCellPresence.ProtoReflect.Descriptor instead. +func (*ProtoCellPresence) Descriptor() ([]byte, []int) { + return file_cells_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoCellPresence) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +func (x *ProtoCellPresence) GetRepAddress() string { + if x != nil { + return x.RepAddress + } + return "" +} + +func (x *ProtoCellPresence) GetZone() string { + if x != nil { + return x.Zone + } + return "" +} + +func (x *ProtoCellPresence) GetCapacity() *ProtoCellCapacity { + if x != nil { + return x.Capacity + } + return nil +} + +func (x *ProtoCellPresence) GetRootfsProviders() []*ProtoProvider { + if x != nil { + return x.RootfsProviders + } + return nil +} + +func (x *ProtoCellPresence) GetPlacementTags() []string { + if x != nil { + return x.PlacementTags + } + return nil +} + +func (x *ProtoCellPresence) GetOptionalPlacementTags() []string { + if x != nil { + return x.OptionalPlacementTags + } + return nil +} + +func (x *ProtoCellPresence) GetRepUrl() string { + if x != nil { + return x.RepUrl + } + return "" +} + +type ProtoProvider struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Properties []string `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty"` +} + +func (x *ProtoProvider) Reset() { + *x = ProtoProvider{} + if protoimpl.UnsafeEnabled { + mi := &file_cells_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoProvider) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoProvider) ProtoMessage() {} + +func (x *ProtoProvider) ProtoReflect() protoreflect.Message { + mi := &file_cells_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoProvider.ProtoReflect.Descriptor instead. +func (*ProtoProvider) Descriptor() ([]byte, []int) { + return file_cells_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoProvider) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ProtoProvider) GetProperties() []string { + if x != nil { + return x.Properties + } + return nil +} + +type ProtoCellsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Cells []*ProtoCellPresence `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"` +} + +func (x *ProtoCellsResponse) Reset() { + *x = ProtoCellsResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_cells_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCellsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCellsResponse) ProtoMessage() {} + +func (x *ProtoCellsResponse) ProtoReflect() protoreflect.Message { + mi := &file_cells_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCellsResponse.ProtoReflect.Descriptor instead. +func (*ProtoCellsResponse) Descriptor() ([]byte, []int) { + return file_cells_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoCellsResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoCellsResponse) GetCells() []*ProtoCellPresence { + if x != nil { + return x.Cells + } + return nil +} + +var File_cells_proto protoreflect.FileDescriptor + +var file_cells_proto_rawDesc = []byte{ + 0x0a, 0x0b, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x6b, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x43, + 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, + 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, + 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, + 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x22, + 0xda, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, + 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, + 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x12, 0x12, 0x0a, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, + 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x52, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x45, 0x0a, 0x10, + 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, + 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x14, 0x72, + 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x6c, + 0x69, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x12, 0x36, 0x0a, 0x17, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x15, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, + 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x22, 0x43, 0x0a, 0x0d, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, + 0x73, 0x22, 0x6f, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x12, 0x2f, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x05, 0x63, 0x65, 0x6c, + 0x6c, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, + 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_cells_proto_rawDescOnce sync.Once + file_cells_proto_rawDescData = file_cells_proto_rawDesc +) + +func file_cells_proto_rawDescGZIP() []byte { + file_cells_proto_rawDescOnce.Do(func() { + file_cells_proto_rawDescData = protoimpl.X.CompressGZIP(file_cells_proto_rawDescData) + }) + return file_cells_proto_rawDescData +} + +var file_cells_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_cells_proto_goTypes = []interface{}{ + (*ProtoCellCapacity)(nil), // 0: models.ProtoCellCapacity + (*ProtoCellPresence)(nil), // 1: models.ProtoCellPresence + (*ProtoProvider)(nil), // 2: models.ProtoProvider + (*ProtoCellsResponse)(nil), // 3: models.ProtoCellsResponse + (*ProtoError)(nil), // 4: models.ProtoError +} +var file_cells_proto_depIdxs = []int32{ + 0, // 0: models.ProtoCellPresence.capacity:type_name -> models.ProtoCellCapacity + 2, // 1: models.ProtoCellPresence.rootfs_providers:type_name -> models.ProtoProvider + 4, // 2: models.ProtoCellsResponse.error:type_name -> models.ProtoError + 1, // 3: models.ProtoCellsResponse.cells:type_name -> models.ProtoCellPresence + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name +} + +func init() { file_cells_proto_init() } +func file_cells_proto_init() { + if File_cells_proto != nil { + return + } + file_error_proto_init() + if !protoimpl.UnsafeEnabled { + file_cells_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCellCapacity); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cells_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCellPresence); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cells_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoProvider); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cells_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCellsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_cells_proto_rawDesc, + NumEnums: 0, + NumMessages: 4, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_cells_proto_goTypes, + DependencyIndexes: file_cells_proto_depIdxs, + MessageInfos: file_cells_proto_msgTypes, + }.Build() + File_cells_proto = out.File + file_cells_proto_rawDesc = nil + file_cells_proto_goTypes = nil + file_cells_proto_depIdxs = nil +} diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go new file mode 100644 index 00000000..fd963b03 --- /dev/null +++ b/models/cells_bbs.pb.go @@ -0,0 +1,109 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: cells.proto + +package models + +// Prevent copylock errors when using ProtoCellCapacity directly +type CellCapacity struct { + MemoryMb int32 + DiskMb int32 + Containers int32 +} + +func (x *CellCapacity) ToProto() *ProtoCellCapacity { + proto := &ProtoCellCapacity{ + MemoryMb: x.MemoryMb, + DiskMb: x.DiskMb, + Containers: x.Containers, + } + return proto +} + +func CellCapacityProtoMap(values []*CellCapacity) []*ProtoCellCapacity { + result := make([]*ProtoCellCapacity, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoCellPresence directly +type CellPresence struct { + CellId string + RepAddress string + Zone string + Capacity *CellCapacity + RootfsProviders []*Provider + PlacementTags []string + OptionalPlacementTags []string + RepUrl string +} + +func (x *CellPresence) ToProto() *ProtoCellPresence { + proto := &ProtoCellPresence{ + CellId: x.CellId, + RepAddress: x.RepAddress, + Zone: x.Zone, + Capacity: x.Capacity.ToProto(), + RootfsProviders: ProviderProtoMap(x.RootfsProviders), + PlacementTags: x.PlacementTags, + OptionalPlacementTags: x.OptionalPlacementTags, + RepUrl: x.RepUrl, + } + return proto +} + +func CellPresenceProtoMap(values []*CellPresence) []*ProtoCellPresence { + result := make([]*ProtoCellPresence, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoProvider directly +type Provider struct { + Name string + Properties []string +} + +func (x *Provider) ToProto() *ProtoProvider { + proto := &ProtoProvider{ + Name: x.Name, + Properties: x.Properties, + } + return proto +} + +func ProviderProtoMap(values []*Provider) []*ProtoProvider { + result := make([]*ProtoProvider, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoCellsResponse directly +type CellsResponse struct { + Error *Error + Cells []*CellPresence +} + +func (x *CellsResponse) ToProto() *ProtoCellsResponse { + proto := &ProtoCellsResponse{ + Error: x.Error.ToProto(), + Cells: CellPresenceProtoMap(x.Cells), + } + return proto +} + +func CellsResponseProtoMap(values []*CellsResponse) []*ProtoCellsResponse { + result := make([]*ProtoCellsResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go new file mode 100644 index 00000000..11d250b8 --- /dev/null +++ b/models/certificate_properties.pb.go @@ -0,0 +1,147 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: certificate_properties.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoCertificateProperties struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + OrganizationalUnit []string `protobuf:"bytes,1,rep,name=organizational_unit,json=organizationalUnit,proto3" json:"organizational_unit,omitempty"` +} + +func (x *ProtoCertificateProperties) Reset() { + *x = ProtoCertificateProperties{} + if protoimpl.UnsafeEnabled { + mi := &file_certificate_properties_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCertificateProperties) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCertificateProperties) ProtoMessage() {} + +func (x *ProtoCertificateProperties) ProtoReflect() protoreflect.Message { + mi := &file_certificate_properties_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCertificateProperties.ProtoReflect.Descriptor instead. +func (*ProtoCertificateProperties) Descriptor() ([]byte, []int) { + return file_certificate_properties_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoCertificateProperties) GetOrganizationalUnit() []string { + if x != nil { + return x.OrganizationalUnit + } + return nil +} + +var File_certificate_properties_proto protoreflect.FileDescriptor + +var file_certificate_properties_proto_rawDesc = []byte{ + 0x0a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x4d, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x12, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, + 0x6c, 0x55, 0x6e, 0x69, 0x74, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, + 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, + 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, +} + +var ( + file_certificate_properties_proto_rawDescOnce sync.Once + file_certificate_properties_proto_rawDescData = file_certificate_properties_proto_rawDesc +) + +func file_certificate_properties_proto_rawDescGZIP() []byte { + file_certificate_properties_proto_rawDescOnce.Do(func() { + file_certificate_properties_proto_rawDescData = protoimpl.X.CompressGZIP(file_certificate_properties_proto_rawDescData) + }) + return file_certificate_properties_proto_rawDescData +} + +var file_certificate_properties_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_certificate_properties_proto_goTypes = []interface{}{ + (*ProtoCertificateProperties)(nil), // 0: models.ProtoCertificateProperties +} +var file_certificate_properties_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_certificate_properties_proto_init() } +func file_certificate_properties_proto_init() { + if File_certificate_properties_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_certificate_properties_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCertificateProperties); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_certificate_properties_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_certificate_properties_proto_goTypes, + DependencyIndexes: file_certificate_properties_proto_depIdxs, + MessageInfos: file_certificate_properties_proto_msgTypes, + }.Build() + File_certificate_properties_proto = out.File + file_certificate_properties_proto_rawDesc = nil + file_certificate_properties_proto_goTypes = nil + file_certificate_properties_proto_depIdxs = nil +} diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go new file mode 100644 index 00000000..984f0acd --- /dev/null +++ b/models/certificate_properties_bbs.pb.go @@ -0,0 +1,27 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: certificate_properties.proto + +package models + +// Prevent copylock errors when using ProtoCertificateProperties directly +type CertificateProperties struct { + OrganizationalUnit []string +} + +func (x *CertificateProperties) ToProto() *ProtoCertificateProperties { + proto := &ProtoCertificateProperties{ + OrganizationalUnit: x.OrganizationalUnit, + } + return proto +} + +func CertificatePropertiesProtoMap(values []*CertificateProperties) []*ProtoCertificateProperties { + result := make([]*ProtoCertificateProperties, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go new file mode 100644 index 00000000..6dc4f119 --- /dev/null +++ b/models/check_definition.pb.go @@ -0,0 +1,425 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: check_definition.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoCheckDefinition struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Checks []*ProtoCheck `protobuf:"bytes,1,rep,name=checks,proto3" json:"checks,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` + ReadinessChecks []*ProtoCheck `protobuf:"bytes,3,rep,name=readiness_checks,json=readinessChecks,proto3" json:"readiness_checks,omitempty"` +} + +func (x *ProtoCheckDefinition) Reset() { + *x = ProtoCheckDefinition{} + if protoimpl.UnsafeEnabled { + mi := &file_check_definition_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCheckDefinition) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCheckDefinition) ProtoMessage() {} + +func (x *ProtoCheckDefinition) ProtoReflect() protoreflect.Message { + mi := &file_check_definition_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCheckDefinition.ProtoReflect.Descriptor instead. +func (*ProtoCheckDefinition) Descriptor() ([]byte, []int) { + return file_check_definition_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoCheckDefinition) GetChecks() []*ProtoCheck { + if x != nil { + return x.Checks + } + return nil +} + +func (x *ProtoCheckDefinition) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoCheckDefinition) GetReadinessChecks() []*ProtoCheck { + if x != nil { + return x.ReadinessChecks + } + return nil +} + +type ProtoCheck struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // oneof is hard to use right now, instead we can do this check in validation + // oneof check { + TcpCheck *ProtoTCPCheck `protobuf:"bytes,1,opt,name=tcp_check,json=tcpCheck,proto3" json:"tcp_check,omitempty"` + HttpCheck *ProtoHTTPCheck `protobuf:"bytes,2,opt,name=http_check,json=httpCheck,proto3" json:"http_check,omitempty"` // } +} + +func (x *ProtoCheck) Reset() { + *x = ProtoCheck{} + if protoimpl.UnsafeEnabled { + mi := &file_check_definition_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCheck) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCheck) ProtoMessage() {} + +func (x *ProtoCheck) ProtoReflect() protoreflect.Message { + mi := &file_check_definition_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCheck.ProtoReflect.Descriptor instead. +func (*ProtoCheck) Descriptor() ([]byte, []int) { + return file_check_definition_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoCheck) GetTcpCheck() *ProtoTCPCheck { + if x != nil { + return x.TcpCheck + } + return nil +} + +func (x *ProtoCheck) GetHttpCheck() *ProtoHTTPCheck { + if x != nil { + return x.HttpCheck + } + return nil +} + +type ProtoTCPCheck struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` + ConnectTimeoutMs uint64 `protobuf:"varint,2,opt,name=connect_timeout_ms,json=connectTimeoutMs,proto3" json:"connect_timeout_ms,omitempty"` + IntervalMs uint64 `protobuf:"varint,3,opt,name=interval_ms,json=intervalMs,proto3" json:"interval_ms,omitempty"` +} + +func (x *ProtoTCPCheck) Reset() { + *x = ProtoTCPCheck{} + if protoimpl.UnsafeEnabled { + mi := &file_check_definition_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTCPCheck) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTCPCheck) ProtoMessage() {} + +func (x *ProtoTCPCheck) ProtoReflect() protoreflect.Message { + mi := &file_check_definition_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTCPCheck.ProtoReflect.Descriptor instead. +func (*ProtoTCPCheck) Descriptor() ([]byte, []int) { + return file_check_definition_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoTCPCheck) GetPort() uint32 { + if x != nil { + return x.Port + } + return 0 +} + +func (x *ProtoTCPCheck) GetConnectTimeoutMs() uint64 { + if x != nil { + return x.ConnectTimeoutMs + } + return 0 +} + +func (x *ProtoTCPCheck) GetIntervalMs() uint64 { + if x != nil { + return x.IntervalMs + } + return 0 +} + +type ProtoHTTPCheck struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` + RequestTimeoutMs uint64 `protobuf:"varint,2,opt,name=request_timeout_ms,json=requestTimeoutMs,proto3" json:"request_timeout_ms,omitempty"` + Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` + IntervalMs uint64 `protobuf:"varint,4,opt,name=interval_ms,json=intervalMs,proto3" json:"interval_ms,omitempty"` +} + +func (x *ProtoHTTPCheck) Reset() { + *x = ProtoHTTPCheck{} + if protoimpl.UnsafeEnabled { + mi := &file_check_definition_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoHTTPCheck) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoHTTPCheck) ProtoMessage() {} + +func (x *ProtoHTTPCheck) ProtoReflect() protoreflect.Message { + mi := &file_check_definition_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoHTTPCheck.ProtoReflect.Descriptor instead. +func (*ProtoHTTPCheck) Descriptor() ([]byte, []int) { + return file_check_definition_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoHTTPCheck) GetPort() uint32 { + if x != nil { + return x.Port + } + return 0 +} + +func (x *ProtoHTTPCheck) GetRequestTimeoutMs() uint64 { + if x != nil { + return x.RequestTimeoutMs + } + return 0 +} + +func (x *ProtoHTTPCheck) GetPath() string { + if x != nil { + return x.Path + } + return "" +} + +func (x *ProtoHTTPCheck) GetIntervalMs() uint64 { + if x != nil { + return x.IntervalMs + } + return 0 +} + +var File_check_definition_proto protoreflect.FileDescriptor + +var file_check_definition_proto_rawDesc = []byte{ + 0x0a, 0x16, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x63, 0x68, 0x65, + 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x06, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3d, 0x0a, 0x10, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, + 0x73, 0x73, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x52, 0x0f, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x73, 0x22, 0x77, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x12, 0x32, 0x0a, 0x09, 0x74, 0x63, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x08, 0x74, 0x63, + 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x35, 0x0a, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x52, 0x09, 0x68, 0x74, 0x74, 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x72, 0x0a, + 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, + 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, + 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, + 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x4d, + 0x73, 0x22, 0x87, 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, + 0x0a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x4d, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_check_definition_proto_rawDescOnce sync.Once + file_check_definition_proto_rawDescData = file_check_definition_proto_rawDesc +) + +func file_check_definition_proto_rawDescGZIP() []byte { + file_check_definition_proto_rawDescOnce.Do(func() { + file_check_definition_proto_rawDescData = protoimpl.X.CompressGZIP(file_check_definition_proto_rawDescData) + }) + return file_check_definition_proto_rawDescData +} + +var file_check_definition_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_check_definition_proto_goTypes = []interface{}{ + (*ProtoCheckDefinition)(nil), // 0: models.ProtoCheckDefinition + (*ProtoCheck)(nil), // 1: models.ProtoCheck + (*ProtoTCPCheck)(nil), // 2: models.ProtoTCPCheck + (*ProtoHTTPCheck)(nil), // 3: models.ProtoHTTPCheck +} +var file_check_definition_proto_depIdxs = []int32{ + 1, // 0: models.ProtoCheckDefinition.checks:type_name -> models.ProtoCheck + 1, // 1: models.ProtoCheckDefinition.readiness_checks:type_name -> models.ProtoCheck + 2, // 2: models.ProtoCheck.tcp_check:type_name -> models.ProtoTCPCheck + 3, // 3: models.ProtoCheck.http_check:type_name -> models.ProtoHTTPCheck + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name +} + +func init() { file_check_definition_proto_init() } +func file_check_definition_proto_init() { + if File_check_definition_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_check_definition_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCheckDefinition); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_check_definition_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCheck); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_check_definition_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTCPCheck); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_check_definition_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoHTTPCheck); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_check_definition_proto_rawDesc, + NumEnums: 0, + NumMessages: 4, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_check_definition_proto_goTypes, + DependencyIndexes: file_check_definition_proto_depIdxs, + MessageInfos: file_check_definition_proto_msgTypes, + }.Build() + File_check_definition_proto = out.File + file_check_definition_proto_rawDesc = nil + file_check_definition_proto_goTypes = nil + file_check_definition_proto_depIdxs = nil +} diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go new file mode 100644 index 00000000..36eb8172 --- /dev/null +++ b/models/check_definition_bbs.pb.go @@ -0,0 +1,103 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: check_definition.proto + +package models + +// Prevent copylock errors when using ProtoCheckDefinition directly +type CheckDefinition struct { + Checks []*Check + LogSource string + ReadinessChecks []*Check +} + +func (x *CheckDefinition) ToProto() *ProtoCheckDefinition { + proto := &ProtoCheckDefinition{ + Checks: CheckProtoMap(x.Checks), + LogSource: x.LogSource, + ReadinessChecks: CheckProtoMap(x.ReadinessChecks), + } + return proto +} + +func CheckDefinitionProtoMap(values []*CheckDefinition) []*ProtoCheckDefinition { + result := make([]*ProtoCheckDefinition, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoCheck directly +type Check struct { + TcpCheck *TCPCheck + HttpCheck *HTTPCheck +} + +func (x *Check) ToProto() *ProtoCheck { + proto := &ProtoCheck{ + TcpCheck: x.TcpCheck.ToProto(), + HttpCheck: x.HttpCheck.ToProto(), + } + return proto +} + +func CheckProtoMap(values []*Check) []*ProtoCheck { + result := make([]*ProtoCheck, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTCPCheck directly +type TCPCheck struct { + Port uint32 + ConnectTimeoutMs uint64 + IntervalMs uint64 +} + +func (x *TCPCheck) ToProto() *ProtoTCPCheck { + proto := &ProtoTCPCheck{ + Port: x.Port, + ConnectTimeoutMs: x.ConnectTimeoutMs, + IntervalMs: x.IntervalMs, + } + return proto +} + +func TCPCheckProtoMap(values []*TCPCheck) []*ProtoTCPCheck { + result := make([]*ProtoTCPCheck, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoHTTPCheck directly +type HTTPCheck struct { + Port uint32 + RequestTimeoutMs uint64 + Path string + IntervalMs uint64 +} + +func (x *HTTPCheck) ToProto() *ProtoHTTPCheck { + proto := &ProtoHTTPCheck{ + Port: x.Port, + RequestTimeoutMs: x.RequestTimeoutMs, + Path: x.Path, + IntervalMs: x.IntervalMs, + } + return proto +} + +func HTTPCheckProtoMap(values []*HTTPCheck) []*ProtoHTTPCheck { + result := make([]*ProtoHTTPCheck, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go new file mode 100644 index 00000000..2bdf9d80 --- /dev/null +++ b/models/desired_lrp.pb.go @@ -0,0 +1,1520 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: desired_lrp.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoDesiredLRPSchedulingInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,json=desiredLrpKey,proto3" json:"desired_lrp_key,omitempty"` + Annotation string `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation,omitempty"` + Instances int32 `protobuf:"varint,3,opt,name=instances,proto3" json:"instances,omitempty"` + DesiredLrpResource *ProtoDesiredLRPResource `protobuf:"bytes,4,opt,name=desired_lrp_resource,json=desiredLrpResource,proto3" json:"desired_lrp_resource,omitempty"` + Routes *ProtoRoutes `protobuf:"bytes,5,opt,name=routes,proto3" json:"routes,omitempty"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag,omitempty"` + VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,json=volumePlacement,proto3" json:"volume_placement,omitempty"` + ProtoPlacementTags []string `protobuf:"bytes,8,rep,name=ProtoPlacementTags,json=placement_tags,proto3" json:"ProtoPlacementTags,omitempty"` +} + +func (x *ProtoDesiredLRPSchedulingInfo) Reset() { + *x = ProtoDesiredLRPSchedulingInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPSchedulingInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPSchedulingInfo) ProtoMessage() {} + +func (x *ProtoDesiredLRPSchedulingInfo) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPSchedulingInfo.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPSchedulingInfo) Descriptor() ([]byte, []int) { + return file_desired_lrp_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetDesiredLrpKey() *ProtoDesiredLRPKey { + if x != nil { + return x.DesiredLrpKey + } + return nil +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetAnnotation() string { + if x != nil { + return x.Annotation + } + return "" +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetInstances() int32 { + if x != nil { + return x.Instances + } + return 0 +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetDesiredLrpResource() *ProtoDesiredLRPResource { + if x != nil { + return x.DesiredLrpResource + } + return nil +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetRoutes() *ProtoRoutes { + if x != nil { + return x.Routes + } + return nil +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetModificationTag() *ProtoModificationTag { + if x != nil { + return x.ModificationTag + } + return nil +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetVolumePlacement() *ProtoVolumePlacement { + if x != nil { + return x.VolumePlacement + } + return nil +} + +func (x *ProtoDesiredLRPSchedulingInfo) GetProtoPlacementTags() []string { + if x != nil { + return x.ProtoPlacementTags + } + return nil +} + +type ProtoDesiredLRPRunInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,json=desiredLrpKey,proto3" json:"desired_lrp_key,omitempty"` + EnvironmentVariables []*ProtoEnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=env,proto3" json:"environment_variables,omitempty"` + Setup *ProtoAction `protobuf:"bytes,3,opt,name=setup,proto3" json:"setup,omitempty"` + Action *ProtoAction `protobuf:"bytes,4,opt,name=action,proto3" json:"action,omitempty"` + Monitor *ProtoAction `protobuf:"bytes,5,opt,name=monitor,proto3" json:"monitor,omitempty"` + // Deprecated: Marked as deprecated in desired_lrp.proto. + DeprecatedStartTimeoutS uint32 `protobuf:"varint,6,opt,name=deprecated_start_timeout_s,json=start_timeout,proto3" json:"deprecated_start_timeout_s,omitempty"` + Privileged bool `protobuf:"varint,7,opt,name=privileged,proto3" json:"privileged,omitempty"` + CpuWeight uint32 `protobuf:"varint,8,opt,name=cpu_weight,proto3" json:"cpu_weight,omitempty"` + Ports []uint32 `protobuf:"varint,9,rep,name=ports,proto3" json:"ports,omitempty"` + EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,10,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` + LogSource string `protobuf:"bytes,11,opt,name=log_source,proto3" json:"log_source,omitempty"` + // Deprecated: Marked as deprecated in desired_lrp.proto. + MetricsGuid string `protobuf:"bytes,12,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` + CreatedAt int64 `protobuf:"varint,13,opt,name=created_at,proto3" json:"created_at,omitempty"` + CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,14,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` + // Deprecated: Marked as deprecated in desired_lrp.proto. + LegacyDownloadUser string `protobuf:"bytes,15,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `protobuf:"bytes,16,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,17,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` + Network *ProtoNetwork `protobuf:"bytes,18,opt,name=network,proto3" json:"network,omitempty"` + StartTimeoutMs int64 `protobuf:"varint,19,opt,name=start_timeout_ms,proto3" json:"start_timeout_ms,omitempty"` + CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,20,opt,name=certificate_properties,json=certificateProperties,proto3,oneof" json:"certificate_properties,omitempty"` + ImageUsername string `protobuf:"bytes,21,opt,name=image_username,json=imageUsername,proto3" json:"image_username,omitempty"` + ImagePassword string `protobuf:"bytes,22,opt,name=image_password,json=imagePassword,proto3" json:"image_password,omitempty"` + CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,23,opt,name=check_definition,json=checkDefinition,proto3" json:"check_definition,omitempty"` + ImageLayers []*ProtoImageLayer `protobuf:"bytes,24,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,25,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Sidecars []*ProtoSidecar `protobuf:"bytes,26,rep,name=sidecars,proto3" json:"sidecars,omitempty"` + LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,27,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` +} + +func (x *ProtoDesiredLRPRunInfo) Reset() { + *x = ProtoDesiredLRPRunInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPRunInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPRunInfo) ProtoMessage() {} + +func (x *ProtoDesiredLRPRunInfo) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPRunInfo.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPRunInfo) Descriptor() ([]byte, []int) { + return file_desired_lrp_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoDesiredLRPRunInfo) GetDesiredLrpKey() *ProtoDesiredLRPKey { + if x != nil { + return x.DesiredLrpKey + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetEnvironmentVariables() []*ProtoEnvironmentVariable { + if x != nil { + return x.EnvironmentVariables + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetSetup() *ProtoAction { + if x != nil { + return x.Setup + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetAction() *ProtoAction { + if x != nil { + return x.Action + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetMonitor() *ProtoAction { + if x != nil { + return x.Monitor + } + return nil +} + +// Deprecated: Marked as deprecated in desired_lrp.proto. +func (x *ProtoDesiredLRPRunInfo) GetDeprecatedStartTimeoutS() uint32 { + if x != nil { + return x.DeprecatedStartTimeoutS + } + return 0 +} + +func (x *ProtoDesiredLRPRunInfo) GetPrivileged() bool { + if x != nil { + return x.Privileged + } + return false +} + +func (x *ProtoDesiredLRPRunInfo) GetCpuWeight() uint32 { + if x != nil { + return x.CpuWeight + } + return 0 +} + +func (x *ProtoDesiredLRPRunInfo) GetPorts() []uint32 { + if x != nil { + return x.Ports + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetEgressRules() []*ProtoSecurityGroupRule { + if x != nil { + return x.EgressRules + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +// Deprecated: Marked as deprecated in desired_lrp.proto. +func (x *ProtoDesiredLRPRunInfo) GetMetricsGuid() string { + if x != nil { + return x.MetricsGuid + } + return "" +} + +func (x *ProtoDesiredLRPRunInfo) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *ProtoDesiredLRPRunInfo) GetCachedDependencies() []*ProtoCachedDependency { + if x != nil { + return x.CachedDependencies + } + return nil +} + +// Deprecated: Marked as deprecated in desired_lrp.proto. +func (x *ProtoDesiredLRPRunInfo) GetLegacyDownloadUser() string { + if x != nil { + return x.LegacyDownloadUser + } + return "" +} + +func (x *ProtoDesiredLRPRunInfo) GetTrustedSystemCertificatesPath() string { + if x != nil { + return x.TrustedSystemCertificatesPath + } + return "" +} + +func (x *ProtoDesiredLRPRunInfo) GetVolumeMounts() []*ProtoVolumeMount { + if x != nil { + return x.VolumeMounts + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetNetwork() *ProtoNetwork { + if x != nil { + return x.Network + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetStartTimeoutMs() int64 { + if x != nil { + return x.StartTimeoutMs + } + return 0 +} + +func (x *ProtoDesiredLRPRunInfo) GetCertificateProperties() *ProtoCertificateProperties { + if x != nil { + return x.CertificateProperties + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetImageUsername() string { + if x != nil { + return x.ImageUsername + } + return "" +} + +func (x *ProtoDesiredLRPRunInfo) GetImagePassword() string { + if x != nil { + return x.ImagePassword + } + return "" +} + +func (x *ProtoDesiredLRPRunInfo) GetCheckDefinition() *ProtoCheckDefinition { + if x != nil { + return x.CheckDefinition + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetImageLayers() []*ProtoImageLayer { + if x != nil { + return x.ImageLayers + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetMetricTags() map[string]*ProtoMetricTagValue { + if x != nil { + return x.MetricTags + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetSidecars() []*ProtoSidecar { + if x != nil { + return x.Sidecars + } + return nil +} + +func (x *ProtoDesiredLRPRunInfo) GetLogRateLimit() *ProtoLogRateLimit { + if x != nil { + return x.LogRateLimit + } + return nil +} + +// helper message for marshalling routes +type ProtoRoutes struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Routes map[string][]byte `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (x *ProtoRoutes) Reset() { + *x = ProtoRoutes{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRoutes) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRoutes) ProtoMessage() {} + +func (x *ProtoRoutes) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRoutes.ProtoReflect.Descriptor instead. +func (*ProtoRoutes) Descriptor() ([]byte, []int) { + return file_desired_lrp_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoRoutes) GetRoutes() map[string][]byte { + if x != nil { + return x.Routes + } + return nil +} + +type ProtoDesiredLRPUpdate struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` + Routes *ProtoRoutes `protobuf:"bytes,2,opt,name=routes,proto3,oneof" json:"routes,omitempty"` + Annotation *string `protobuf:"bytes,3,opt,name=annotation,proto3,oneof" json:"annotation,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (x *ProtoDesiredLRPUpdate) Reset() { + *x = ProtoDesiredLRPUpdate{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPUpdate) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPUpdate) ProtoMessage() {} + +func (x *ProtoDesiredLRPUpdate) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPUpdate.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPUpdate) Descriptor() ([]byte, []int) { + return file_desired_lrp_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoDesiredLRPUpdate) GetInstances() int32 { + if x != nil && x.Instances != nil { + return *x.Instances + } + return 0 +} + +func (x *ProtoDesiredLRPUpdate) GetRoutes() *ProtoRoutes { + if x != nil { + return x.Routes + } + return nil +} + +func (x *ProtoDesiredLRPUpdate) GetAnnotation() string { + if x != nil && x.Annotation != nil { + return *x.Annotation + } + return "" +} + +func (x *ProtoDesiredLRPUpdate) GetMetricTags() map[string]*ProtoMetricTagValue { + if x != nil { + return x.MetricTags + } + return nil +} + +type ProtoDesiredLRPKey struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` + LogGuid string `protobuf:"bytes,3,opt,name=log_guid,proto3" json:"log_guid,omitempty"` +} + +func (x *ProtoDesiredLRPKey) Reset() { + *x = ProtoDesiredLRPKey{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPKey) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPKey) ProtoMessage() {} + +func (x *ProtoDesiredLRPKey) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPKey.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPKey) Descriptor() ([]byte, []int) { + return file_desired_lrp_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoDesiredLRPKey) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoDesiredLRPKey) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoDesiredLRPKey) GetLogGuid() string { + if x != nil { + return x.LogGuid + } + return "" +} + +type ProtoDesiredLRPResource struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` + DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + RootFs string `protobuf:"bytes,3,opt,name=root_fs,json=rootfs,proto3" json:"root_fs,omitempty"` + MaxPids int32 `protobuf:"varint,4,opt,name=max_pids,proto3" json:"max_pids,omitempty"` +} + +func (x *ProtoDesiredLRPResource) Reset() { + *x = ProtoDesiredLRPResource{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPResource) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPResource) ProtoMessage() {} + +func (x *ProtoDesiredLRPResource) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPResource.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPResource) Descriptor() ([]byte, []int) { + return file_desired_lrp_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoDesiredLRPResource) GetMemoryMb() int32 { + if x != nil { + return x.MemoryMb + } + return 0 +} + +func (x *ProtoDesiredLRPResource) GetDiskMb() int32 { + if x != nil { + return x.DiskMb + } + return 0 +} + +func (x *ProtoDesiredLRPResource) GetRootFs() string { + if x != nil { + return x.RootFs + } + return "" +} + +func (x *ProtoDesiredLRPResource) GetMaxPids() int32 { + if x != nil { + return x.MaxPids + } + return 0 +} + +type ProtoDesiredLRP struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` + RootFs string `protobuf:"bytes,3,opt,name=root_fs,json=rootfs,proto3" json:"root_fs,omitempty"` + Instances int32 `protobuf:"varint,4,opt,name=instances,proto3" json:"instances,omitempty"` + EnvironmentVariables []*ProtoEnvironmentVariable `protobuf:"bytes,5,rep,name=environment_variables,json=env,proto3" json:"environment_variables,omitempty"` + Setup *ProtoAction `protobuf:"bytes,6,opt,name=setup,proto3" json:"setup,omitempty"` + Action *ProtoAction `protobuf:"bytes,7,opt,name=action,proto3" json:"action,omitempty"` + StartTimeoutMs int64 `protobuf:"varint,27,opt,name=start_timeout_ms,proto3" json:"start_timeout_ms,omitempty"` + // Deprecated: Marked as deprecated in desired_lrp.proto. + DeprecatedStartTimeoutS uint32 `protobuf:"varint,8,opt,name=deprecated_start_timeout_s,json=deprecated_timeout_ns,proto3" json:"deprecated_start_timeout_s,omitempty"` + Monitor *ProtoAction `protobuf:"bytes,9,opt,name=monitor,proto3" json:"monitor,omitempty"` + DiskMb int32 `protobuf:"varint,10,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + MemoryMb int32 `protobuf:"varint,11,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` + CpuWeight uint32 `protobuf:"varint,12,opt,name=cpu_weight,proto3" json:"cpu_weight,omitempty"` + Privileged bool `protobuf:"varint,13,opt,name=privileged,proto3" json:"privileged,omitempty"` + Ports []uint32 `protobuf:"varint,14,rep,name=ports,proto3" json:"ports,omitempty"` + Routes *ProtoRoutes `protobuf:"bytes,15,opt,name=routes,proto3,oneof" json:"routes,omitempty"` + LogSource string `protobuf:"bytes,16,opt,name=log_source,proto3" json:"log_source,omitempty"` + LogGuid string `protobuf:"bytes,17,opt,name=log_guid,proto3" json:"log_guid,omitempty"` + // Deprecated: Marked as deprecated in desired_lrp.proto. + MetricsGuid string `protobuf:"bytes,18,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` + Annotation string `protobuf:"bytes,19,opt,name=annotation,proto3" json:"annotation,omitempty"` + EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,20,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,21,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag,omitempty"` + CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,22,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` + // Deprecated: Marked as deprecated in desired_lrp.proto. + LegacyDownloadUser string `protobuf:"bytes,23,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `protobuf:"bytes,24,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,25,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` + Network *ProtoNetwork `protobuf:"bytes,26,opt,name=network,proto3" json:"network,omitempty"` + ProtoPlacementTags []string `protobuf:"bytes,28,rep,name=ProtoPlacementTags,json=placement_tags,proto3" json:"ProtoPlacementTags,omitempty"` + MaxPids int32 `protobuf:"varint,29,opt,name=max_pids,proto3" json:"max_pids,omitempty"` + CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,30,opt,name=certificate_properties,json=certificateProperties,proto3,oneof" json:"certificate_properties,omitempty"` + ImageUsername string `protobuf:"bytes,31,opt,name=image_username,json=imageUsername,proto3" json:"image_username,omitempty"` + ImagePassword string `protobuf:"bytes,32,opt,name=image_password,json=imagePassword,proto3" json:"image_password,omitempty"` + CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,33,opt,name=check_definition,json=checkDefinition,proto3" json:"check_definition,omitempty"` + ImageLayers []*ProtoImageLayer `protobuf:"bytes,34,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,35,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Sidecars []*ProtoSidecar `protobuf:"bytes,36,rep,name=sidecars,proto3" json:"sidecars,omitempty"` + LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,37,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` +} + +func (x *ProtoDesiredLRP) Reset() { + *x = ProtoDesiredLRP{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRP) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRP) ProtoMessage() {} + +func (x *ProtoDesiredLRP) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRP.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRP) Descriptor() ([]byte, []int) { + return file_desired_lrp_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoDesiredLRP) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoDesiredLRP) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoDesiredLRP) GetRootFs() string { + if x != nil { + return x.RootFs + } + return "" +} + +func (x *ProtoDesiredLRP) GetInstances() int32 { + if x != nil { + return x.Instances + } + return 0 +} + +func (x *ProtoDesiredLRP) GetEnvironmentVariables() []*ProtoEnvironmentVariable { + if x != nil { + return x.EnvironmentVariables + } + return nil +} + +func (x *ProtoDesiredLRP) GetSetup() *ProtoAction { + if x != nil { + return x.Setup + } + return nil +} + +func (x *ProtoDesiredLRP) GetAction() *ProtoAction { + if x != nil { + return x.Action + } + return nil +} + +func (x *ProtoDesiredLRP) GetStartTimeoutMs() int64 { + if x != nil { + return x.StartTimeoutMs + } + return 0 +} + +// Deprecated: Marked as deprecated in desired_lrp.proto. +func (x *ProtoDesiredLRP) GetDeprecatedStartTimeoutS() uint32 { + if x != nil { + return x.DeprecatedStartTimeoutS + } + return 0 +} + +func (x *ProtoDesiredLRP) GetMonitor() *ProtoAction { + if x != nil { + return x.Monitor + } + return nil +} + +func (x *ProtoDesiredLRP) GetDiskMb() int32 { + if x != nil { + return x.DiskMb + } + return 0 +} + +func (x *ProtoDesiredLRP) GetMemoryMb() int32 { + if x != nil { + return x.MemoryMb + } + return 0 +} + +func (x *ProtoDesiredLRP) GetCpuWeight() uint32 { + if x != nil { + return x.CpuWeight + } + return 0 +} + +func (x *ProtoDesiredLRP) GetPrivileged() bool { + if x != nil { + return x.Privileged + } + return false +} + +func (x *ProtoDesiredLRP) GetPorts() []uint32 { + if x != nil { + return x.Ports + } + return nil +} + +func (x *ProtoDesiredLRP) GetRoutes() *ProtoRoutes { + if x != nil { + return x.Routes + } + return nil +} + +func (x *ProtoDesiredLRP) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoDesiredLRP) GetLogGuid() string { + if x != nil { + return x.LogGuid + } + return "" +} + +// Deprecated: Marked as deprecated in desired_lrp.proto. +func (x *ProtoDesiredLRP) GetMetricsGuid() string { + if x != nil { + return x.MetricsGuid + } + return "" +} + +func (x *ProtoDesiredLRP) GetAnnotation() string { + if x != nil { + return x.Annotation + } + return "" +} + +func (x *ProtoDesiredLRP) GetEgressRules() []*ProtoSecurityGroupRule { + if x != nil { + return x.EgressRules + } + return nil +} + +func (x *ProtoDesiredLRP) GetModificationTag() *ProtoModificationTag { + if x != nil { + return x.ModificationTag + } + return nil +} + +func (x *ProtoDesiredLRP) GetCachedDependencies() []*ProtoCachedDependency { + if x != nil { + return x.CachedDependencies + } + return nil +} + +// Deprecated: Marked as deprecated in desired_lrp.proto. +func (x *ProtoDesiredLRP) GetLegacyDownloadUser() string { + if x != nil { + return x.LegacyDownloadUser + } + return "" +} + +func (x *ProtoDesiredLRP) GetTrustedSystemCertificatesPath() string { + if x != nil { + return x.TrustedSystemCertificatesPath + } + return "" +} + +func (x *ProtoDesiredLRP) GetVolumeMounts() []*ProtoVolumeMount { + if x != nil { + return x.VolumeMounts + } + return nil +} + +func (x *ProtoDesiredLRP) GetNetwork() *ProtoNetwork { + if x != nil { + return x.Network + } + return nil +} + +func (x *ProtoDesiredLRP) GetProtoPlacementTags() []string { + if x != nil { + return x.ProtoPlacementTags + } + return nil +} + +func (x *ProtoDesiredLRP) GetMaxPids() int32 { + if x != nil { + return x.MaxPids + } + return 0 +} + +func (x *ProtoDesiredLRP) GetCertificateProperties() *ProtoCertificateProperties { + if x != nil { + return x.CertificateProperties + } + return nil +} + +func (x *ProtoDesiredLRP) GetImageUsername() string { + if x != nil { + return x.ImageUsername + } + return "" +} + +func (x *ProtoDesiredLRP) GetImagePassword() string { + if x != nil { + return x.ImagePassword + } + return "" +} + +func (x *ProtoDesiredLRP) GetCheckDefinition() *ProtoCheckDefinition { + if x != nil { + return x.CheckDefinition + } + return nil +} + +func (x *ProtoDesiredLRP) GetImageLayers() []*ProtoImageLayer { + if x != nil { + return x.ImageLayers + } + return nil +} + +func (x *ProtoDesiredLRP) GetMetricTags() map[string]*ProtoMetricTagValue { + if x != nil { + return x.MetricTags + } + return nil +} + +func (x *ProtoDesiredLRP) GetSidecars() []*ProtoSidecar { + if x != nil { + return x.Sidecars + } + return nil +} + +func (x *ProtoDesiredLRP) GetLogRateLimit() *ProtoLogRateLimit { + if x != nil { + return x.LogRateLimit + } + return nil +} + +var File_desired_lrp_proto protoreflect.FileDescriptor + +var file_desired_lrp_proto_rawDesc = []byte{ + 0x0a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, + 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, + 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, + 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x76, 0x6f, 0x6c, + 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x16, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, + 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, + 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, + 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0xdf, 0x03, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x42, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, + 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x51, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x12, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, + 0x70, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x2b, 0x0a, 0x06, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x06, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, + 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, + 0x47, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, + 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, + 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x74, 0x61, 0x67, 0x73, 0x22, 0xbd, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, + 0x42, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, + 0x4b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, + 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, + 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, + 0x12, 0x35, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, + 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, + 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, + 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, + 0x18, 0x09, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, + 0x73, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, + 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, + 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, + 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, + 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, + 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, + 0x75, 0x73, 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, + 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, + 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, + 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, + 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, + 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, + 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x15, 0x63, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, + 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, + 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, + 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, + 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, + 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, + 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, + 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, + 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, + 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, + 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, + 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe5, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, + 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, + 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, + 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, + 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, + 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, + 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, + 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x88, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, + 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, + 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, + 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, + 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, + 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, + 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, + 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, + 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, + 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, + 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, + 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, + 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, + 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, + 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, + 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, + 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x00, 0x52, + 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, + 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, + 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, + 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, + 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, + 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, + 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, + 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, + 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, + 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, + 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, + 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, + 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, + 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, + 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, + 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, + 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, + 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, + 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, + 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, + 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, + 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, + 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, + 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, + 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, + 0x65, 0x72, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, + 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, + 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, + 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, + 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, + 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, + 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_desired_lrp_proto_rawDescOnce sync.Once + file_desired_lrp_proto_rawDescData = file_desired_lrp_proto_rawDesc +) + +func file_desired_lrp_proto_rawDescGZIP() []byte { + file_desired_lrp_proto_rawDescOnce.Do(func() { + file_desired_lrp_proto_rawDescData = protoimpl.X.CompressGZIP(file_desired_lrp_proto_rawDescData) + }) + return file_desired_lrp_proto_rawDescData +} + +var file_desired_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_desired_lrp_proto_goTypes = []interface{}{ + (*ProtoDesiredLRPSchedulingInfo)(nil), // 0: models.ProtoDesiredLRPSchedulingInfo + (*ProtoDesiredLRPRunInfo)(nil), // 1: models.ProtoDesiredLRPRunInfo + (*ProtoRoutes)(nil), // 2: models.ProtoRoutes + (*ProtoDesiredLRPUpdate)(nil), // 3: models.ProtoDesiredLRPUpdate + (*ProtoDesiredLRPKey)(nil), // 4: models.ProtoDesiredLRPKey + (*ProtoDesiredLRPResource)(nil), // 5: models.ProtoDesiredLRPResource + (*ProtoDesiredLRP)(nil), // 6: models.ProtoDesiredLRP + nil, // 7: models.ProtoDesiredLRPRunInfo.MetricTagsEntry + nil, // 8: models.ProtoRoutes.RoutesEntry + nil, // 9: models.ProtoDesiredLRPUpdate.MetricTagsEntry + nil, // 10: models.ProtoDesiredLRP.MetricTagsEntry + (*ProtoModificationTag)(nil), // 11: models.ProtoModificationTag + (*ProtoVolumePlacement)(nil), // 12: models.ProtoVolumePlacement + (*ProtoEnvironmentVariable)(nil), // 13: models.ProtoEnvironmentVariable + (*ProtoAction)(nil), // 14: models.ProtoAction + (*ProtoSecurityGroupRule)(nil), // 15: models.ProtoSecurityGroupRule + (*ProtoCachedDependency)(nil), // 16: models.ProtoCachedDependency + (*ProtoVolumeMount)(nil), // 17: models.ProtoVolumeMount + (*ProtoNetwork)(nil), // 18: models.ProtoNetwork + (*ProtoCertificateProperties)(nil), // 19: models.ProtoCertificateProperties + (*ProtoCheckDefinition)(nil), // 20: models.ProtoCheckDefinition + (*ProtoImageLayer)(nil), // 21: models.ProtoImageLayer + (*ProtoSidecar)(nil), // 22: models.ProtoSidecar + (*ProtoLogRateLimit)(nil), // 23: models.ProtoLogRateLimit + (*ProtoMetricTagValue)(nil), // 24: models.ProtoMetricTagValue +} +var file_desired_lrp_proto_depIdxs = []int32{ + 4, // 0: models.ProtoDesiredLRPSchedulingInfo.desired_lrp_key:type_name -> models.ProtoDesiredLRPKey + 5, // 1: models.ProtoDesiredLRPSchedulingInfo.desired_lrp_resource:type_name -> models.ProtoDesiredLRPResource + 2, // 2: models.ProtoDesiredLRPSchedulingInfo.routes:type_name -> models.ProtoRoutes + 11, // 3: models.ProtoDesiredLRPSchedulingInfo.modification_tag:type_name -> models.ProtoModificationTag + 12, // 4: models.ProtoDesiredLRPSchedulingInfo.volume_placement:type_name -> models.ProtoVolumePlacement + 4, // 5: models.ProtoDesiredLRPRunInfo.desired_lrp_key:type_name -> models.ProtoDesiredLRPKey + 13, // 6: models.ProtoDesiredLRPRunInfo.environment_variables:type_name -> models.ProtoEnvironmentVariable + 14, // 7: models.ProtoDesiredLRPRunInfo.setup:type_name -> models.ProtoAction + 14, // 8: models.ProtoDesiredLRPRunInfo.action:type_name -> models.ProtoAction + 14, // 9: models.ProtoDesiredLRPRunInfo.monitor:type_name -> models.ProtoAction + 15, // 10: models.ProtoDesiredLRPRunInfo.egress_rules:type_name -> models.ProtoSecurityGroupRule + 16, // 11: models.ProtoDesiredLRPRunInfo.cached_dependencies:type_name -> models.ProtoCachedDependency + 17, // 12: models.ProtoDesiredLRPRunInfo.volume_mounts:type_name -> models.ProtoVolumeMount + 18, // 13: models.ProtoDesiredLRPRunInfo.network:type_name -> models.ProtoNetwork + 19, // 14: models.ProtoDesiredLRPRunInfo.certificate_properties:type_name -> models.ProtoCertificateProperties + 20, // 15: models.ProtoDesiredLRPRunInfo.check_definition:type_name -> models.ProtoCheckDefinition + 21, // 16: models.ProtoDesiredLRPRunInfo.image_layers:type_name -> models.ProtoImageLayer + 7, // 17: models.ProtoDesiredLRPRunInfo.metric_tags:type_name -> models.ProtoDesiredLRPRunInfo.MetricTagsEntry + 22, // 18: models.ProtoDesiredLRPRunInfo.sidecars:type_name -> models.ProtoSidecar + 23, // 19: models.ProtoDesiredLRPRunInfo.log_rate_limit:type_name -> models.ProtoLogRateLimit + 8, // 20: models.ProtoRoutes.routes:type_name -> models.ProtoRoutes.RoutesEntry + 2, // 21: models.ProtoDesiredLRPUpdate.routes:type_name -> models.ProtoRoutes + 9, // 22: models.ProtoDesiredLRPUpdate.metric_tags:type_name -> models.ProtoDesiredLRPUpdate.MetricTagsEntry + 13, // 23: models.ProtoDesiredLRP.environment_variables:type_name -> models.ProtoEnvironmentVariable + 14, // 24: models.ProtoDesiredLRP.setup:type_name -> models.ProtoAction + 14, // 25: models.ProtoDesiredLRP.action:type_name -> models.ProtoAction + 14, // 26: models.ProtoDesiredLRP.monitor:type_name -> models.ProtoAction + 2, // 27: models.ProtoDesiredLRP.routes:type_name -> models.ProtoRoutes + 15, // 28: models.ProtoDesiredLRP.egress_rules:type_name -> models.ProtoSecurityGroupRule + 11, // 29: models.ProtoDesiredLRP.modification_tag:type_name -> models.ProtoModificationTag + 16, // 30: models.ProtoDesiredLRP.cached_dependencies:type_name -> models.ProtoCachedDependency + 17, // 31: models.ProtoDesiredLRP.volume_mounts:type_name -> models.ProtoVolumeMount + 18, // 32: models.ProtoDesiredLRP.network:type_name -> models.ProtoNetwork + 19, // 33: models.ProtoDesiredLRP.certificate_properties:type_name -> models.ProtoCertificateProperties + 20, // 34: models.ProtoDesiredLRP.check_definition:type_name -> models.ProtoCheckDefinition + 21, // 35: models.ProtoDesiredLRP.image_layers:type_name -> models.ProtoImageLayer + 10, // 36: models.ProtoDesiredLRP.metric_tags:type_name -> models.ProtoDesiredLRP.MetricTagsEntry + 22, // 37: models.ProtoDesiredLRP.sidecars:type_name -> models.ProtoSidecar + 23, // 38: models.ProtoDesiredLRP.log_rate_limit:type_name -> models.ProtoLogRateLimit + 24, // 39: models.ProtoDesiredLRPRunInfo.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 24, // 40: models.ProtoDesiredLRPUpdate.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 24, // 41: models.ProtoDesiredLRP.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 42, // [42:42] is the sub-list for method output_type + 42, // [42:42] is the sub-list for method input_type + 42, // [42:42] is the sub-list for extension type_name + 42, // [42:42] is the sub-list for extension extendee + 0, // [0:42] is the sub-list for field type_name +} + +func init() { file_desired_lrp_proto_init() } +func file_desired_lrp_proto_init() { + if File_desired_lrp_proto != nil { + return + } + file_actions_proto_init() + file_cached_dependency_proto_init() + file_certificate_properties_proto_init() + file_environment_variables_proto_init() + file_modification_tag_proto_init() + file_network_proto_init() + file_security_group_proto_init() + file_volume_mount_proto_init() + file_check_definition_proto_init() + file_image_layer_proto_init() + file_metric_tags_proto_init() + file_sidecar_proto_init() + file_log_rate_limit_proto_init() + if !protoimpl.UnsafeEnabled { + file_desired_lrp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPSchedulingInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPRunInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRoutes); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPUpdate); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPKey); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPResource); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRP); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_desired_lrp_proto_msgTypes[1].OneofWrappers = []interface{}{} + file_desired_lrp_proto_msgTypes[3].OneofWrappers = []interface{}{} + file_desired_lrp_proto_msgTypes[6].OneofWrappers = []interface{}{} + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_desired_lrp_proto_rawDesc, + NumEnums: 0, + NumMessages: 11, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_desired_lrp_proto_goTypes, + DependencyIndexes: file_desired_lrp_proto_depIdxs, + MessageInfos: file_desired_lrp_proto_msgTypes, + }.Build() + File_desired_lrp_proto = out.File + file_desired_lrp_proto_rawDesc = nil + file_desired_lrp_proto_goTypes = nil + file_desired_lrp_proto_depIdxs = nil +} diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 3ec151cc..50ad3f3d 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -25,7 +25,7 @@ message ProtoDesiredLRPSchedulingInfo { ProtoDesiredLRPResource desired_lrp_resource = 4; - ProtoProtoRoutes routes = 5; + ProtoRoutes routes = 5; ProtoModificationTag modification_tag = 6; ProtoVolumePlacement volume_placement = 7; repeated string ProtoPlacementTags = 8 [json_name ="placement_tags"]; @@ -73,13 +73,13 @@ message ProtoDesiredLRPRunInfo { } // helper message for marshalling routes -message ProtoProtoRoutes { +message ProtoRoutes { map routes = 1; } message ProtoDesiredLRPUpdate { optional int32 instances = 1; - optional ProtoProtoRoutes routes = 2; + optional ProtoRoutes routes = 2; optional string annotation = 3; map metric_tags = 4; } @@ -115,7 +115,7 @@ message ProtoDesiredLRP { uint32 cpu_weight = 12 [json_name = "cpu_weight"]; bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; - optional ProtoProtoRoutes routes = 15; + optional ProtoRoutes routes = 15; string log_source = 16 [json_name = "log_source"]; string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go new file mode 100644 index 00000000..6c0f0b05 --- /dev/null +++ b/models/desired_lrp_bbs.pb.go @@ -0,0 +1,281 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: desired_lrp.proto + +package models + +// Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly +type DesiredLRPSchedulingInfo struct { + DesiredLrpKey *DesiredLRPKey + Annotation string + Instances int32 + DesiredLrpResource *DesiredLRPResource + Routes *Routes + ModificationTag *ModificationTag + VolumePlacement *VolumePlacement + ProtoPlacementTags []string +} + +func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { + proto := &ProtoDesiredLRPSchedulingInfo{ + DesiredLrpKey: x.DesiredLrpKey.ToProto(), + Annotation: x.Annotation, + Instances: x.Instances, + DesiredLrpResource: x.DesiredLrpResource.ToProto(), + Routes: x.Routes.ToProto(), + ModificationTag: x.ModificationTag.ToProto(), + VolumePlacement: x.VolumePlacement.ToProto(), + ProtoPlacementTags: x.ProtoPlacementTags, + } + return proto +} + +func DesiredLRPSchedulingInfoProtoMap(values []*DesiredLRPSchedulingInfo) []*ProtoDesiredLRPSchedulingInfo { + result := make([]*ProtoDesiredLRPSchedulingInfo, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPRunInfo directly +type DesiredLRPRunInfo struct { + DesiredLrpKey *DesiredLRPKey + EnvironmentVariables []*EnvironmentVariable + Setup *Action + Action *Action + Monitor *Action + DeprecatedStartTimeoutS uint32 + Privileged bool + CpuWeight uint32 + Ports []uint32 + EgressRules []*SecurityGroupRule + LogSource string + MetricsGuid string + CreatedAt int64 + CachedDependencies []*CachedDependency + LegacyDownloadUser string + TrustedSystemCertificatesPath string + VolumeMounts []*VolumeMount + Network *Network + StartTimeoutMs int64 + CertificateProperties *CertificateProperties + ImageUsername string + ImagePassword string + CheckDefinition *CheckDefinition + ImageLayers []*ImageLayer + MetricTags map[string]*ProtoMetricTagValue + Sidecars []*Sidecar + LogRateLimit *LogRateLimit +} + +func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { + proto := &ProtoDesiredLRPRunInfo{ + DesiredLrpKey: x.DesiredLrpKey.ToProto(), + EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), + Setup: x.Setup.ToProto(), + Action: x.Action.ToProto(), + Monitor: x.Monitor.ToProto(), + DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, + Privileged: x.Privileged, + CpuWeight: x.CpuWeight, + Ports: x.Ports, + EgressRules: SecurityGroupRuleProtoMap(x.EgressRules), + LogSource: x.LogSource, + MetricsGuid: x.MetricsGuid, + CreatedAt: x.CreatedAt, + CachedDependencies: CachedDependencyProtoMap(x.CachedDependencies), + LegacyDownloadUser: x.LegacyDownloadUser, + TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, + VolumeMounts: VolumeMountProtoMap(x.VolumeMounts), + Network: x.Network.ToProto(), + StartTimeoutMs: x.StartTimeoutMs, + CertificateProperties: x.CertificateProperties.ToProto(), + ImageUsername: x.ImageUsername, + ImagePassword: x.ImagePassword, + CheckDefinition: x.CheckDefinition.ToProto(), + ImageLayers: ImageLayerProtoMap(x.ImageLayers), + MetricTags: x.MetricTags, + Sidecars: SidecarProtoMap(x.Sidecars), + LogRateLimit: x.LogRateLimit.ToProto(), + } + return proto +} + +func DesiredLRPRunInfoProtoMap(values []*DesiredLRPRunInfo) []*ProtoDesiredLRPRunInfo { + result := make([]*ProtoDesiredLRPRunInfo, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPUpdate directly +type DesiredLRPUpdate struct { + Instances int32 + Routes *Routes + Annotation string + MetricTags map[string]*ProtoMetricTagValue +} + +func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { + proto := &ProtoDesiredLRPUpdate{ + Instances: &x.Instances, + Routes: x.Routes.ToProto(), + Annotation: &x.Annotation, + MetricTags: x.MetricTags, + } + return proto +} + +func DesiredLRPUpdateProtoMap(values []*DesiredLRPUpdate) []*ProtoDesiredLRPUpdate { + result := make([]*ProtoDesiredLRPUpdate, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPKey directly +type DesiredLRPKey struct { + ProcessGuid string + Domain string + LogGuid string +} + +func (x *DesiredLRPKey) ToProto() *ProtoDesiredLRPKey { + proto := &ProtoDesiredLRPKey{ + ProcessGuid: x.ProcessGuid, + Domain: x.Domain, + LogGuid: x.LogGuid, + } + return proto +} + +func DesiredLRPKeyProtoMap(values []*DesiredLRPKey) []*ProtoDesiredLRPKey { + result := make([]*ProtoDesiredLRPKey, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPResource directly +type DesiredLRPResource struct { + MemoryMb int32 + DiskMb int32 + RootFs string + MaxPids int32 +} + +func (x *DesiredLRPResource) ToProto() *ProtoDesiredLRPResource { + proto := &ProtoDesiredLRPResource{ + MemoryMb: x.MemoryMb, + DiskMb: x.DiskMb, + RootFs: x.RootFs, + MaxPids: x.MaxPids, + } + return proto +} + +func DesiredLRPResourceProtoMap(values []*DesiredLRPResource) []*ProtoDesiredLRPResource { + result := make([]*ProtoDesiredLRPResource, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRP directly +type DesiredLRP struct { + ProcessGuid string + Domain string + RootFs string + Instances int32 + EnvironmentVariables []*EnvironmentVariable + Setup *Action + Action *Action + StartTimeoutMs int64 + DeprecatedStartTimeoutS uint32 + Monitor *Action + DiskMb int32 + MemoryMb int32 + CpuWeight uint32 + Privileged bool + Ports []uint32 + Routes *Routes + LogSource string + LogGuid string + MetricsGuid string + Annotation string + EgressRules []*SecurityGroupRule + ModificationTag *ModificationTag + CachedDependencies []*CachedDependency + LegacyDownloadUser string + TrustedSystemCertificatesPath string + VolumeMounts []*VolumeMount + Network *Network + ProtoPlacementTags []string + MaxPids int32 + CertificateProperties *CertificateProperties + ImageUsername string + ImagePassword string + CheckDefinition *CheckDefinition + ImageLayers []*ImageLayer + MetricTags map[string]*ProtoMetricTagValue + Sidecars []*Sidecar + LogRateLimit *LogRateLimit +} + +func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { + proto := &ProtoDesiredLRP{ + ProcessGuid: x.ProcessGuid, + Domain: x.Domain, + RootFs: x.RootFs, + Instances: x.Instances, + EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), + Setup: x.Setup.ToProto(), + Action: x.Action.ToProto(), + StartTimeoutMs: x.StartTimeoutMs, + DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, + Monitor: x.Monitor.ToProto(), + DiskMb: x.DiskMb, + MemoryMb: x.MemoryMb, + CpuWeight: x.CpuWeight, + Privileged: x.Privileged, + Ports: x.Ports, + Routes: x.Routes.ToProto(), + LogSource: x.LogSource, + LogGuid: x.LogGuid, + MetricsGuid: x.MetricsGuid, + Annotation: x.Annotation, + EgressRules: SecurityGroupRuleProtoMap(x.EgressRules), + ModificationTag: x.ModificationTag.ToProto(), + CachedDependencies: CachedDependencyProtoMap(x.CachedDependencies), + LegacyDownloadUser: x.LegacyDownloadUser, + TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, + VolumeMounts: VolumeMountProtoMap(x.VolumeMounts), + Network: x.Network.ToProto(), + ProtoPlacementTags: x.ProtoPlacementTags, + MaxPids: x.MaxPids, + CertificateProperties: x.CertificateProperties.ToProto(), + ImageUsername: x.ImageUsername, + ImagePassword: x.ImagePassword, + CheckDefinition: x.CheckDefinition.ToProto(), + ImageLayers: ImageLayerProtoMap(x.ImageLayers), + MetricTags: x.MetricTags, + Sidecars: SidecarProtoMap(x.Sidecars), + LogRateLimit: x.LogRateLimit.ToProto(), + } + return proto +} + +func DesiredLRPProtoMap(values []*DesiredLRP) []*ProtoDesiredLRP { + result := make([]*ProtoDesiredLRP, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go new file mode 100644 index 00000000..6337d71b --- /dev/null +++ b/models/desired_lrp_requests.pb.go @@ -0,0 +1,821 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: desired_lrp_requests.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoDesiredLRPLifecycleResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` +} + +func (x *ProtoDesiredLRPLifecycleResponse) Reset() { + *x = ProtoDesiredLRPLifecycleResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPLifecycleResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPLifecycleResponse) ProtoMessage() {} + +func (x *ProtoDesiredLRPLifecycleResponse) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPLifecycleResponse.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPLifecycleResponse) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoDesiredLRPLifecycleResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +type ProtoDesiredLRPsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + DesiredLrps []*ProtoDesiredLRP `protobuf:"bytes,2,rep,name=desired_lrps,json=desiredLrps,proto3" json:"desired_lrps,omitempty"` +} + +func (x *ProtoDesiredLRPsResponse) Reset() { + *x = ProtoDesiredLRPsResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPsResponse) ProtoMessage() {} + +func (x *ProtoDesiredLRPsResponse) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPsResponse.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPsResponse) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoDesiredLRPsResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoDesiredLRPsResponse) GetDesiredLrps() []*ProtoDesiredLRP { + if x != nil { + return x.DesiredLrps + } + return nil +} + +type ProtoDesiredLRPsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + ProcessGuids []string `protobuf:"bytes,2,rep,name=process_guids,json=processGuids,proto3" json:"process_guids,omitempty"` +} + +func (x *ProtoDesiredLRPsRequest) Reset() { + *x = ProtoDesiredLRPsRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPsRequest) ProtoMessage() {} + +func (x *ProtoDesiredLRPsRequest) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPsRequest.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPsRequest) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoDesiredLRPsRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoDesiredLRPsRequest) GetProcessGuids() []string { + if x != nil { + return x.ProcessGuids + } + return nil +} + +type ProtoDesiredLRPResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` +} + +func (x *ProtoDesiredLRPResponse) Reset() { + *x = ProtoDesiredLRPResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPResponse) ProtoMessage() {} + +func (x *ProtoDesiredLRPResponse) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPResponse.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPResponse) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoDesiredLRPResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoDesiredLRPResponse) GetDesiredLrp() *ProtoDesiredLRP { + if x != nil { + return x.DesiredLrp + } + return nil +} + +type ProtoDesiredLRPSchedulingInfosResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + DesiredLrpSchedulingInfos []*ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,rep,name=desired_lrp_scheduling_infos,json=desiredLrpSchedulingInfos,proto3" json:"desired_lrp_scheduling_infos,omitempty"` +} + +func (x *ProtoDesiredLRPSchedulingInfosResponse) Reset() { + *x = ProtoDesiredLRPSchedulingInfosResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPSchedulingInfosResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPSchedulingInfosResponse) ProtoMessage() {} + +func (x *ProtoDesiredLRPSchedulingInfosResponse) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPSchedulingInfosResponse.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPSchedulingInfosResponse) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoDesiredLRPSchedulingInfosResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoDesiredLRPSchedulingInfosResponse) GetDesiredLrpSchedulingInfos() []*ProtoDesiredLRPSchedulingInfo { + if x != nil { + return x.DesiredLrpSchedulingInfos + } + return nil +} + +type ProtoDesiredLRPSchedulingInfoByProcessGuidResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + DesiredLrpSchedulingInfo *ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,opt,name=desired_lrp_scheduling_info,json=desiredLrpSchedulingInfo,proto3" json:"desired_lrp_scheduling_info,omitempty"` +} + +func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) Reset() { + *x = ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) ProtoMessage() {} + +func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPSchedulingInfoByProcessGuidResponse.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLrpSchedulingInfo() *ProtoDesiredLRPSchedulingInfo { + if x != nil { + return x.DesiredLrpSchedulingInfo + } + return nil +} + +type ProtoDesiredLRPByProcessGuidRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` +} + +func (x *ProtoDesiredLRPByProcessGuidRequest) Reset() { + *x = ProtoDesiredLRPByProcessGuidRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPByProcessGuidRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPByProcessGuidRequest) ProtoMessage() {} + +func (x *ProtoDesiredLRPByProcessGuidRequest) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPByProcessGuidRequest.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPByProcessGuidRequest) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoDesiredLRPByProcessGuidRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +type ProtoDesireLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` +} + +func (x *ProtoDesireLRPRequest) Reset() { + *x = ProtoDesireLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesireLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesireLRPRequest) ProtoMessage() {} + +func (x *ProtoDesireLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesireLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoDesireLRPRequest) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{7} +} + +func (x *ProtoDesireLRPRequest) GetDesiredLrp() *ProtoDesiredLRP { + if x != nil { + return x.DesiredLrp + } + return nil +} + +type ProtoUpdateDesiredLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Update *ProtoDesiredLRPUpdate `protobuf:"bytes,2,opt,name=update,proto3" json:"update,omitempty"` +} + +func (x *ProtoUpdateDesiredLRPRequest) Reset() { + *x = ProtoUpdateDesiredLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoUpdateDesiredLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoUpdateDesiredLRPRequest) ProtoMessage() {} + +func (x *ProtoUpdateDesiredLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[8] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoUpdateDesiredLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoUpdateDesiredLRPRequest) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{8} +} + +func (x *ProtoUpdateDesiredLRPRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +func (x *ProtoUpdateDesiredLRPRequest) GetUpdate() *ProtoDesiredLRPUpdate { + if x != nil { + return x.Update + } + return nil +} + +type ProtoRemoveDesiredLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` +} + +func (x *ProtoRemoveDesiredLRPRequest) Reset() { + *x = ProtoRemoveDesiredLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_desired_lrp_requests_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRemoveDesiredLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRemoveDesiredLRPRequest) ProtoMessage() {} + +func (x *ProtoRemoveDesiredLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_desired_lrp_requests_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRemoveDesiredLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoRemoveDesiredLRPRequest) Descriptor() ([]byte, []int) { + return file_desired_lrp_requests_proto_rawDescGZIP(), []int{9} +} + +func (x *ProtoRemoveDesiredLRPRequest) GetProcessGuid() string { + if x != nil { + return x.ProcessGuid + } + return "" +} + +var File_desired_lrp_requests_proto protoreflect.FileDescriptor + +var file_desired_lrp_requests_proto_rawDesc = []byte{ + 0x0a, 0x1a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, + 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4c, 0x0a, 0x20, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x22, 0x80, 0x01, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x3a, 0x0a, 0x0c, 0x64, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x4c, 0x72, 0x70, 0x73, 0x22, 0x56, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x73, 0x22, 0x7d, 0x0a, + 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, + 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x22, 0xba, 0x01, 0x0a, + 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x12, 0x66, 0x0a, 0x1c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x19, + 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, + 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x22, 0xc4, 0x01, 0x0a, 0x32, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, + 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x50, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, + 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x64, 0x0a, 0x1b, 0x64, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, + 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x25, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, + 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x18, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x72, 0x70, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, + 0x22, 0x49, 0x0a, 0x23, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, + 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x22, 0x79, + 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, + 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, + 0x69, 0x64, 0x12, 0x35, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x42, 0x0a, 0x1c, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, + 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, + 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_desired_lrp_requests_proto_rawDescOnce sync.Once + file_desired_lrp_requests_proto_rawDescData = file_desired_lrp_requests_proto_rawDesc +) + +func file_desired_lrp_requests_proto_rawDescGZIP() []byte { + file_desired_lrp_requests_proto_rawDescOnce.Do(func() { + file_desired_lrp_requests_proto_rawDescData = protoimpl.X.CompressGZIP(file_desired_lrp_requests_proto_rawDescData) + }) + return file_desired_lrp_requests_proto_rawDescData +} + +var file_desired_lrp_requests_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_desired_lrp_requests_proto_goTypes = []interface{}{ + (*ProtoDesiredLRPLifecycleResponse)(nil), // 0: models.ProtoDesiredLRPLifecycleResponse + (*ProtoDesiredLRPsResponse)(nil), // 1: models.ProtoDesiredLRPsResponse + (*ProtoDesiredLRPsRequest)(nil), // 2: models.ProtoDesiredLRPsRequest + (*ProtoDesiredLRPResponse)(nil), // 3: models.ProtoDesiredLRPResponse + (*ProtoDesiredLRPSchedulingInfosResponse)(nil), // 4: models.ProtoDesiredLRPSchedulingInfosResponse + (*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse)(nil), // 5: models.ProtoDesiredLRPSchedulingInfoByProcessGuidResponse + (*ProtoDesiredLRPByProcessGuidRequest)(nil), // 6: models.ProtoDesiredLRPByProcessGuidRequest + (*ProtoDesireLRPRequest)(nil), // 7: models.ProtoDesireLRPRequest + (*ProtoUpdateDesiredLRPRequest)(nil), // 8: models.ProtoUpdateDesiredLRPRequest + (*ProtoRemoveDesiredLRPRequest)(nil), // 9: models.ProtoRemoveDesiredLRPRequest + (*ProtoError)(nil), // 10: models.ProtoError + (*ProtoDesiredLRP)(nil), // 11: models.ProtoDesiredLRP + (*ProtoDesiredLRPSchedulingInfo)(nil), // 12: models.ProtoDesiredLRPSchedulingInfo + (*ProtoDesiredLRPUpdate)(nil), // 13: models.ProtoDesiredLRPUpdate +} +var file_desired_lrp_requests_proto_depIdxs = []int32{ + 10, // 0: models.ProtoDesiredLRPLifecycleResponse.error:type_name -> models.ProtoError + 10, // 1: models.ProtoDesiredLRPsResponse.error:type_name -> models.ProtoError + 11, // 2: models.ProtoDesiredLRPsResponse.desired_lrps:type_name -> models.ProtoDesiredLRP + 10, // 3: models.ProtoDesiredLRPResponse.error:type_name -> models.ProtoError + 11, // 4: models.ProtoDesiredLRPResponse.desired_lrp:type_name -> models.ProtoDesiredLRP + 10, // 5: models.ProtoDesiredLRPSchedulingInfosResponse.error:type_name -> models.ProtoError + 12, // 6: models.ProtoDesiredLRPSchedulingInfosResponse.desired_lrp_scheduling_infos:type_name -> models.ProtoDesiredLRPSchedulingInfo + 10, // 7: models.ProtoDesiredLRPSchedulingInfoByProcessGuidResponse.error:type_name -> models.ProtoError + 12, // 8: models.ProtoDesiredLRPSchedulingInfoByProcessGuidResponse.desired_lrp_scheduling_info:type_name -> models.ProtoDesiredLRPSchedulingInfo + 11, // 9: models.ProtoDesireLRPRequest.desired_lrp:type_name -> models.ProtoDesiredLRP + 13, // 10: models.ProtoUpdateDesiredLRPRequest.update:type_name -> models.ProtoDesiredLRPUpdate + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name +} + +func init() { file_desired_lrp_requests_proto_init() } +func file_desired_lrp_requests_proto_init() { + if File_desired_lrp_requests_proto != nil { + return + } + file_desired_lrp_proto_init() + file_error_proto_init() + if !protoimpl.UnsafeEnabled { + file_desired_lrp_requests_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPLifecycleResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPsRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPSchedulingInfosResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPByProcessGuidRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesireLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoUpdateDesiredLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_desired_lrp_requests_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRemoveDesiredLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_desired_lrp_requests_proto_rawDesc, + NumEnums: 0, + NumMessages: 10, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_desired_lrp_requests_proto_goTypes, + DependencyIndexes: file_desired_lrp_requests_proto_depIdxs, + MessageInfos: file_desired_lrp_requests_proto_msgTypes, + }.Build() + File_desired_lrp_requests_proto = out.File + file_desired_lrp_requests_proto_rawDesc = nil + file_desired_lrp_requests_proto_goTypes = nil + file_desired_lrp_requests_proto_depIdxs = nil +} diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go new file mode 100644 index 00000000..482e0b41 --- /dev/null +++ b/models/desired_lrp_requests_bbs.pb.go @@ -0,0 +1,219 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: desired_lrp_requests.proto + +package models + +// Prevent copylock errors when using ProtoDesiredLRPLifecycleResponse directly +type DesiredLRPLifecycleResponse struct { + Error *Error +} + +func (x *DesiredLRPLifecycleResponse) ToProto() *ProtoDesiredLRPLifecycleResponse { + proto := &ProtoDesiredLRPLifecycleResponse{ + Error: x.Error.ToProto(), + } + return proto +} + +func DesiredLRPLifecycleResponseProtoMap(values []*DesiredLRPLifecycleResponse) []*ProtoDesiredLRPLifecycleResponse { + result := make([]*ProtoDesiredLRPLifecycleResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPsResponse directly +type DesiredLRPsResponse struct { + Error *Error + DesiredLrps []*DesiredLRP +} + +func (x *DesiredLRPsResponse) ToProto() *ProtoDesiredLRPsResponse { + proto := &ProtoDesiredLRPsResponse{ + Error: x.Error.ToProto(), + DesiredLrps: DesiredLRPProtoMap(x.DesiredLrps), + } + return proto +} + +func DesiredLRPsResponseProtoMap(values []*DesiredLRPsResponse) []*ProtoDesiredLRPsResponse { + result := make([]*ProtoDesiredLRPsResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPsRequest directly +type DesiredLRPsRequest struct { + Domain string + ProcessGuids []string +} + +func (x *DesiredLRPsRequest) ToProto() *ProtoDesiredLRPsRequest { + proto := &ProtoDesiredLRPsRequest{ + Domain: x.Domain, + ProcessGuids: x.ProcessGuids, + } + return proto +} + +func DesiredLRPsRequestProtoMap(values []*DesiredLRPsRequest) []*ProtoDesiredLRPsRequest { + result := make([]*ProtoDesiredLRPsRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPResponse directly +type DesiredLRPResponse struct { + Error *Error + DesiredLrp *DesiredLRP +} + +func (x *DesiredLRPResponse) ToProto() *ProtoDesiredLRPResponse { + proto := &ProtoDesiredLRPResponse{ + Error: x.Error.ToProto(), + DesiredLrp: x.DesiredLrp.ToProto(), + } + return proto +} + +func DesiredLRPResponseProtoMap(values []*DesiredLRPResponse) []*ProtoDesiredLRPResponse { + result := make([]*ProtoDesiredLRPResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPSchedulingInfosResponse directly +type DesiredLRPSchedulingInfosResponse struct { + Error *Error + DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo +} + +func (x *DesiredLRPSchedulingInfosResponse) ToProto() *ProtoDesiredLRPSchedulingInfosResponse { + proto := &ProtoDesiredLRPSchedulingInfosResponse{ + Error: x.Error.ToProto(), + DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoProtoMap(x.DesiredLrpSchedulingInfos), + } + return proto +} + +func DesiredLRPSchedulingInfosResponseProtoMap(values []*DesiredLRPSchedulingInfosResponse) []*ProtoDesiredLRPSchedulingInfosResponse { + result := make([]*ProtoDesiredLRPSchedulingInfosResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPSchedulingInfoByProcessGuidResponse directly +type DesiredLRPSchedulingInfoByProcessGuidResponse struct { + Error *Error + DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo +} + +func (x *DesiredLRPSchedulingInfoByProcessGuidResponse) ToProto() *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { + proto := &ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{ + Error: x.Error.ToProto(), + DesiredLrpSchedulingInfo: x.DesiredLrpSchedulingInfo.ToProto(), + } + return proto +} + +func DesiredLRPSchedulingInfoByProcessGuidResponseProtoMap(values []*DesiredLRPSchedulingInfoByProcessGuidResponse) []*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { + result := make([]*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPByProcessGuidRequest directly +type DesiredLRPByProcessGuidRequest struct { + ProcessGuid string +} + +func (x *DesiredLRPByProcessGuidRequest) ToProto() *ProtoDesiredLRPByProcessGuidRequest { + proto := &ProtoDesiredLRPByProcessGuidRequest{ + ProcessGuid: x.ProcessGuid, + } + return proto +} + +func DesiredLRPByProcessGuidRequestProtoMap(values []*DesiredLRPByProcessGuidRequest) []*ProtoDesiredLRPByProcessGuidRequest { + result := make([]*ProtoDesiredLRPByProcessGuidRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesireLRPRequest directly +type DesireLRPRequest struct { + DesiredLrp *DesiredLRP +} + +func (x *DesireLRPRequest) ToProto() *ProtoDesireLRPRequest { + proto := &ProtoDesireLRPRequest{ + DesiredLrp: x.DesiredLrp.ToProto(), + } + return proto +} + +func DesireLRPRequestProtoMap(values []*DesireLRPRequest) []*ProtoDesireLRPRequest { + result := make([]*ProtoDesireLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoUpdateDesiredLRPRequest directly +type UpdateDesiredLRPRequest struct { + ProcessGuid string + Update *DesiredLRPUpdate +} + +func (x *UpdateDesiredLRPRequest) ToProto() *ProtoUpdateDesiredLRPRequest { + proto := &ProtoUpdateDesiredLRPRequest{ + ProcessGuid: x.ProcessGuid, + Update: x.Update.ToProto(), + } + return proto +} + +func UpdateDesiredLRPRequestProtoMap(values []*UpdateDesiredLRPRequest) []*ProtoUpdateDesiredLRPRequest { + result := make([]*ProtoUpdateDesiredLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoRemoveDesiredLRPRequest directly +type RemoveDesiredLRPRequest struct { + ProcessGuid string +} + +func (x *RemoveDesiredLRPRequest) ToProto() *ProtoRemoveDesiredLRPRequest { + proto := &ProtoRemoveDesiredLRPRequest{ + ProcessGuid: x.ProcessGuid, + } + return proto +} + +func RemoveDesiredLRPRequestProtoMap(values []*RemoveDesiredLRPRequest) []*ProtoRemoveDesiredLRPRequest { + result := make([]*ProtoRemoveDesiredLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/domain.pb.go b/models/domain.pb.go new file mode 100644 index 00000000..1b64d33f --- /dev/null +++ b/models/domain.pb.go @@ -0,0 +1,296 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: domain.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoDomainsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"` +} + +func (x *ProtoDomainsResponse) Reset() { + *x = ProtoDomainsResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_domain_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDomainsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDomainsResponse) ProtoMessage() {} + +func (x *ProtoDomainsResponse) ProtoReflect() protoreflect.Message { + mi := &file_domain_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDomainsResponse.ProtoReflect.Descriptor instead. +func (*ProtoDomainsResponse) Descriptor() ([]byte, []int) { + return file_domain_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoDomainsResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoDomainsResponse) GetDomains() []string { + if x != nil { + return x.Domains + } + return nil +} + +type ProtoUpsertDomainResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` +} + +func (x *ProtoUpsertDomainResponse) Reset() { + *x = ProtoUpsertDomainResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_domain_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoUpsertDomainResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoUpsertDomainResponse) ProtoMessage() {} + +func (x *ProtoUpsertDomainResponse) ProtoReflect() protoreflect.Message { + mi := &file_domain_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoUpsertDomainResponse.ProtoReflect.Descriptor instead. +func (*ProtoUpsertDomainResponse) Descriptor() ([]byte, []int) { + return file_domain_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoUpsertDomainResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +type ProtoUpsertDomainRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + Ttl uint32 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` +} + +func (x *ProtoUpsertDomainRequest) Reset() { + *x = ProtoUpsertDomainRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_domain_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoUpsertDomainRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoUpsertDomainRequest) ProtoMessage() {} + +func (x *ProtoUpsertDomainRequest) ProtoReflect() protoreflect.Message { + mi := &file_domain_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoUpsertDomainRequest.ProtoReflect.Descriptor instead. +func (*ProtoUpsertDomainRequest) Descriptor() ([]byte, []int) { + return file_domain_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoUpsertDomainRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoUpsertDomainRequest) GetTtl() uint32 { + if x != nil { + return x.Ttl + } + return 0 +} + +var File_domain_proto protoreflect.FileDescriptor + +var file_domain_proto_rawDesc = []byte{ + 0x0a, 0x0c, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x22, 0x5a, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x22, + 0x45, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x44, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, + 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x44, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, + 0x70, 0x73, 0x65, 0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, + 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x42, 0x22, 0x5a, 0x20, + 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, + 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_domain_proto_rawDescOnce sync.Once + file_domain_proto_rawDescData = file_domain_proto_rawDesc +) + +func file_domain_proto_rawDescGZIP() []byte { + file_domain_proto_rawDescOnce.Do(func() { + file_domain_proto_rawDescData = protoimpl.X.CompressGZIP(file_domain_proto_rawDescData) + }) + return file_domain_proto_rawDescData +} + +var file_domain_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_domain_proto_goTypes = []interface{}{ + (*ProtoDomainsResponse)(nil), // 0: models.ProtoDomainsResponse + (*ProtoUpsertDomainResponse)(nil), // 1: models.ProtoUpsertDomainResponse + (*ProtoUpsertDomainRequest)(nil), // 2: models.ProtoUpsertDomainRequest + (*ProtoError)(nil), // 3: models.ProtoError +} +var file_domain_proto_depIdxs = []int32{ + 3, // 0: models.ProtoDomainsResponse.error:type_name -> models.ProtoError + 3, // 1: models.ProtoUpsertDomainResponse.error:type_name -> models.ProtoError + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_domain_proto_init() } +func file_domain_proto_init() { + if File_domain_proto != nil { + return + } + file_error_proto_init() + if !protoimpl.UnsafeEnabled { + file_domain_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDomainsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_domain_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoUpsertDomainResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_domain_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoUpsertDomainRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_domain_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_domain_proto_goTypes, + DependencyIndexes: file_domain_proto_depIdxs, + MessageInfos: file_domain_proto_msgTypes, + }.Build() + File_domain_proto = out.File + file_domain_proto_rawDesc = nil + file_domain_proto_goTypes = nil + file_domain_proto_depIdxs = nil +} diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go new file mode 100644 index 00000000..9cc77b35 --- /dev/null +++ b/models/domain_bbs.pb.go @@ -0,0 +1,71 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: domain.proto + +package models + +// Prevent copylock errors when using ProtoDomainsResponse directly +type DomainsResponse struct { + Error *Error + Domains []string +} + +func (x *DomainsResponse) ToProto() *ProtoDomainsResponse { + proto := &ProtoDomainsResponse{ + Error: x.Error.ToProto(), + Domains: x.Domains, + } + return proto +} + +func DomainsResponseProtoMap(values []*DomainsResponse) []*ProtoDomainsResponse { + result := make([]*ProtoDomainsResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoUpsertDomainResponse directly +type UpsertDomainResponse struct { + Error *Error +} + +func (x *UpsertDomainResponse) ToProto() *ProtoUpsertDomainResponse { + proto := &ProtoUpsertDomainResponse{ + Error: x.Error.ToProto(), + } + return proto +} + +func UpsertDomainResponseProtoMap(values []*UpsertDomainResponse) []*ProtoUpsertDomainResponse { + result := make([]*ProtoUpsertDomainResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoUpsertDomainRequest directly +type UpsertDomainRequest struct { + Domain string + Ttl uint32 +} + +func (x *UpsertDomainRequest) ToProto() *ProtoUpsertDomainRequest { + proto := &ProtoUpsertDomainRequest{ + Domain: x.Domain, + Ttl: x.Ttl, + } + return proto +} + +func UpsertDomainRequestProtoMap(values []*UpsertDomainRequest) []*ProtoUpsertDomainRequest { + result := make([]*ProtoUpsertDomainRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go new file mode 100644 index 00000000..14cfe5bd --- /dev/null +++ b/models/environment_variables.pb.go @@ -0,0 +1,154 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: environment_variables.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoEnvironmentVariable struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` +} + +func (x *ProtoEnvironmentVariable) Reset() { + *x = ProtoEnvironmentVariable{} + if protoimpl.UnsafeEnabled { + mi := &file_environment_variables_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEnvironmentVariable) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEnvironmentVariable) ProtoMessage() {} + +func (x *ProtoEnvironmentVariable) ProtoReflect() protoreflect.Message { + mi := &file_environment_variables_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEnvironmentVariable.ProtoReflect.Descriptor instead. +func (*ProtoEnvironmentVariable) Descriptor() ([]byte, []int) { + return file_environment_variables_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoEnvironmentVariable) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ProtoEnvironmentVariable) GetValue() string { + if x != nil { + return x.Value + } + return "" +} + +var File_environment_variables_proto protoreflect.FileDescriptor + +var file_environment_variables_proto_rawDesc = []byte{ + 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, + 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x44, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, + 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, + 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_environment_variables_proto_rawDescOnce sync.Once + file_environment_variables_proto_rawDescData = file_environment_variables_proto_rawDesc +) + +func file_environment_variables_proto_rawDescGZIP() []byte { + file_environment_variables_proto_rawDescOnce.Do(func() { + file_environment_variables_proto_rawDescData = protoimpl.X.CompressGZIP(file_environment_variables_proto_rawDescData) + }) + return file_environment_variables_proto_rawDescData +} + +var file_environment_variables_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_environment_variables_proto_goTypes = []interface{}{ + (*ProtoEnvironmentVariable)(nil), // 0: models.ProtoEnvironmentVariable +} +var file_environment_variables_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_environment_variables_proto_init() } +func file_environment_variables_proto_init() { + if File_environment_variables_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_environment_variables_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEnvironmentVariable); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_environment_variables_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_environment_variables_proto_goTypes, + DependencyIndexes: file_environment_variables_proto_depIdxs, + MessageInfos: file_environment_variables_proto_msgTypes, + }.Build() + File_environment_variables_proto = out.File + file_environment_variables_proto_rawDesc = nil + file_environment_variables_proto_goTypes = nil + file_environment_variables_proto_depIdxs = nil +} diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go new file mode 100644 index 00000000..b322b06d --- /dev/null +++ b/models/environment_variables_bbs.pb.go @@ -0,0 +1,29 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: environment_variables.proto + +package models + +// Prevent copylock errors when using ProtoEnvironmentVariable directly +type EnvironmentVariable struct { + Name string + Value string +} + +func (x *EnvironmentVariable) ToProto() *ProtoEnvironmentVariable { + proto := &ProtoEnvironmentVariable{ + Name: x.Name, + Value: x.Value, + } + return proto +} + +func EnvironmentVariableProtoMap(values []*EnvironmentVariable) []*ProtoEnvironmentVariable { + result := make([]*ProtoEnvironmentVariable, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/error.pb.go b/models/error.pb.go new file mode 100644 index 00000000..cd0742ce --- /dev/null +++ b/models/error.pb.go @@ -0,0 +1,312 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: error.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoError_Type int32 + +const ( + ProtoError_UnknownError ProtoError_Type = 0 + ProtoError_InvalidRecord ProtoError_Type = 3 + ProtoError_InvalidRequest ProtoError_Type = 4 + ProtoError_InvalidResponse ProtoError_Type = 5 + ProtoError_InvalidProtobufMessage ProtoError_Type = 6 + ProtoError_InvalidJSON ProtoError_Type = 7 + ProtoError_FailedToOpenEnvelope ProtoError_Type = 8 + ProtoError_InvalidStateTransition ProtoError_Type = 9 + ProtoError_ResourceConflict ProtoError_Type = 11 + ProtoError_ResourceExists ProtoError_Type = 12 + ProtoError_ResourceNotFound ProtoError_Type = 13 + ProtoError_RouterError ProtoError_Type = 14 + ProtoError_ActualLRPCannotBeClaimed ProtoError_Type = 15 + ProtoError_ActualLRPCannotBeStarted ProtoError_Type = 16 + ProtoError_ActualLRPCannotBeCrashed ProtoError_Type = 17 + ProtoError_ActualLRPCannotBeFailed ProtoError_Type = 18 + ProtoError_ActualLRPCannotBeRemoved ProtoError_Type = 19 + ProtoError_ActualLRPCannotBeUnclaimed ProtoError_Type = 21 + ProtoError_RunningOnDifferentCell ProtoError_Type = 24 + ProtoError_GUIDGeneration ProtoError_Type = 26 + ProtoError_Deserialize ProtoError_Type = 27 + ProtoError_Deadlock ProtoError_Type = 28 + ProtoError_Unrecoverable ProtoError_Type = 29 + ProtoError_LockCollision ProtoError_Type = 30 + ProtoError_Timeout ProtoError_Type = 31 +) + +// Enum value maps for ProtoError_Type. +var ( + ProtoError_Type_name = map[int32]string{ + 0: "UnknownError", + 3: "InvalidRecord", + 4: "InvalidRequest", + 5: "InvalidResponse", + 6: "InvalidProtobufMessage", + 7: "InvalidJSON", + 8: "FailedToOpenEnvelope", + 9: "InvalidStateTransition", + 11: "ResourceConflict", + 12: "ResourceExists", + 13: "ResourceNotFound", + 14: "RouterError", + 15: "ActualLRPCannotBeClaimed", + 16: "ActualLRPCannotBeStarted", + 17: "ActualLRPCannotBeCrashed", + 18: "ActualLRPCannotBeFailed", + 19: "ActualLRPCannotBeRemoved", + 21: "ActualLRPCannotBeUnclaimed", + 24: "RunningOnDifferentCell", + 26: "GUIDGeneration", + 27: "Deserialize", + 28: "Deadlock", + 29: "Unrecoverable", + 30: "LockCollision", + 31: "Timeout", + } + ProtoError_Type_value = map[string]int32{ + "UnknownError": 0, + "InvalidRecord": 3, + "InvalidRequest": 4, + "InvalidResponse": 5, + "InvalidProtobufMessage": 6, + "InvalidJSON": 7, + "FailedToOpenEnvelope": 8, + "InvalidStateTransition": 9, + "ResourceConflict": 11, + "ResourceExists": 12, + "ResourceNotFound": 13, + "RouterError": 14, + "ActualLRPCannotBeClaimed": 15, + "ActualLRPCannotBeStarted": 16, + "ActualLRPCannotBeCrashed": 17, + "ActualLRPCannotBeFailed": 18, + "ActualLRPCannotBeRemoved": 19, + "ActualLRPCannotBeUnclaimed": 21, + "RunningOnDifferentCell": 24, + "GUIDGeneration": 26, + "Deserialize": 27, + "Deadlock": 28, + "Unrecoverable": 29, + "LockCollision": 30, + "Timeout": 31, + } +) + +func (x ProtoError_Type) Enum() *ProtoError_Type { + p := new(ProtoError_Type) + *p = x + return p +} + +func (x ProtoError_Type) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoError_Type) Descriptor() protoreflect.EnumDescriptor { + return file_error_proto_enumTypes[0].Descriptor() +} + +func (ProtoError_Type) Type() protoreflect.EnumType { + return &file_error_proto_enumTypes[0] +} + +func (x ProtoError_Type) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoError_Type.Descriptor instead. +func (ProtoError_Type) EnumDescriptor() ([]byte, []int) { + return file_error_proto_rawDescGZIP(), []int{0, 0} +} + +type ProtoError struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Type ProtoError_Type `protobuf:"varint,1,opt,name=type,proto3,enum=models.ProtoError_Type" json:"type,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` +} + +func (x *ProtoError) Reset() { + *x = ProtoError{} + if protoimpl.UnsafeEnabled { + mi := &file_error_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoError) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoError) ProtoMessage() {} + +func (x *ProtoError) ProtoReflect() protoreflect.Message { + mi := &file_error_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoError.ProtoReflect.Descriptor instead. +func (*ProtoError) Descriptor() ([]byte, []int) { + return file_error_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoError) GetType() ProtoError_Type { + if x != nil { + return x.Type + } + return ProtoError_UnknownError +} + +func (x *ProtoError) GetMessage() string { + if x != nil { + return x.Message + } + return "" +} + +var File_error_proto protoreflect.FileDescriptor + +var file_error_proto_rawDesc = []byte{ + 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0xbf, 0x05, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xe9, 0x04, 0x0a, 0x04, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, + 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x04, 0x12, 0x13, 0x0a, + 0x0f, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x10, 0x05, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x10, 0x06, 0x12, 0x0f, + 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x07, 0x12, + 0x18, 0x0a, 0x14, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x54, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x45, + 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x10, 0x08, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x10, 0x09, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x10, 0x0b, 0x12, 0x12, 0x0a, 0x0e, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x10, 0x0c, 0x12, + 0x14, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x10, 0x0e, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, + 0x65, 0x64, 0x10, 0x0f, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, + 0x10, 0x10, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, + 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x10, 0x11, + 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, + 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x12, 0x12, 0x1c, 0x0a, + 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, + 0x42, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x10, 0x13, 0x12, 0x1e, 0x0a, 0x1a, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, + 0x55, 0x6e, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x10, 0x15, 0x12, 0x1a, 0x0a, 0x16, 0x52, + 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x4f, 0x6e, 0x44, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, + 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x10, 0x18, 0x12, 0x12, 0x0a, 0x0e, 0x47, 0x55, 0x49, 0x44, 0x47, + 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x1a, 0x12, 0x0f, 0x0a, 0x0b, 0x44, + 0x65, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x10, 0x1b, 0x12, 0x0c, 0x0a, 0x08, + 0x44, 0x65, 0x61, 0x64, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0x1c, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x6e, + 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x10, 0x1d, 0x12, 0x11, 0x0a, + 0x0d, 0x4c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x1e, + 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x10, 0x1f, 0x22, 0x04, 0x08, + 0x01, 0x10, 0x01, 0x22, 0x04, 0x08, 0x02, 0x10, 0x02, 0x22, 0x04, 0x08, 0x0a, 0x10, 0x0a, 0x22, + 0x04, 0x08, 0x14, 0x10, 0x14, 0x22, 0x04, 0x08, 0x16, 0x10, 0x16, 0x22, 0x04, 0x08, 0x17, 0x10, + 0x17, 0x22, 0x04, 0x08, 0x19, 0x10, 0x19, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, +} + +var ( + file_error_proto_rawDescOnce sync.Once + file_error_proto_rawDescData = file_error_proto_rawDesc +) + +func file_error_proto_rawDescGZIP() []byte { + file_error_proto_rawDescOnce.Do(func() { + file_error_proto_rawDescData = protoimpl.X.CompressGZIP(file_error_proto_rawDescData) + }) + return file_error_proto_rawDescData +} + +var file_error_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_error_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_error_proto_goTypes = []interface{}{ + (ProtoError_Type)(0), // 0: models.ProtoError.Type + (*ProtoError)(nil), // 1: models.ProtoError +} +var file_error_proto_depIdxs = []int32{ + 0, // 0: models.ProtoError.type:type_name -> models.ProtoError.Type + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_error_proto_init() } +func file_error_proto_init() { + if File_error_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_error_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoError); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_error_proto_rawDesc, + NumEnums: 1, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_error_proto_goTypes, + DependencyIndexes: file_error_proto_depIdxs, + EnumInfos: file_error_proto_enumTypes, + MessageInfos: file_error_proto_msgTypes, + }.Build() + File_error_proto = out.File + file_error_proto_rawDesc = nil + file_error_proto_goTypes = nil + file_error_proto_depIdxs = nil +} diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go new file mode 100644 index 00000000..d4bb6648 --- /dev/null +++ b/models/error_bbs.pb.go @@ -0,0 +1,59 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: error.proto + +package models + +type Error_Type int32 + +const ( + Error_UnknownError Error_Type = 0 + Error_InvalidRecord Error_Type = 3 + Error_InvalidRequest Error_Type = 4 + Error_InvalidResponse Error_Type = 5 + Error_InvalidProtobufMessage Error_Type = 6 + Error_InvalidJSON Error_Type = 7 + Error_FailedToOpenEnvelope Error_Type = 8 + Error_InvalidStateTransition Error_Type = 9 + Error_ResourceConflict Error_Type = 11 + Error_ResourceExists Error_Type = 12 + Error_ResourceNotFound Error_Type = 13 + Error_RouterError Error_Type = 14 + Error_ActualLRPCannotBeClaimed Error_Type = 15 + Error_ActualLRPCannotBeStarted Error_Type = 16 + Error_ActualLRPCannotBeCrashed Error_Type = 17 + Error_ActualLRPCannotBeFailed Error_Type = 18 + Error_ActualLRPCannotBeRemoved Error_Type = 19 + Error_ActualLRPCannotBeUnclaimed Error_Type = 21 + Error_RunningOnDifferentCell Error_Type = 24 + Error_GUIDGeneration Error_Type = 26 + Error_Deserialize Error_Type = 27 + Error_Deadlock Error_Type = 28 + Error_Unrecoverable Error_Type = 29 + Error_LockCollision Error_Type = 30 + Error_Timeout Error_Type = 31 +) + +// Prevent copylock errors when using ProtoError directly +type Error struct { + Type Error_Type + Message string +} + +func (x *Error) ToProto() *ProtoError { + proto := &ProtoError{ + Type: ProtoError_Type(x.Type), + Message: x.Message, + } + return proto +} + +func ErrorProtoMap(values []*Error) []*ProtoError { + result := make([]*ProtoError, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go new file mode 100644 index 00000000..3ae602bd --- /dev/null +++ b/models/evacuation.pb.go @@ -0,0 +1,726 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: evacuation.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoEvacuationResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + KeepContainer bool `protobuf:"varint,2,opt,name=keep_container,proto3" json:"keep_container,omitempty"` +} + +func (x *ProtoEvacuationResponse) Reset() { + *x = ProtoEvacuationResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_evacuation_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEvacuationResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEvacuationResponse) ProtoMessage() {} + +func (x *ProtoEvacuationResponse) ProtoReflect() protoreflect.Message { + mi := &file_evacuation_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEvacuationResponse.ProtoReflect.Descriptor instead. +func (*ProtoEvacuationResponse) Descriptor() ([]byte, []int) { + return file_evacuation_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoEvacuationResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoEvacuationResponse) GetKeepContainer() bool { + if x != nil { + return x.KeepContainer + } + return false +} + +type ProtoEvacuateClaimedActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` +} + +func (x *ProtoEvacuateClaimedActualLRPRequest) Reset() { + *x = ProtoEvacuateClaimedActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_evacuation_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEvacuateClaimedActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEvacuateClaimedActualLRPRequest) ProtoMessage() {} + +func (x *ProtoEvacuateClaimedActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_evacuation_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEvacuateClaimedActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoEvacuateClaimedActualLRPRequest) Descriptor() ([]byte, []int) { + return file_evacuation_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoEvacuateClaimedActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoEvacuateClaimedActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +type ProtoEvacuateRunningActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` + ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,5,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` + MetricTags map[string]string `protobuf:"bytes,6,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ProtoRoutable *bool `protobuf:"varint,7,opt,name=ProtoRoutable,proto3,oneof" json:"ProtoRoutable,omitempty"` + AvailabilityZone string `protobuf:"bytes,8,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` +} + +func (x *ProtoEvacuateRunningActualLRPRequest) Reset() { + *x = ProtoEvacuateRunningActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_evacuation_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEvacuateRunningActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEvacuateRunningActualLRPRequest) ProtoMessage() {} + +func (x *ProtoEvacuateRunningActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_evacuation_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEvacuateRunningActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoEvacuateRunningActualLRPRequest) Descriptor() ([]byte, []int) { + return file_evacuation_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoEvacuateRunningActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoEvacuateRunningActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +func (x *ProtoEvacuateRunningActualLRPRequest) GetActualLrpNetInfo() *ProtoActualLRPNetInfo { + if x != nil { + return x.ActualLrpNetInfo + } + return nil +} + +func (x *ProtoEvacuateRunningActualLRPRequest) GetActualLrpInternalRoutes() []*ProtoActualLRPInternalRoute { + if x != nil { + return x.ActualLrpInternalRoutes + } + return nil +} + +func (x *ProtoEvacuateRunningActualLRPRequest) GetMetricTags() map[string]string { + if x != nil { + return x.MetricTags + } + return nil +} + +func (x *ProtoEvacuateRunningActualLRPRequest) GetProtoRoutable() bool { + if x != nil && x.ProtoRoutable != nil { + return *x.ProtoRoutable + } + return false +} + +func (x *ProtoEvacuateRunningActualLRPRequest) GetAvailabilityZone() string { + if x != nil { + return x.AvailabilityZone + } + return "" +} + +type ProtoEvacuateStoppedActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` +} + +func (x *ProtoEvacuateStoppedActualLRPRequest) Reset() { + *x = ProtoEvacuateStoppedActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_evacuation_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEvacuateStoppedActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEvacuateStoppedActualLRPRequest) ProtoMessage() {} + +func (x *ProtoEvacuateStoppedActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_evacuation_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEvacuateStoppedActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoEvacuateStoppedActualLRPRequest) Descriptor() ([]byte, []int) { + return file_evacuation_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoEvacuateStoppedActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoEvacuateStoppedActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +type ProtoEvacuateCrashedActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,proto3" json:"error_message,omitempty"` +} + +func (x *ProtoEvacuateCrashedActualLRPRequest) Reset() { + *x = ProtoEvacuateCrashedActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_evacuation_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEvacuateCrashedActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEvacuateCrashedActualLRPRequest) ProtoMessage() {} + +func (x *ProtoEvacuateCrashedActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_evacuation_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEvacuateCrashedActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoEvacuateCrashedActualLRPRequest) Descriptor() ([]byte, []int) { + return file_evacuation_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoEvacuateCrashedActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoEvacuateCrashedActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +func (x *ProtoEvacuateCrashedActualLRPRequest) GetErrorMessage() string { + if x != nil { + return x.ErrorMessage + } + return "" +} + +type ProtoRemoveEvacuatingActualLRPRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` +} + +func (x *ProtoRemoveEvacuatingActualLRPRequest) Reset() { + *x = ProtoRemoveEvacuatingActualLRPRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_evacuation_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRemoveEvacuatingActualLRPRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRemoveEvacuatingActualLRPRequest) ProtoMessage() {} + +func (x *ProtoRemoveEvacuatingActualLRPRequest) ProtoReflect() protoreflect.Message { + mi := &file_evacuation_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRemoveEvacuatingActualLRPRequest.ProtoReflect.Descriptor instead. +func (*ProtoRemoveEvacuatingActualLRPRequest) Descriptor() ([]byte, []int) { + return file_evacuation_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoRemoveEvacuatingActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoRemoveEvacuatingActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +type ProtoRemoveEvacuatingActualLRPResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` +} + +func (x *ProtoRemoveEvacuatingActualLRPResponse) Reset() { + *x = ProtoRemoveEvacuatingActualLRPResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_evacuation_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRemoveEvacuatingActualLRPResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRemoveEvacuatingActualLRPResponse) ProtoMessage() {} + +func (x *ProtoRemoveEvacuatingActualLRPResponse) ProtoReflect() protoreflect.Message { + mi := &file_evacuation_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRemoveEvacuatingActualLRPResponse.ProtoReflect.Descriptor instead. +func (*ProtoRemoveEvacuatingActualLRPResponse) Descriptor() ([]byte, []int) { + return file_evacuation_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoRemoveEvacuatingActualLRPResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +var File_evacuation_proto protoreflect.FileDescriptor + +var file_evacuation_proto_rawDesc = []byte{ + 0x0a, 0x10, 0x65, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6b, 0x0a, 0x17, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x26, + 0x0a, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x22, 0xc1, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, + 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, + 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0x80, 0x05, 0x0a, 0x24, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, + 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, + 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x4c, + 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, + 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x60, 0x0a, 0x1a, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, + 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x5d, + 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, + 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x29, 0x0a, + 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, + 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, + 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0xc1, 0x01, + 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x53, + 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, + 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, + 0x79, 0x22, 0xe7, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, + 0x61, 0x74, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, + 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xc2, 0x01, 0x0a, 0x25, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, + 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, + 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, + 0x22, 0x52, 0x0a, 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, + 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, + 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, + 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_evacuation_proto_rawDescOnce sync.Once + file_evacuation_proto_rawDescData = file_evacuation_proto_rawDesc +) + +func file_evacuation_proto_rawDescGZIP() []byte { + file_evacuation_proto_rawDescOnce.Do(func() { + file_evacuation_proto_rawDescData = protoimpl.X.CompressGZIP(file_evacuation_proto_rawDescData) + }) + return file_evacuation_proto_rawDescData +} + +var file_evacuation_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_evacuation_proto_goTypes = []interface{}{ + (*ProtoEvacuationResponse)(nil), // 0: models.ProtoEvacuationResponse + (*ProtoEvacuateClaimedActualLRPRequest)(nil), // 1: models.ProtoEvacuateClaimedActualLRPRequest + (*ProtoEvacuateRunningActualLRPRequest)(nil), // 2: models.ProtoEvacuateRunningActualLRPRequest + (*ProtoEvacuateStoppedActualLRPRequest)(nil), // 3: models.ProtoEvacuateStoppedActualLRPRequest + (*ProtoEvacuateCrashedActualLRPRequest)(nil), // 4: models.ProtoEvacuateCrashedActualLRPRequest + (*ProtoRemoveEvacuatingActualLRPRequest)(nil), // 5: models.ProtoRemoveEvacuatingActualLRPRequest + (*ProtoRemoveEvacuatingActualLRPResponse)(nil), // 6: models.ProtoRemoveEvacuatingActualLRPResponse + nil, // 7: models.ProtoEvacuateRunningActualLRPRequest.MetricTagsEntry + (*ProtoError)(nil), // 8: models.ProtoError + (*ProtoActualLRPKey)(nil), // 9: models.ProtoActualLRPKey + (*ProtoActualLRPInstanceKey)(nil), // 10: models.ProtoActualLRPInstanceKey + (*ProtoActualLRPNetInfo)(nil), // 11: models.ProtoActualLRPNetInfo + (*ProtoActualLRPInternalRoute)(nil), // 12: models.ProtoActualLRPInternalRoute +} +var file_evacuation_proto_depIdxs = []int32{ + 8, // 0: models.ProtoEvacuationResponse.error:type_name -> models.ProtoError + 9, // 1: models.ProtoEvacuateClaimedActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 10, // 2: models.ProtoEvacuateClaimedActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 9, // 3: models.ProtoEvacuateRunningActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 10, // 4: models.ProtoEvacuateRunningActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 11, // 5: models.ProtoEvacuateRunningActualLRPRequest.actual_lrp_net_info:type_name -> models.ProtoActualLRPNetInfo + 12, // 6: models.ProtoEvacuateRunningActualLRPRequest.actual_lrp_internal_routes:type_name -> models.ProtoActualLRPInternalRoute + 7, // 7: models.ProtoEvacuateRunningActualLRPRequest.metric_tags:type_name -> models.ProtoEvacuateRunningActualLRPRequest.MetricTagsEntry + 9, // 8: models.ProtoEvacuateStoppedActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 10, // 9: models.ProtoEvacuateStoppedActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 9, // 10: models.ProtoEvacuateCrashedActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 10, // 11: models.ProtoEvacuateCrashedActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 9, // 12: models.ProtoRemoveEvacuatingActualLRPRequest.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 10, // 13: models.ProtoRemoveEvacuatingActualLRPRequest.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 8, // 14: models.ProtoRemoveEvacuatingActualLRPResponse.error:type_name -> models.ProtoError + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name +} + +func init() { file_evacuation_proto_init() } +func file_evacuation_proto_init() { + if File_evacuation_proto != nil { + return + } + file_actual_lrp_proto_init() + file_error_proto_init() + if !protoimpl.UnsafeEnabled { + file_evacuation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEvacuationResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_evacuation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEvacuateClaimedActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_evacuation_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEvacuateRunningActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_evacuation_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEvacuateStoppedActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_evacuation_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEvacuateCrashedActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_evacuation_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRemoveEvacuatingActualLRPRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_evacuation_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRemoveEvacuatingActualLRPResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_evacuation_proto_msgTypes[2].OneofWrappers = []interface{}{} + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_evacuation_proto_rawDesc, + NumEnums: 0, + NumMessages: 8, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_evacuation_proto_goTypes, + DependencyIndexes: file_evacuation_proto_depIdxs, + MessageInfos: file_evacuation_proto_msgTypes, + }.Build() + File_evacuation_proto = out.File + file_evacuation_proto_rawDesc = nil + file_evacuation_proto_goTypes = nil + file_evacuation_proto_depIdxs = nil +} diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go new file mode 100644 index 00000000..d323dd6e --- /dev/null +++ b/models/evacuation_bbs.pb.go @@ -0,0 +1,171 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: evacuation.proto + +package models + +// Prevent copylock errors when using ProtoEvacuationResponse directly +type EvacuationResponse struct { + Error *Error + KeepContainer bool +} + +func (x *EvacuationResponse) ToProto() *ProtoEvacuationResponse { + proto := &ProtoEvacuationResponse{ + Error: x.Error.ToProto(), + KeepContainer: x.KeepContainer, + } + return proto +} + +func EvacuationResponseProtoMap(values []*EvacuationResponse) []*ProtoEvacuationResponse { + result := make([]*ProtoEvacuationResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoEvacuateClaimedActualLRPRequest directly +type EvacuateClaimedActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey +} + +func (x *EvacuateClaimedActualLRPRequest) ToProto() *ProtoEvacuateClaimedActualLRPRequest { + proto := &ProtoEvacuateClaimedActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + } + return proto +} + +func EvacuateClaimedActualLRPRequestProtoMap(values []*EvacuateClaimedActualLRPRequest) []*ProtoEvacuateClaimedActualLRPRequest { + result := make([]*ProtoEvacuateClaimedActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoEvacuateRunningActualLRPRequest directly +type EvacuateRunningActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpNetInfo *ActualLRPNetInfo + ActualLrpInternalRoutes []*ActualLRPInternalRoute + MetricTags map[string]string + ProtoRoutable bool + AvailabilityZone string +} + +func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualLRPRequest { + proto := &ProtoEvacuateRunningActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + MetricTags: x.MetricTags, + ProtoRoutable: &x.ProtoRoutable, + AvailabilityZone: x.AvailabilityZone, + } + return proto +} + +func EvacuateRunningActualLRPRequestProtoMap(values []*EvacuateRunningActualLRPRequest) []*ProtoEvacuateRunningActualLRPRequest { + result := make([]*ProtoEvacuateRunningActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoEvacuateStoppedActualLRPRequest directly +type EvacuateStoppedActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey +} + +func (x *EvacuateStoppedActualLRPRequest) ToProto() *ProtoEvacuateStoppedActualLRPRequest { + proto := &ProtoEvacuateStoppedActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + } + return proto +} + +func EvacuateStoppedActualLRPRequestProtoMap(values []*EvacuateStoppedActualLRPRequest) []*ProtoEvacuateStoppedActualLRPRequest { + result := make([]*ProtoEvacuateStoppedActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoEvacuateCrashedActualLRPRequest directly +type EvacuateCrashedActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ErrorMessage string +} + +func (x *EvacuateCrashedActualLRPRequest) ToProto() *ProtoEvacuateCrashedActualLRPRequest { + proto := &ProtoEvacuateCrashedActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ErrorMessage: x.ErrorMessage, + } + return proto +} + +func EvacuateCrashedActualLRPRequestProtoMap(values []*EvacuateCrashedActualLRPRequest) []*ProtoEvacuateCrashedActualLRPRequest { + result := make([]*ProtoEvacuateCrashedActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPRequest directly +type RemoveEvacuatingActualLRPRequest struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey +} + +func (x *RemoveEvacuatingActualLRPRequest) ToProto() *ProtoRemoveEvacuatingActualLRPRequest { + proto := &ProtoRemoveEvacuatingActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + } + return proto +} + +func RemoveEvacuatingActualLRPRequestProtoMap(values []*RemoveEvacuatingActualLRPRequest) []*ProtoRemoveEvacuatingActualLRPRequest { + result := make([]*ProtoRemoveEvacuatingActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPResponse directly +type RemoveEvacuatingActualLRPResponse struct { + Error *Error +} + +func (x *RemoveEvacuatingActualLRPResponse) ToProto() *ProtoRemoveEvacuatingActualLRPResponse { + proto := &ProtoRemoveEvacuatingActualLRPResponse{ + Error: x.Error.ToProto(), + } + return proto +} + +func RemoveEvacuatingActualLRPResponseProtoMap(values []*RemoveEvacuatingActualLRPResponse) []*ProtoRemoveEvacuatingActualLRPResponse { + result := make([]*ProtoRemoveEvacuatingActualLRPResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/events.pb.go b/models/events.pb.go new file mode 100644 index 00000000..3589f1bd --- /dev/null +++ b/models/events.pb.go @@ -0,0 +1,1373 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: events.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// Deprecated: Marked as deprecated in events.proto. +type ProtoActualLRPCreatedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` +} + +func (x *ProtoActualLRPCreatedEvent) Reset() { + *x = ProtoActualLRPCreatedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPCreatedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPCreatedEvent) ProtoMessage() {} + +func (x *ProtoActualLRPCreatedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPCreatedEvent.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPCreatedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoActualLRPCreatedEvent) GetActualLrpGroup() *ProtoActualLRPGroup { + if x != nil { + return x.ActualLrpGroup + } + return nil +} + +// Deprecated: Marked as deprecated in events.proto. +type ProtoActualLRPChangedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Before *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` + After *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` +} + +func (x *ProtoActualLRPChangedEvent) Reset() { + *x = ProtoActualLRPChangedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPChangedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPChangedEvent) ProtoMessage() {} + +func (x *ProtoActualLRPChangedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPChangedEvent.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPChangedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoActualLRPChangedEvent) GetBefore() *ProtoActualLRPGroup { + if x != nil { + return x.Before + } + return nil +} + +func (x *ProtoActualLRPChangedEvent) GetAfter() *ProtoActualLRPGroup { + if x != nil { + return x.After + } + return nil +} + +// Deprecated: Marked as deprecated in events.proto. +type ProtoActualLRPRemovedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` +} + +func (x *ProtoActualLRPRemovedEvent) Reset() { + *x = ProtoActualLRPRemovedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPRemovedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPRemovedEvent) ProtoMessage() {} + +func (x *ProtoActualLRPRemovedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPRemovedEvent.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPRemovedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoActualLRPRemovedEvent) GetActualLrpGroup() *ProtoActualLRPGroup { + if x != nil { + return x.ActualLrpGroup + } + return nil +} + +type ProtoActualLRPInstanceCreatedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,json=actualLrp,proto3" json:"actual_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` +} + +func (x *ProtoActualLRPInstanceCreatedEvent) Reset() { + *x = ProtoActualLRPInstanceCreatedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPInstanceCreatedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPInstanceCreatedEvent) ProtoMessage() {} + +func (x *ProtoActualLRPInstanceCreatedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPInstanceCreatedEvent.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPInstanceCreatedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoActualLRPInstanceCreatedEvent) GetActualLrp() *ProtoActualLRP { + if x != nil { + return x.ActualLrp + } + return nil +} + +func (x *ProtoActualLRPInstanceCreatedEvent) GetTraceId() string { + if x != nil { + return x.TraceId + } + return "" +} + +type ProtoActualLRPInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` + CrashCount int32 `protobuf:"varint,4,opt,name=crash_count,proto3" json:"crash_count,omitempty"` + CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` + State string `protobuf:"bytes,6,opt,name=state,proto3" json:"state,omitempty"` + PlacementError string `protobuf:"bytes,7,opt,name=placement_error,json=placementError,proto3" json:"placement_error,omitempty"` + Since int64 `protobuf:"varint,8,opt,name=since,proto3" json:"since,omitempty"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,9,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` + Presence ProtoActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ProtoActualLRP_Presence" json:"presence,omitempty"` + ProtoRoutable *bool `protobuf:"varint,11,opt,name=ProtoRoutable,proto3,oneof" json:"ProtoRoutable,omitempty"` + AvailabilityZone string `protobuf:"bytes,12,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` +} + +func (x *ProtoActualLRPInfo) Reset() { + *x = ProtoActualLRPInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPInfo) ProtoMessage() {} + +func (x *ProtoActualLRPInfo) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPInfo.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPInfo) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoActualLRPInfo) GetActualLrpNetInfo() *ProtoActualLRPNetInfo { + if x != nil { + return x.ActualLrpNetInfo + } + return nil +} + +func (x *ProtoActualLRPInfo) GetCrashCount() int32 { + if x != nil { + return x.CrashCount + } + return 0 +} + +func (x *ProtoActualLRPInfo) GetCrashReason() string { + if x != nil { + return x.CrashReason + } + return "" +} + +func (x *ProtoActualLRPInfo) GetState() string { + if x != nil { + return x.State + } + return "" +} + +func (x *ProtoActualLRPInfo) GetPlacementError() string { + if x != nil { + return x.PlacementError + } + return "" +} + +func (x *ProtoActualLRPInfo) GetSince() int64 { + if x != nil { + return x.Since + } + return 0 +} + +func (x *ProtoActualLRPInfo) GetModificationTag() *ProtoModificationTag { + if x != nil { + return x.ModificationTag + } + return nil +} + +func (x *ProtoActualLRPInfo) GetPresence() ProtoActualLRP_Presence { + if x != nil { + return x.Presence + } + return ProtoActualLRP_ORDINARY +} + +func (x *ProtoActualLRPInfo) GetProtoRoutable() bool { + if x != nil && x.ProtoRoutable != nil { + return *x.ProtoRoutable + } + return false +} + +func (x *ProtoActualLRPInfo) GetAvailabilityZone() string { + if x != nil { + return x.AvailabilityZone + } + return "" +} + +type ProtoActualLRPInstanceChangedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + Before *ProtoActualLRPInfo `protobuf:"bytes,3,opt,name=before,proto3" json:"before,omitempty"` + After *ProtoActualLRPInfo `protobuf:"bytes,4,opt,name=after,proto3" json:"after,omitempty"` + TraceId string `protobuf:"bytes,5,opt,name=trace_id,proto3" json:"trace_id,omitempty"` +} + +func (x *ProtoActualLRPInstanceChangedEvent) Reset() { + *x = ProtoActualLRPInstanceChangedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPInstanceChangedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPInstanceChangedEvent) ProtoMessage() {} + +func (x *ProtoActualLRPInstanceChangedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPInstanceChangedEvent.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPInstanceChangedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoActualLRPInstanceChangedEvent) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoActualLRPInstanceChangedEvent) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +func (x *ProtoActualLRPInstanceChangedEvent) GetBefore() *ProtoActualLRPInfo { + if x != nil { + return x.Before + } + return nil +} + +func (x *ProtoActualLRPInstanceChangedEvent) GetAfter() *ProtoActualLRPInfo { + if x != nil { + return x.After + } + return nil +} + +func (x *ProtoActualLRPInstanceChangedEvent) GetTraceId() string { + if x != nil { + return x.TraceId + } + return "" +} + +type ProtoActualLRPInstanceRemovedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,json=actualLrp,proto3" json:"actual_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` +} + +func (x *ProtoActualLRPInstanceRemovedEvent) Reset() { + *x = ProtoActualLRPInstanceRemovedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPInstanceRemovedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPInstanceRemovedEvent) ProtoMessage() {} + +func (x *ProtoActualLRPInstanceRemovedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPInstanceRemovedEvent.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPInstanceRemovedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoActualLRPInstanceRemovedEvent) GetActualLrp() *ProtoActualLRP { + if x != nil { + return x.ActualLrp + } + return nil +} + +func (x *ProtoActualLRPInstanceRemovedEvent) GetTraceId() string { + if x != nil { + return x.TraceId + } + return "" +} + +type ProtoDesiredLRPCreatedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` +} + +func (x *ProtoDesiredLRPCreatedEvent) Reset() { + *x = ProtoDesiredLRPCreatedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPCreatedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPCreatedEvent) ProtoMessage() {} + +func (x *ProtoDesiredLRPCreatedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPCreatedEvent.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPCreatedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{7} +} + +func (x *ProtoDesiredLRPCreatedEvent) GetDesiredLrp() *ProtoDesiredLRP { + if x != nil { + return x.DesiredLrp + } + return nil +} + +func (x *ProtoDesiredLRPCreatedEvent) GetTraceId() string { + if x != nil { + return x.TraceId + } + return "" +} + +type ProtoDesiredLRPChangedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Before *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` + After *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` + TraceId string `protobuf:"bytes,3,opt,name=trace_id,proto3" json:"trace_id,omitempty"` +} + +func (x *ProtoDesiredLRPChangedEvent) Reset() { + *x = ProtoDesiredLRPChangedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPChangedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPChangedEvent) ProtoMessage() {} + +func (x *ProtoDesiredLRPChangedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[8] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPChangedEvent.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPChangedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{8} +} + +func (x *ProtoDesiredLRPChangedEvent) GetBefore() *ProtoDesiredLRP { + if x != nil { + return x.Before + } + return nil +} + +func (x *ProtoDesiredLRPChangedEvent) GetAfter() *ProtoDesiredLRP { + if x != nil { + return x.After + } + return nil +} + +func (x *ProtoDesiredLRPChangedEvent) GetTraceId() string { + if x != nil { + return x.TraceId + } + return "" +} + +type ProtoDesiredLRPRemovedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` +} + +func (x *ProtoDesiredLRPRemovedEvent) Reset() { + *x = ProtoDesiredLRPRemovedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesiredLRPRemovedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesiredLRPRemovedEvent) ProtoMessage() {} + +func (x *ProtoDesiredLRPRemovedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesiredLRPRemovedEvent.ProtoReflect.Descriptor instead. +func (*ProtoDesiredLRPRemovedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{9} +} + +func (x *ProtoDesiredLRPRemovedEvent) GetDesiredLrp() *ProtoDesiredLRP { + if x != nil { + return x.DesiredLrp + } + return nil +} + +func (x *ProtoDesiredLRPRemovedEvent) GetTraceId() string { + if x != nil { + return x.TraceId + } + return "" +} + +type ProtoActualLRPCrashedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + CrashCount int32 `protobuf:"varint,3,opt,name=crash_count,proto3" json:"crash_count,omitempty"` + CrashReason string `protobuf:"bytes,4,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` + Since int64 `protobuf:"varint,5,opt,name=since,proto3" json:"since,omitempty"` +} + +func (x *ProtoActualLRPCrashedEvent) Reset() { + *x = ProtoActualLRPCrashedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoActualLRPCrashedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoActualLRPCrashedEvent) ProtoMessage() {} + +func (x *ProtoActualLRPCrashedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[10] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoActualLRPCrashedEvent.ProtoReflect.Descriptor instead. +func (*ProtoActualLRPCrashedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{10} +} + +func (x *ProtoActualLRPCrashedEvent) GetActualLrpKey() *ProtoActualLRPKey { + if x != nil { + return x.ActualLrpKey + } + return nil +} + +func (x *ProtoActualLRPCrashedEvent) GetActualLrpInstanceKey() *ProtoActualLRPInstanceKey { + if x != nil { + return x.ActualLrpInstanceKey + } + return nil +} + +func (x *ProtoActualLRPCrashedEvent) GetCrashCount() int32 { + if x != nil { + return x.CrashCount + } + return 0 +} + +func (x *ProtoActualLRPCrashedEvent) GetCrashReason() string { + if x != nil { + return x.CrashReason + } + return "" +} + +func (x *ProtoActualLRPCrashedEvent) GetSince() int64 { + if x != nil { + return x.Since + } + return 0 +} + +type ProtoEventsByCellId struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + CellId string `protobuf:"bytes,1,opt,name=cell_id,proto3" json:"cell_id,omitempty"` +} + +func (x *ProtoEventsByCellId) Reset() { + *x = ProtoEventsByCellId{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoEventsByCellId) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoEventsByCellId) ProtoMessage() {} + +func (x *ProtoEventsByCellId) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[11] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoEventsByCellId.ProtoReflect.Descriptor instead. +func (*ProtoEventsByCellId) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{11} +} + +func (x *ProtoEventsByCellId) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +type ProtoTaskCreatedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Task *ProtoTask `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` +} + +func (x *ProtoTaskCreatedEvent) Reset() { + *x = ProtoTaskCreatedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskCreatedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskCreatedEvent) ProtoMessage() {} + +func (x *ProtoTaskCreatedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[12] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskCreatedEvent.ProtoReflect.Descriptor instead. +func (*ProtoTaskCreatedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{12} +} + +func (x *ProtoTaskCreatedEvent) GetTask() *ProtoTask { + if x != nil { + return x.Task + } + return nil +} + +type ProtoTaskChangedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Before *ProtoTask `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` + After *ProtoTask `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` +} + +func (x *ProtoTaskChangedEvent) Reset() { + *x = ProtoTaskChangedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskChangedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskChangedEvent) ProtoMessage() {} + +func (x *ProtoTaskChangedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[13] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskChangedEvent.ProtoReflect.Descriptor instead. +func (*ProtoTaskChangedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{13} +} + +func (x *ProtoTaskChangedEvent) GetBefore() *ProtoTask { + if x != nil { + return x.Before + } + return nil +} + +func (x *ProtoTaskChangedEvent) GetAfter() *ProtoTask { + if x != nil { + return x.After + } + return nil +} + +type ProtoTaskRemovedEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Task *ProtoTask `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` +} + +func (x *ProtoTaskRemovedEvent) Reset() { + *x = ProtoTaskRemovedEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskRemovedEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskRemovedEvent) ProtoMessage() {} + +func (x *ProtoTaskRemovedEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[14] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskRemovedEvent.ProtoReflect.Descriptor instead. +func (*ProtoTaskRemovedEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{14} +} + +func (x *ProtoTaskRemovedEvent) GetTask() *ProtoTask { + if x != nil { + return x.Task + } + return nil +} + +var File_events_proto protoreflect.FileDescriptor + +var file_events_proto_rawDesc = []byte{ + 0x0a, 0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, + 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x67, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, + 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, + 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x31, 0x0a, 0x05, + 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x3a, + 0x02, 0x18, 0x01, 0x22, 0x67, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x12, 0x45, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x77, 0x0a, 0x22, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0xee, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4c, 0x0a, 0x13, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, + 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, + 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, + 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, + 0x69, 0x6e, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, + 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, + 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, + 0x65, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x29, 0x0a, 0x0d, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x08, 0x48, 0x00, 0x52, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, + 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, + 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xc1, 0x02, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, + 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, + 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, + 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, + 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, + 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x30, 0x0a, 0x05, + 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, + 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x77, 0x0a, 0x22, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, + 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, + 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, + 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, + 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x61, 0x66, 0x74, + 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, + 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, + 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, + 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, + 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x92, 0x02, 0x0a, 0x1a, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, 0x73, + 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, + 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x2f, + 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, + 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, + 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, + 0x6b, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, + 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, + 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, + 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, + 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_events_proto_rawDescOnce sync.Once + file_events_proto_rawDescData = file_events_proto_rawDesc +) + +func file_events_proto_rawDescGZIP() []byte { + file_events_proto_rawDescOnce.Do(func() { + file_events_proto_rawDescData = protoimpl.X.CompressGZIP(file_events_proto_rawDescData) + }) + return file_events_proto_rawDescData +} + +var file_events_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_events_proto_goTypes = []interface{}{ + (*ProtoActualLRPCreatedEvent)(nil), // 0: models.ProtoActualLRPCreatedEvent + (*ProtoActualLRPChangedEvent)(nil), // 1: models.ProtoActualLRPChangedEvent + (*ProtoActualLRPRemovedEvent)(nil), // 2: models.ProtoActualLRPRemovedEvent + (*ProtoActualLRPInstanceCreatedEvent)(nil), // 3: models.ProtoActualLRPInstanceCreatedEvent + (*ProtoActualLRPInfo)(nil), // 4: models.ProtoActualLRPInfo + (*ProtoActualLRPInstanceChangedEvent)(nil), // 5: models.ProtoActualLRPInstanceChangedEvent + (*ProtoActualLRPInstanceRemovedEvent)(nil), // 6: models.ProtoActualLRPInstanceRemovedEvent + (*ProtoDesiredLRPCreatedEvent)(nil), // 7: models.ProtoDesiredLRPCreatedEvent + (*ProtoDesiredLRPChangedEvent)(nil), // 8: models.ProtoDesiredLRPChangedEvent + (*ProtoDesiredLRPRemovedEvent)(nil), // 9: models.ProtoDesiredLRPRemovedEvent + (*ProtoActualLRPCrashedEvent)(nil), // 10: models.ProtoActualLRPCrashedEvent + (*ProtoEventsByCellId)(nil), // 11: models.ProtoEventsByCellId + (*ProtoTaskCreatedEvent)(nil), // 12: models.ProtoTaskCreatedEvent + (*ProtoTaskChangedEvent)(nil), // 13: models.ProtoTaskChangedEvent + (*ProtoTaskRemovedEvent)(nil), // 14: models.ProtoTaskRemovedEvent + (*ProtoActualLRPGroup)(nil), // 15: models.ProtoActualLRPGroup + (*ProtoActualLRP)(nil), // 16: models.ProtoActualLRP + (*ProtoActualLRPNetInfo)(nil), // 17: models.ProtoActualLRPNetInfo + (*ProtoModificationTag)(nil), // 18: models.ProtoModificationTag + (ProtoActualLRP_Presence)(0), // 19: models.ProtoActualLRP.Presence + (*ProtoActualLRPKey)(nil), // 20: models.ProtoActualLRPKey + (*ProtoActualLRPInstanceKey)(nil), // 21: models.ProtoActualLRPInstanceKey + (*ProtoDesiredLRP)(nil), // 22: models.ProtoDesiredLRP + (*ProtoTask)(nil), // 23: models.ProtoTask +} +var file_events_proto_depIdxs = []int32{ + 15, // 0: models.ProtoActualLRPCreatedEvent.actual_lrp_group:type_name -> models.ProtoActualLRPGroup + 15, // 1: models.ProtoActualLRPChangedEvent.before:type_name -> models.ProtoActualLRPGroup + 15, // 2: models.ProtoActualLRPChangedEvent.after:type_name -> models.ProtoActualLRPGroup + 15, // 3: models.ProtoActualLRPRemovedEvent.actual_lrp_group:type_name -> models.ProtoActualLRPGroup + 16, // 4: models.ProtoActualLRPInstanceCreatedEvent.actual_lrp:type_name -> models.ProtoActualLRP + 17, // 5: models.ProtoActualLRPInfo.actual_lrp_net_info:type_name -> models.ProtoActualLRPNetInfo + 18, // 6: models.ProtoActualLRPInfo.modification_tag:type_name -> models.ProtoModificationTag + 19, // 7: models.ProtoActualLRPInfo.presence:type_name -> models.ProtoActualLRP.Presence + 20, // 8: models.ProtoActualLRPInstanceChangedEvent.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 21, // 9: models.ProtoActualLRPInstanceChangedEvent.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 4, // 10: models.ProtoActualLRPInstanceChangedEvent.before:type_name -> models.ProtoActualLRPInfo + 4, // 11: models.ProtoActualLRPInstanceChangedEvent.after:type_name -> models.ProtoActualLRPInfo + 16, // 12: models.ProtoActualLRPInstanceRemovedEvent.actual_lrp:type_name -> models.ProtoActualLRP + 22, // 13: models.ProtoDesiredLRPCreatedEvent.desired_lrp:type_name -> models.ProtoDesiredLRP + 22, // 14: models.ProtoDesiredLRPChangedEvent.before:type_name -> models.ProtoDesiredLRP + 22, // 15: models.ProtoDesiredLRPChangedEvent.after:type_name -> models.ProtoDesiredLRP + 22, // 16: models.ProtoDesiredLRPRemovedEvent.desired_lrp:type_name -> models.ProtoDesiredLRP + 20, // 17: models.ProtoActualLRPCrashedEvent.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 21, // 18: models.ProtoActualLRPCrashedEvent.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 23, // 19: models.ProtoTaskCreatedEvent.task:type_name -> models.ProtoTask + 23, // 20: models.ProtoTaskChangedEvent.before:type_name -> models.ProtoTask + 23, // 21: models.ProtoTaskChangedEvent.after:type_name -> models.ProtoTask + 23, // 22: models.ProtoTaskRemovedEvent.task:type_name -> models.ProtoTask + 23, // [23:23] is the sub-list for method output_type + 23, // [23:23] is the sub-list for method input_type + 23, // [23:23] is the sub-list for extension type_name + 23, // [23:23] is the sub-list for extension extendee + 0, // [0:23] is the sub-list for field type_name +} + +func init() { file_events_proto_init() } +func file_events_proto_init() { + if File_events_proto != nil { + return + } + file_actual_lrp_proto_init() + file_desired_lrp_proto_init() + file_task_proto_init() + file_modification_tag_proto_init() + if !protoimpl.UnsafeEnabled { + file_events_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPCreatedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPChangedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPRemovedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPInstanceCreatedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPInstanceChangedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPInstanceRemovedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPCreatedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPChangedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesiredLRPRemovedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoActualLRPCrashedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoEventsByCellId); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskCreatedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskChangedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_events_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskRemovedEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_events_proto_msgTypes[4].OneofWrappers = []interface{}{} + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_events_proto_rawDesc, + NumEnums: 0, + NumMessages: 15, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_events_proto_goTypes, + DependencyIndexes: file_events_proto_depIdxs, + MessageInfos: file_events_proto_msgTypes, + }.Build() + File_events_proto = out.File + file_events_proto_rawDesc = nil + file_events_proto_goTypes = nil + file_events_proto_depIdxs = nil +} diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go new file mode 100644 index 00000000..a815626c --- /dev/null +++ b/models/events_bbs.pb.go @@ -0,0 +1,357 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: events.proto + +package models + +// Prevent copylock errors when using ProtoActualLRPCreatedEvent directly +type ActualLRPCreatedEvent struct { + ActualLrpGroup *ActualLRPGroup +} + +func (x *ActualLRPCreatedEvent) ToProto() *ProtoActualLRPCreatedEvent { + proto := &ProtoActualLRPCreatedEvent{ + ActualLrpGroup: x.ActualLrpGroup.ToProto(), + } + return proto +} + +func ActualLRPCreatedEventProtoMap(values []*ActualLRPCreatedEvent) []*ProtoActualLRPCreatedEvent { + result := make([]*ProtoActualLRPCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPChangedEvent directly +type ActualLRPChangedEvent struct { + Before *ActualLRPGroup + After *ActualLRPGroup +} + +func (x *ActualLRPChangedEvent) ToProto() *ProtoActualLRPChangedEvent { + proto := &ProtoActualLRPChangedEvent{ + Before: x.Before.ToProto(), + After: x.After.ToProto(), + } + return proto +} + +func ActualLRPChangedEventProtoMap(values []*ActualLRPChangedEvent) []*ProtoActualLRPChangedEvent { + result := make([]*ProtoActualLRPChangedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPRemovedEvent directly +type ActualLRPRemovedEvent struct { + ActualLrpGroup *ActualLRPGroup +} + +func (x *ActualLRPRemovedEvent) ToProto() *ProtoActualLRPRemovedEvent { + proto := &ProtoActualLRPRemovedEvent{ + ActualLrpGroup: x.ActualLrpGroup.ToProto(), + } + return proto +} + +func ActualLRPRemovedEventProtoMap(values []*ActualLRPRemovedEvent) []*ProtoActualLRPRemovedEvent { + result := make([]*ProtoActualLRPRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPInstanceCreatedEvent directly +type ActualLRPInstanceCreatedEvent struct { + ActualLrp *ActualLRP + TraceId string +} + +func (x *ActualLRPInstanceCreatedEvent) ToProto() *ProtoActualLRPInstanceCreatedEvent { + proto := &ProtoActualLRPInstanceCreatedEvent{ + ActualLrp: x.ActualLrp.ToProto(), + TraceId: x.TraceId, + } + return proto +} + +func ActualLRPInstanceCreatedEventProtoMap(values []*ActualLRPInstanceCreatedEvent) []*ProtoActualLRPInstanceCreatedEvent { + result := make([]*ProtoActualLRPInstanceCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPInfo directly +type ActualLRPInfo struct { + ActualLrpNetInfo *ActualLRPNetInfo + CrashCount int32 + CrashReason string + State string + PlacementError string + Since int64 + ModificationTag *ModificationTag + Presence ActualLRP_Presence + ProtoRoutable bool + AvailabilityZone string +} + +func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { + proto := &ProtoActualLRPInfo{ + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + CrashCount: x.CrashCount, + CrashReason: x.CrashReason, + State: x.State, + PlacementError: x.PlacementError, + Since: x.Since, + ModificationTag: x.ModificationTag.ToProto(), + Presence: ProtoActualLRPInfo_Presence(x.Presence), + ProtoRoutable: &x.ProtoRoutable, + AvailabilityZone: x.AvailabilityZone, + } + return proto +} + +func ActualLRPInfoProtoMap(values []*ActualLRPInfo) []*ProtoActualLRPInfo { + result := make([]*ProtoActualLRPInfo, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPInstanceChangedEvent directly +type ActualLRPInstanceChangedEvent struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + Before *ActualLRPInfo + After *ActualLRPInfo + TraceId string +} + +func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChangedEvent { + proto := &ProtoActualLRPInstanceChangedEvent{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + Before: x.Before.ToProto(), + After: x.After.ToProto(), + TraceId: x.TraceId, + } + return proto +} + +func ActualLRPInstanceChangedEventProtoMap(values []*ActualLRPInstanceChangedEvent) []*ProtoActualLRPInstanceChangedEvent { + result := make([]*ProtoActualLRPInstanceChangedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPInstanceRemovedEvent directly +type ActualLRPInstanceRemovedEvent struct { + ActualLrp *ActualLRP + TraceId string +} + +func (x *ActualLRPInstanceRemovedEvent) ToProto() *ProtoActualLRPInstanceRemovedEvent { + proto := &ProtoActualLRPInstanceRemovedEvent{ + ActualLrp: x.ActualLrp.ToProto(), + TraceId: x.TraceId, + } + return proto +} + +func ActualLRPInstanceRemovedEventProtoMap(values []*ActualLRPInstanceRemovedEvent) []*ProtoActualLRPInstanceRemovedEvent { + result := make([]*ProtoActualLRPInstanceRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPCreatedEvent directly +type DesiredLRPCreatedEvent struct { + DesiredLrp *DesiredLRP + TraceId string +} + +func (x *DesiredLRPCreatedEvent) ToProto() *ProtoDesiredLRPCreatedEvent { + proto := &ProtoDesiredLRPCreatedEvent{ + DesiredLrp: x.DesiredLrp.ToProto(), + TraceId: x.TraceId, + } + return proto +} + +func DesiredLRPCreatedEventProtoMap(values []*DesiredLRPCreatedEvent) []*ProtoDesiredLRPCreatedEvent { + result := make([]*ProtoDesiredLRPCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPChangedEvent directly +type DesiredLRPChangedEvent struct { + Before *DesiredLRP + After *DesiredLRP + TraceId string +} + +func (x *DesiredLRPChangedEvent) ToProto() *ProtoDesiredLRPChangedEvent { + proto := &ProtoDesiredLRPChangedEvent{ + Before: x.Before.ToProto(), + After: x.After.ToProto(), + TraceId: x.TraceId, + } + return proto +} + +func DesiredLRPChangedEventProtoMap(values []*DesiredLRPChangedEvent) []*ProtoDesiredLRPChangedEvent { + result := make([]*ProtoDesiredLRPChangedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesiredLRPRemovedEvent directly +type DesiredLRPRemovedEvent struct { + DesiredLrp *DesiredLRP + TraceId string +} + +func (x *DesiredLRPRemovedEvent) ToProto() *ProtoDesiredLRPRemovedEvent { + proto := &ProtoDesiredLRPRemovedEvent{ + DesiredLrp: x.DesiredLrp.ToProto(), + TraceId: x.TraceId, + } + return proto +} + +func DesiredLRPRemovedEventProtoMap(values []*DesiredLRPRemovedEvent) []*ProtoDesiredLRPRemovedEvent { + result := make([]*ProtoDesiredLRPRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoActualLRPCrashedEvent directly +type ActualLRPCrashedEvent struct { + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + CrashCount int32 + CrashReason string + Since int64 +} + +func (x *ActualLRPCrashedEvent) ToProto() *ProtoActualLRPCrashedEvent { + proto := &ProtoActualLRPCrashedEvent{ + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + CrashCount: x.CrashCount, + CrashReason: x.CrashReason, + Since: x.Since, + } + return proto +} + +func ActualLRPCrashedEventProtoMap(values []*ActualLRPCrashedEvent) []*ProtoActualLRPCrashedEvent { + result := make([]*ProtoActualLRPCrashedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoEventsByCellId directly +type EventsByCellId struct { + CellId string +} + +func (x *EventsByCellId) ToProto() *ProtoEventsByCellId { + proto := &ProtoEventsByCellId{ + CellId: x.CellId, + } + return proto +} + +func EventsByCellIdProtoMap(values []*EventsByCellId) []*ProtoEventsByCellId { + result := make([]*ProtoEventsByCellId, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTaskCreatedEvent directly +type TaskCreatedEvent struct { + Task *Task +} + +func (x *TaskCreatedEvent) ToProto() *ProtoTaskCreatedEvent { + proto := &ProtoTaskCreatedEvent{ + Task: x.Task.ToProto(), + } + return proto +} + +func TaskCreatedEventProtoMap(values []*TaskCreatedEvent) []*ProtoTaskCreatedEvent { + result := make([]*ProtoTaskCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTaskChangedEvent directly +type TaskChangedEvent struct { + Before *Task + After *Task +} + +func (x *TaskChangedEvent) ToProto() *ProtoTaskChangedEvent { + proto := &ProtoTaskChangedEvent{ + Before: x.Before.ToProto(), + After: x.After.ToProto(), + } + return proto +} + +func TaskChangedEventProtoMap(values []*TaskChangedEvent) []*ProtoTaskChangedEvent { + result := make([]*ProtoTaskChangedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTaskRemovedEvent directly +type TaskRemovedEvent struct { + Task *Task +} + +func (x *TaskRemovedEvent) ToProto() *ProtoTaskRemovedEvent { + proto := &ProtoTaskRemovedEvent{ + Task: x.Task.ToProto(), + } + return proto +} + +func TaskRemovedEventProtoMap(values []*TaskRemovedEvent) []*ProtoTaskRemovedEvent { + result := make([]*ProtoTaskRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go new file mode 100644 index 00000000..6b3467d9 --- /dev/null +++ b/models/image_layer.pb.go @@ -0,0 +1,382 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: image_layer.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoImageLayer_DigestAlgorithm int32 + +const ( + ProtoImageLayer_DigestAlgorithmInvalid ProtoImageLayer_DigestAlgorithm = 0 // not camel cased since it isn't supposed to be used by API users + ProtoImageLayer_SHA256 ProtoImageLayer_DigestAlgorithm = 1 + // Deprecated: Marked as deprecated in image_layer.proto. + ProtoImageLayer_SHA512 ProtoImageLayer_DigestAlgorithm = 2 +) + +// Enum value maps for ProtoImageLayer_DigestAlgorithm. +var ( + ProtoImageLayer_DigestAlgorithm_name = map[int32]string{ + 0: "DigestAlgorithmInvalid", + 1: "SHA256", + 2: "SHA512", + } + ProtoImageLayer_DigestAlgorithm_value = map[string]int32{ + "DigestAlgorithmInvalid": 0, + "SHA256": 1, + "SHA512": 2, + } +) + +func (x ProtoImageLayer_DigestAlgorithm) Enum() *ProtoImageLayer_DigestAlgorithm { + p := new(ProtoImageLayer_DigestAlgorithm) + *p = x + return p +} + +func (x ProtoImageLayer_DigestAlgorithm) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoImageLayer_DigestAlgorithm) Descriptor() protoreflect.EnumDescriptor { + return file_image_layer_proto_enumTypes[0].Descriptor() +} + +func (ProtoImageLayer_DigestAlgorithm) Type() protoreflect.EnumType { + return &file_image_layer_proto_enumTypes[0] +} + +func (x ProtoImageLayer_DigestAlgorithm) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoImageLayer_DigestAlgorithm.Descriptor instead. +func (ProtoImageLayer_DigestAlgorithm) EnumDescriptor() ([]byte, []int) { + return file_image_layer_proto_rawDescGZIP(), []int{0, 0} +} + +type ProtoImageLayer_MediaType int32 + +const ( + ProtoImageLayer_MediaTypeInvalid ProtoImageLayer_MediaType = 0 // not camel cased since it isn't supposed to be used by API users + ProtoImageLayer_TGZ ProtoImageLayer_MediaType = 1 + ProtoImageLayer_TAR ProtoImageLayer_MediaType = 2 + ProtoImageLayer_ZIP ProtoImageLayer_MediaType = 3 +) + +// Enum value maps for ProtoImageLayer_MediaType. +var ( + ProtoImageLayer_MediaType_name = map[int32]string{ + 0: "MediaTypeInvalid", + 1: "TGZ", + 2: "TAR", + 3: "ZIP", + } + ProtoImageLayer_MediaType_value = map[string]int32{ + "MediaTypeInvalid": 0, + "TGZ": 1, + "TAR": 2, + "ZIP": 3, + } +) + +func (x ProtoImageLayer_MediaType) Enum() *ProtoImageLayer_MediaType { + p := new(ProtoImageLayer_MediaType) + *p = x + return p +} + +func (x ProtoImageLayer_MediaType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoImageLayer_MediaType) Descriptor() protoreflect.EnumDescriptor { + return file_image_layer_proto_enumTypes[1].Descriptor() +} + +func (ProtoImageLayer_MediaType) Type() protoreflect.EnumType { + return &file_image_layer_proto_enumTypes[1] +} + +func (x ProtoImageLayer_MediaType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoImageLayer_MediaType.Descriptor instead. +func (ProtoImageLayer_MediaType) EnumDescriptor() ([]byte, []int) { + return file_image_layer_proto_rawDescGZIP(), []int{0, 1} +} + +type ProtoImageLayer_Type int32 + +const ( + ProtoImageLayer_LayerTypeInvalid ProtoImageLayer_Type = 0 // not camel cased since it isn't supposed to be used by API users + ProtoImageLayer_SHARED ProtoImageLayer_Type = 1 + ProtoImageLayer_EXCLUSIVE ProtoImageLayer_Type = 2 +) + +// Enum value maps for ProtoImageLayer_Type. +var ( + ProtoImageLayer_Type_name = map[int32]string{ + 0: "LayerTypeInvalid", + 1: "SHARED", + 2: "EXCLUSIVE", + } + ProtoImageLayer_Type_value = map[string]int32{ + "LayerTypeInvalid": 0, + "SHARED": 1, + "EXCLUSIVE": 2, + } +) + +func (x ProtoImageLayer_Type) Enum() *ProtoImageLayer_Type { + p := new(ProtoImageLayer_Type) + *p = x + return p +} + +func (x ProtoImageLayer_Type) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoImageLayer_Type) Descriptor() protoreflect.EnumDescriptor { + return file_image_layer_proto_enumTypes[2].Descriptor() +} + +func (ProtoImageLayer_Type) Type() protoreflect.EnumType { + return &file_image_layer_proto_enumTypes[2] +} + +func (x ProtoImageLayer_Type) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoImageLayer_Type.Descriptor instead. +func (ProtoImageLayer_Type) EnumDescriptor() ([]byte, []int) { + return file_image_layer_proto_rawDescGZIP(), []int{0, 2} +} + +type ProtoImageLayer struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` + DestinationPath string `protobuf:"bytes,3,opt,name=destination_path,proto3" json:"destination_path,omitempty"` + LayerType ProtoImageLayer_Type `protobuf:"varint,4,opt,name=layer_type,proto3,enum=models.ProtoImageLayer_Type" json:"layer_type,omitempty"` + MediaType ProtoImageLayer_MediaType `protobuf:"varint,5,opt,name=media_type,proto3,enum=models.ProtoImageLayer_MediaType" json:"media_type,omitempty"` + DigestAlgorithm ProtoImageLayer_DigestAlgorithm `protobuf:"varint,6,opt,name=digest_algorithm,json=digestAlgorithm,proto3,enum=models.ProtoImageLayer_DigestAlgorithm" json:"digest_algorithm,omitempty"` + DigestValue string `protobuf:"bytes,7,opt,name=digest_value,json=digestValue,proto3" json:"digest_value,omitempty"` +} + +func (x *ProtoImageLayer) Reset() { + *x = ProtoImageLayer{} + if protoimpl.UnsafeEnabled { + mi := &file_image_layer_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoImageLayer) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoImageLayer) ProtoMessage() {} + +func (x *ProtoImageLayer) ProtoReflect() protoreflect.Message { + mi := &file_image_layer_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoImageLayer.ProtoReflect.Descriptor instead. +func (*ProtoImageLayer) Descriptor() ([]byte, []int) { + return file_image_layer_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoImageLayer) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ProtoImageLayer) GetUrl() string { + if x != nil { + return x.Url + } + return "" +} + +func (x *ProtoImageLayer) GetDestinationPath() string { + if x != nil { + return x.DestinationPath + } + return "" +} + +func (x *ProtoImageLayer) GetLayerType() ProtoImageLayer_Type { + if x != nil { + return x.LayerType + } + return ProtoImageLayer_LayerTypeInvalid +} + +func (x *ProtoImageLayer) GetMediaType() ProtoImageLayer_MediaType { + if x != nil { + return x.MediaType + } + return ProtoImageLayer_MediaTypeInvalid +} + +func (x *ProtoImageLayer) GetDigestAlgorithm() ProtoImageLayer_DigestAlgorithm { + if x != nil { + return x.DigestAlgorithm + } + return ProtoImageLayer_DigestAlgorithmInvalid +} + +func (x *ProtoImageLayer) GetDigestValue() string { + if x != nil { + return x.DigestValue + } + return "" +} + +var File_image_layer_proto protoreflect.FileDescriptor + +var file_image_layer_proto_rawDesc = []byte{ + 0x0a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x9d, 0x04, 0x0a, 0x0f, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, + 0x68, 0x12, 0x3c, 0x0a, 0x0a, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x54, + 0x79, 0x70, 0x65, 0x52, 0x0a, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, + 0x41, 0x0a, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x64, + 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x12, 0x52, 0x0a, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, + 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, + 0x72, 0x69, 0x74, 0x68, 0x6d, 0x52, 0x0f, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, + 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, + 0x67, 0x65, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x49, 0x0a, 0x0f, 0x44, 0x69, 0x67, + 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x16, + 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x49, + 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x32, + 0x35, 0x36, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x35, 0x31, 0x32, 0x10, 0x02, + 0x1a, 0x02, 0x08, 0x01, 0x22, 0x3c, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x47, 0x5a, 0x10, 0x01, + 0x12, 0x07, 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x5a, 0x49, 0x50, + 0x10, 0x03, 0x22, 0x37, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x61, + 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, + 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, + 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, 0x49, 0x56, 0x45, 0x10, 0x02, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_image_layer_proto_rawDescOnce sync.Once + file_image_layer_proto_rawDescData = file_image_layer_proto_rawDesc +) + +func file_image_layer_proto_rawDescGZIP() []byte { + file_image_layer_proto_rawDescOnce.Do(func() { + file_image_layer_proto_rawDescData = protoimpl.X.CompressGZIP(file_image_layer_proto_rawDescData) + }) + return file_image_layer_proto_rawDescData +} + +var file_image_layer_proto_enumTypes = make([]protoimpl.EnumInfo, 3) +var file_image_layer_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_image_layer_proto_goTypes = []interface{}{ + (ProtoImageLayer_DigestAlgorithm)(0), // 0: models.ProtoImageLayer.DigestAlgorithm + (ProtoImageLayer_MediaType)(0), // 1: models.ProtoImageLayer.MediaType + (ProtoImageLayer_Type)(0), // 2: models.ProtoImageLayer.Type + (*ProtoImageLayer)(nil), // 3: models.ProtoImageLayer +} +var file_image_layer_proto_depIdxs = []int32{ + 2, // 0: models.ProtoImageLayer.layer_type:type_name -> models.ProtoImageLayer.Type + 1, // 1: models.ProtoImageLayer.media_type:type_name -> models.ProtoImageLayer.MediaType + 0, // 2: models.ProtoImageLayer.digest_algorithm:type_name -> models.ProtoImageLayer.DigestAlgorithm + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_image_layer_proto_init() } +func file_image_layer_proto_init() { + if File_image_layer_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_image_layer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoImageLayer); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_image_layer_proto_rawDesc, + NumEnums: 3, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_image_layer_proto_goTypes, + DependencyIndexes: file_image_layer_proto_depIdxs, + EnumInfos: file_image_layer_proto_enumTypes, + MessageInfos: file_image_layer_proto_msgTypes, + }.Build() + File_image_layer_proto = out.File + file_image_layer_proto_rawDesc = nil + file_image_layer_proto_goTypes = nil + file_image_layer_proto_depIdxs = nil +} diff --git a/models/image_layer.proto b/models/image_layer.proto index 76ed622d..5cacb4fb 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -7,26 +7,26 @@ option go_package="code.cloudfoundry.org/bbs/models"; message ProtoImageLayer { enum DigestAlgorithm { DigestAlgorithmInvalid = 0; // not camel cased since it isn't supposed to be used by API users - SHA256 = 1; - SHA512 = 2 [deprecated=true]; + SHA256 = 1 [(bbs.bbs_enumvalue_customname) = "DigestAlgorithmSha256"]; + SHA512 = 2 [(bbs.bbs_enumvalue_customname) = "DigestAlgorithmSha512", deprecated=true]; } enum MediaType { MediaTypeInvalid = 0; // not camel cased since it isn't supposed to be used by API users - TGZ = 1; - TAR = 2; - ZIP = 3; + TGZ = 1 [(bbs.bbs_enumvalue_customname) = "MediaTypeTgz"]; + TAR = 2 [(bbs.bbs_enumvalue_customname) = "MediaTypeTar"]; + ZIP = 3 [(bbs.bbs_enumvalue_customname) = "MediaTypeZip"]; } enum Type { LayerTypeInvalid = 0; // not camel cased since it isn't supposed to be used by API users - SHARED = 1; - EXCLUSIVE = 2; + SHARED = 1 [(bbs.bbs_enumvalue_customname) = "LayerTypeShared"]; + EXCLUSIVE = 2 [(bbs.bbs_enumvalue_customname) = "LayerTypeExclusive"]; } string name = 1; - string url = 2 [json_name = "url"]; - string destination_path = 3 [json_name = "destination_path"]; + string url = 2 [json_name = "url"]; + string destination_path = 3 [json_name = "destination_path"]; Type layer_type = 4 [json_name = "layer_type"]; MediaType media_type = 5 [json_name = "media_type"]; DigestAlgorithm digest_algorithm = 6; diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go new file mode 100644 index 00000000..9d28b397 --- /dev/null +++ b/models/image_layer_bbs.pb.go @@ -0,0 +1,64 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: image_layer.proto + +package models + +type ImageLayer_DigestAlgorithm int32 + +const ( + ImageLayer_DigestAlgorithmInvalid ImageLayer_DigestAlgorithm = 0 + ImageLayer_SHA256 ImageLayer_DigestAlgorithm = 1 + ImageLayer_SHA512 ImageLayer_DigestAlgorithm = 2 +) + +type ImageLayer_MediaType int32 + +const ( + ImageLayer_MediaTypeInvalid ImageLayer_MediaType = 0 + ImageLayer_TGZ ImageLayer_MediaType = 1 + ImageLayer_TAR ImageLayer_MediaType = 2 + ImageLayer_ZIP ImageLayer_MediaType = 3 +) + +type ImageLayer_Type int32 + +const ( + ImageLayer_LayerTypeInvalid ImageLayer_Type = 0 + ImageLayer_SHARED ImageLayer_Type = 1 + ImageLayer_EXCLUSIVE ImageLayer_Type = 2 +) + +// Prevent copylock errors when using ProtoImageLayer directly +type ImageLayer struct { + Name string + Url string + DestinationPath string + LayerType ImageLayer_Type + MediaType ImageLayer_MediaType + DigestAlgorithm ImageLayer_DigestAlgorithm + DigestValue string +} + +func (x *ImageLayer) ToProto() *ProtoImageLayer { + proto := &ProtoImageLayer{ + Name: x.Name, + Url: x.Url, + DestinationPath: x.DestinationPath, + LayerType: ProtoImageLayer_LayerType(x.LayerType), + MediaType: ProtoImageLayer_MediaType(x.MediaType), + DigestAlgorithm: ProtoImageLayer_DigestAlgorithm(x.DigestAlgorithm), + DigestValue: x.DigestValue, + } + return proto +} + +func ImageLayerProtoMap(values []*ImageLayer) []*ProtoImageLayer { + result := make([]*ProtoImageLayer, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go new file mode 100644 index 00000000..df9c664d --- /dev/null +++ b/models/log_rate_limit.pb.go @@ -0,0 +1,145 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: log_rate_limit.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoLogRateLimit struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + BytesPerSecond int64 `protobuf:"varint,1,opt,name=bytes_per_second,json=bytesPerSecond,proto3" json:"bytes_per_second,omitempty"` +} + +func (x *ProtoLogRateLimit) Reset() { + *x = ProtoLogRateLimit{} + if protoimpl.UnsafeEnabled { + mi := &file_log_rate_limit_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoLogRateLimit) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoLogRateLimit) ProtoMessage() {} + +func (x *ProtoLogRateLimit) ProtoReflect() protoreflect.Message { + mi := &file_log_rate_limit_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoLogRateLimit.ProtoReflect.Descriptor instead. +func (*ProtoLogRateLimit) Descriptor() ([]byte, []int) { + return file_log_rate_limit_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoLogRateLimit) GetBytesPerSecond() int64 { + if x != nil { + return x.BytesPerSecond + } + return 0 +} + +var File_log_rate_limit_proto protoreflect.FileDescriptor + +var file_log_rate_limit_proto_rawDesc = []byte{ + 0x0a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x3d, + 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, + 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x62, + 0x79, 0x74, 0x65, 0x73, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x42, 0x22, 0x5a, + 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, + 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_log_rate_limit_proto_rawDescOnce sync.Once + file_log_rate_limit_proto_rawDescData = file_log_rate_limit_proto_rawDesc +) + +func file_log_rate_limit_proto_rawDescGZIP() []byte { + file_log_rate_limit_proto_rawDescOnce.Do(func() { + file_log_rate_limit_proto_rawDescData = protoimpl.X.CompressGZIP(file_log_rate_limit_proto_rawDescData) + }) + return file_log_rate_limit_proto_rawDescData +} + +var file_log_rate_limit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_log_rate_limit_proto_goTypes = []interface{}{ + (*ProtoLogRateLimit)(nil), // 0: models.ProtoLogRateLimit +} +var file_log_rate_limit_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_log_rate_limit_proto_init() } +func file_log_rate_limit_proto_init() { + if File_log_rate_limit_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_log_rate_limit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoLogRateLimit); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_log_rate_limit_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_log_rate_limit_proto_goTypes, + DependencyIndexes: file_log_rate_limit_proto_depIdxs, + MessageInfos: file_log_rate_limit_proto_msgTypes, + }.Build() + File_log_rate_limit_proto = out.File + file_log_rate_limit_proto_rawDesc = nil + file_log_rate_limit_proto_goTypes = nil + file_log_rate_limit_proto_depIdxs = nil +} diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go new file mode 100644 index 00000000..70562511 --- /dev/null +++ b/models/log_rate_limit_bbs.pb.go @@ -0,0 +1,27 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: log_rate_limit.proto + +package models + +// Prevent copylock errors when using ProtoLogRateLimit directly +type LogRateLimit struct { + BytesPerSecond int64 +} + +func (x *LogRateLimit) ToProto() *ProtoLogRateLimit { + proto := &ProtoLogRateLimit{ + BytesPerSecond: x.BytesPerSecond, + } + return proto +} + +func LogRateLimitProtoMap(values []*LogRateLimit) []*ProtoLogRateLimit { + result := make([]*ProtoLogRateLimit, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go new file mode 100644 index 00000000..4e66eda6 --- /dev/null +++ b/models/metric_tags.pb.go @@ -0,0 +1,216 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: metric_tags.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoMetricTagValue_DynamicValue int32 + +const ( + ProtoMetricTagValue_DynamicValueInvalid ProtoMetricTagValue_DynamicValue = 0 + ProtoMetricTagValue_INDEX ProtoMetricTagValue_DynamicValue = 1 + ProtoMetricTagValue_INSTANCE_GUID ProtoMetricTagValue_DynamicValue = 2 +) + +// Enum value maps for ProtoMetricTagValue_DynamicValue. +var ( + ProtoMetricTagValue_DynamicValue_name = map[int32]string{ + 0: "DynamicValueInvalid", + 1: "INDEX", + 2: "INSTANCE_GUID", + } + ProtoMetricTagValue_DynamicValue_value = map[string]int32{ + "DynamicValueInvalid": 0, + "INDEX": 1, + "INSTANCE_GUID": 2, + } +) + +func (x ProtoMetricTagValue_DynamicValue) Enum() *ProtoMetricTagValue_DynamicValue { + p := new(ProtoMetricTagValue_DynamicValue) + *p = x + return p +} + +func (x ProtoMetricTagValue_DynamicValue) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoMetricTagValue_DynamicValue) Descriptor() protoreflect.EnumDescriptor { + return file_metric_tags_proto_enumTypes[0].Descriptor() +} + +func (ProtoMetricTagValue_DynamicValue) Type() protoreflect.EnumType { + return &file_metric_tags_proto_enumTypes[0] +} + +func (x ProtoMetricTagValue_DynamicValue) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoMetricTagValue_DynamicValue.Descriptor instead. +func (ProtoMetricTagValue_DynamicValue) EnumDescriptor() ([]byte, []int) { + return file_metric_tags_proto_rawDescGZIP(), []int{0, 0} +} + +type ProtoMetricTagValue struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Note: we only expect one of the following set of fields to be + // set. + Static string `protobuf:"bytes,1,opt,name=static,proto3" json:"static,omitempty"` + Dynamic ProtoMetricTagValue_DynamicValue `protobuf:"varint,2,opt,name=dynamic,proto3,enum=models.ProtoMetricTagValue_DynamicValue" json:"dynamic,omitempty"` +} + +func (x *ProtoMetricTagValue) Reset() { + *x = ProtoMetricTagValue{} + if protoimpl.UnsafeEnabled { + mi := &file_metric_tags_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoMetricTagValue) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoMetricTagValue) ProtoMessage() {} + +func (x *ProtoMetricTagValue) ProtoReflect() protoreflect.Message { + mi := &file_metric_tags_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoMetricTagValue.ProtoReflect.Descriptor instead. +func (*ProtoMetricTagValue) Descriptor() ([]byte, []int) { + return file_metric_tags_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoMetricTagValue) GetStatic() string { + if x != nil { + return x.Static + } + return "" +} + +func (x *ProtoMetricTagValue) GetDynamic() ProtoMetricTagValue_DynamicValue { + if x != nil { + return x.Dynamic + } + return ProtoMetricTagValue_DynamicValueInvalid +} + +var File_metric_tags_proto protoreflect.FileDescriptor + +var file_metric_tags_proto_rawDesc = []byte{ + 0x0a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0xb8, 0x01, 0x0a, 0x13, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x12, 0x42, 0x0a, 0x07, 0x64, + 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, + 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x22, + 0x45, 0x0a, 0x0c, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, + 0x17, 0x0a, 0x13, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, + 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x49, 0x4e, 0x44, 0x45, + 0x58, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x5f, + 0x47, 0x55, 0x49, 0x44, 0x10, 0x02, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, + 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, + 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, +} + +var ( + file_metric_tags_proto_rawDescOnce sync.Once + file_metric_tags_proto_rawDescData = file_metric_tags_proto_rawDesc +) + +func file_metric_tags_proto_rawDescGZIP() []byte { + file_metric_tags_proto_rawDescOnce.Do(func() { + file_metric_tags_proto_rawDescData = protoimpl.X.CompressGZIP(file_metric_tags_proto_rawDescData) + }) + return file_metric_tags_proto_rawDescData +} + +var file_metric_tags_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_metric_tags_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_metric_tags_proto_goTypes = []interface{}{ + (ProtoMetricTagValue_DynamicValue)(0), // 0: models.ProtoMetricTagValue.DynamicValue + (*ProtoMetricTagValue)(nil), // 1: models.ProtoMetricTagValue +} +var file_metric_tags_proto_depIdxs = []int32{ + 0, // 0: models.ProtoMetricTagValue.dynamic:type_name -> models.ProtoMetricTagValue.DynamicValue + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_metric_tags_proto_init() } +func file_metric_tags_proto_init() { + if File_metric_tags_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_metric_tags_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoMetricTagValue); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_metric_tags_proto_rawDesc, + NumEnums: 1, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_metric_tags_proto_goTypes, + DependencyIndexes: file_metric_tags_proto_depIdxs, + EnumInfos: file_metric_tags_proto_enumTypes, + MessageInfos: file_metric_tags_proto_msgTypes, + }.Build() + File_metric_tags_proto = out.File + file_metric_tags_proto_rawDesc = nil + file_metric_tags_proto_goTypes = nil + file_metric_tags_proto_depIdxs = nil +} diff --git a/models/metric_tags.proto b/models/metric_tags.proto index 189afad4..6aaa89cb 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -7,8 +7,8 @@ option go_package="code.cloudfoundry.org/bbs/models"; message ProtoMetricTagValue { enum DynamicValue { DynamicValueInvalid = 0; - INDEX = 1; - INSTANCE_GUID = 2; + INDEX = 1 [(bbs.bbs_enumvalue_customname) = "MetricTagynamicValueIndex"]; + INSTANCE_GUID = 2 [(bbs.bbs_enumvalue_customname) = "MetricTagynamicValueInstanceGuid"]; } // Note: we only expect one of the following set of fields to be diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go new file mode 100644 index 00000000..21387faa --- /dev/null +++ b/models/metric_tags_bbs.pb.go @@ -0,0 +1,37 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: metric_tags.proto + +package models + +type MetricTagValue_DynamicValue int32 + +const ( + MetricTagValue_DynamicValueInvalid MetricTagValue_DynamicValue = 0 + MetricTagValue_INDEX MetricTagValue_DynamicValue = 1 + MetricTagValue_INSTANCE_GUID MetricTagValue_DynamicValue = 2 +) + +// Prevent copylock errors when using ProtoMetricTagValue directly +type MetricTagValue struct { + Static string + Dynamic MetricTagValue_DynamicValue +} + +func (x *MetricTagValue) ToProto() *ProtoMetricTagValue { + proto := &ProtoMetricTagValue{ + Static: x.Static, + Dynamic: ProtoMetricTagValue_Dynamic(x.Dynamic), + } + return proto +} + +func MetricTagValueProtoMap(values []*MetricTagValue) []*ProtoMetricTagValue { + result := make([]*ProtoMetricTagValue, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go new file mode 100644 index 00000000..95cebc05 --- /dev/null +++ b/models/modification_tag.pb.go @@ -0,0 +1,153 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: modification_tag.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoModificationTag struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Epoch string `protobuf:"bytes,1,opt,name=epoch,proto3" json:"epoch,omitempty"` + Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` +} + +func (x *ProtoModificationTag) Reset() { + *x = ProtoModificationTag{} + if protoimpl.UnsafeEnabled { + mi := &file_modification_tag_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoModificationTag) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoModificationTag) ProtoMessage() {} + +func (x *ProtoModificationTag) ProtoReflect() protoreflect.Message { + mi := &file_modification_tag_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoModificationTag.ProtoReflect.Descriptor instead. +func (*ProtoModificationTag) Descriptor() ([]byte, []int) { + return file_modification_tag_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoModificationTag) GetEpoch() string { + if x != nil { + return x.Epoch + } + return "" +} + +func (x *ProtoModificationTag) GetIndex() uint32 { + if x != nil { + return x.Index + } + return 0 +} + +var File_modification_tag_proto protoreflect.FileDescriptor + +var file_modification_tag_proto_rawDesc = []byte{ + 0x0a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, + 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x22, 0x42, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, + 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x14, + 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, + 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, + 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_modification_tag_proto_rawDescOnce sync.Once + file_modification_tag_proto_rawDescData = file_modification_tag_proto_rawDesc +) + +func file_modification_tag_proto_rawDescGZIP() []byte { + file_modification_tag_proto_rawDescOnce.Do(func() { + file_modification_tag_proto_rawDescData = protoimpl.X.CompressGZIP(file_modification_tag_proto_rawDescData) + }) + return file_modification_tag_proto_rawDescData +} + +var file_modification_tag_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_modification_tag_proto_goTypes = []interface{}{ + (*ProtoModificationTag)(nil), // 0: models.ProtoModificationTag +} +var file_modification_tag_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_modification_tag_proto_init() } +func file_modification_tag_proto_init() { + if File_modification_tag_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_modification_tag_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoModificationTag); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_modification_tag_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_modification_tag_proto_goTypes, + DependencyIndexes: file_modification_tag_proto_depIdxs, + MessageInfos: file_modification_tag_proto_msgTypes, + }.Build() + File_modification_tag_proto = out.File + file_modification_tag_proto_rawDesc = nil + file_modification_tag_proto_goTypes = nil + file_modification_tag_proto_depIdxs = nil +} diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go new file mode 100644 index 00000000..c6f03cd8 --- /dev/null +++ b/models/modification_tag_bbs.pb.go @@ -0,0 +1,29 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: modification_tag.proto + +package models + +// Prevent copylock errors when using ProtoModificationTag directly +type ModificationTag struct { + Epoch string + Index uint32 +} + +func (x *ModificationTag) ToProto() *ProtoModificationTag { + proto := &ProtoModificationTag{ + Epoch: x.Epoch, + Index: x.Index, + } + return proto +} + +func ModificationTagProtoMap(values []*ModificationTag) []*ProtoModificationTag { + result := make([]*ProtoModificationTag, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/network.pb.go b/models/network.pb.go new file mode 100644 index 00000000..af829aad --- /dev/null +++ b/models/network.pb.go @@ -0,0 +1,152 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: network.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoNetwork struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Properties map[string]string `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (x *ProtoNetwork) Reset() { + *x = ProtoNetwork{} + if protoimpl.UnsafeEnabled { + mi := &file_network_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoNetwork) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoNetwork) ProtoMessage() {} + +func (x *ProtoNetwork) ProtoReflect() protoreflect.Message { + mi := &file_network_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoNetwork.ProtoReflect.Descriptor instead. +func (*ProtoNetwork) Descriptor() ([]byte, []int) { + return file_network_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoNetwork) GetProperties() map[string]string { + if x != nil { + return x.Properties + } + return nil +} + +var File_network_proto protoreflect.FileDescriptor + +var file_network_proto_rawDesc = []byte{ + 0x0a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x44, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x3d, + 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x22, 0x5a, + 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, + 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_network_proto_rawDescOnce sync.Once + file_network_proto_rawDescData = file_network_proto_rawDesc +) + +func file_network_proto_rawDescGZIP() []byte { + file_network_proto_rawDescOnce.Do(func() { + file_network_proto_rawDescData = protoimpl.X.CompressGZIP(file_network_proto_rawDescData) + }) + return file_network_proto_rawDescData +} + +var file_network_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_network_proto_goTypes = []interface{}{ + (*ProtoNetwork)(nil), // 0: models.ProtoNetwork + nil, // 1: models.ProtoNetwork.PropertiesEntry +} +var file_network_proto_depIdxs = []int32{ + 1, // 0: models.ProtoNetwork.properties:type_name -> models.ProtoNetwork.PropertiesEntry + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_network_proto_init() } +func file_network_proto_init() { + if File_network_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_network_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoNetwork); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_network_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_network_proto_goTypes, + DependencyIndexes: file_network_proto_depIdxs, + MessageInfos: file_network_proto_msgTypes, + }.Build() + File_network_proto = out.File + file_network_proto_rawDesc = nil + file_network_proto_goTypes = nil + file_network_proto_depIdxs = nil +} diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go new file mode 100644 index 00000000..ad47d9c6 --- /dev/null +++ b/models/network_bbs.pb.go @@ -0,0 +1,27 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: network.proto + +package models + +// Prevent copylock errors when using ProtoNetwork directly +type Network struct { + Properties map[string]string +} + +func (x *Network) ToProto() *ProtoNetwork { + proto := &ProtoNetwork{ + Properties: x.Properties, + } + return proto +} + +func NetworkProtoMap(values []*Network) []*ProtoNetwork { + result := make([]*ProtoNetwork, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/ping.pb.go b/models/ping.pb.go new file mode 100644 index 00000000..31cc5982 --- /dev/null +++ b/models/ping.pb.go @@ -0,0 +1,144 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: ping.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoPingResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Available bool `protobuf:"varint,1,opt,name=available,proto3" json:"available,omitempty"` +} + +func (x *ProtoPingResponse) Reset() { + *x = ProtoPingResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_ping_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoPingResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoPingResponse) ProtoMessage() {} + +func (x *ProtoPingResponse) ProtoReflect() protoreflect.Message { + mi := &file_ping_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoPingResponse.ProtoReflect.Descriptor instead. +func (*ProtoPingResponse) Descriptor() ([]byte, []int) { + return file_ping_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoPingResponse) GetAvailable() bool { + if x != nil { + return x.Available + } + return false +} + +var File_ping_proto protoreflect.FileDescriptor + +var file_ping_proto_rawDesc = []byte{ + 0x0a, 0x0a, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x22, 0x31, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, + 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x76, + 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, +} + +var ( + file_ping_proto_rawDescOnce sync.Once + file_ping_proto_rawDescData = file_ping_proto_rawDesc +) + +func file_ping_proto_rawDescGZIP() []byte { + file_ping_proto_rawDescOnce.Do(func() { + file_ping_proto_rawDescData = protoimpl.X.CompressGZIP(file_ping_proto_rawDescData) + }) + return file_ping_proto_rawDescData +} + +var file_ping_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_ping_proto_goTypes = []interface{}{ + (*ProtoPingResponse)(nil), // 0: models.ProtoPingResponse +} +var file_ping_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_ping_proto_init() } +func file_ping_proto_init() { + if File_ping_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_ping_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoPingResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_ping_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_ping_proto_goTypes, + DependencyIndexes: file_ping_proto_depIdxs, + MessageInfos: file_ping_proto_msgTypes, + }.Build() + File_ping_proto = out.File + file_ping_proto_rawDesc = nil + file_ping_proto_goTypes = nil + file_ping_proto_depIdxs = nil +} diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go new file mode 100644 index 00000000..36518224 --- /dev/null +++ b/models/ping_bbs.pb.go @@ -0,0 +1,27 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: ping.proto + +package models + +// Prevent copylock errors when using ProtoPingResponse directly +type PingResponse struct { + Available bool +} + +func (x *PingResponse) ToProto() *ProtoPingResponse { + proto := &ProtoPingResponse{ + Available: x.Available, + } + return proto +} + +func PingResponseProtoMap(values []*PingResponse) []*ProtoPingResponse { + result := make([]*ProtoPingResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/security_group.pb.go b/models/security_group.pb.go new file mode 100644 index 00000000..4f87547c --- /dev/null +++ b/models/security_group.pb.go @@ -0,0 +1,352 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: security_group.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoPortRange struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Start uint32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"` + End uint32 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"` +} + +func (x *ProtoPortRange) Reset() { + *x = ProtoPortRange{} + if protoimpl.UnsafeEnabled { + mi := &file_security_group_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoPortRange) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoPortRange) ProtoMessage() {} + +func (x *ProtoPortRange) ProtoReflect() protoreflect.Message { + mi := &file_security_group_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoPortRange.ProtoReflect.Descriptor instead. +func (*ProtoPortRange) Descriptor() ([]byte, []int) { + return file_security_group_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoPortRange) GetStart() uint32 { + if x != nil { + return x.Start + } + return 0 +} + +func (x *ProtoPortRange) GetEnd() uint32 { + if x != nil { + return x.End + } + return 0 +} + +type ProtoICMPInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` + Code int32 `protobuf:"varint,2,opt,name=code,proto3" json:"code,omitempty"` +} + +func (x *ProtoICMPInfo) Reset() { + *x = ProtoICMPInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_security_group_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoICMPInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoICMPInfo) ProtoMessage() {} + +func (x *ProtoICMPInfo) ProtoReflect() protoreflect.Message { + mi := &file_security_group_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoICMPInfo.ProtoReflect.Descriptor instead. +func (*ProtoICMPInfo) Descriptor() ([]byte, []int) { + return file_security_group_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoICMPInfo) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + +func (x *ProtoICMPInfo) GetCode() int32 { + if x != nil { + return x.Code + } + return 0 +} + +type ProtoSecurityGroupRule struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Protocol string `protobuf:"bytes,1,opt,name=protocol,proto3" json:"protocol,omitempty"` + Destinations []string `protobuf:"bytes,2,rep,name=destinations,proto3" json:"destinations,omitempty"` + Ports []uint32 `protobuf:"varint,3,rep,name=ports,proto3" json:"ports,omitempty"` + PortRange *ProtoPortRange `protobuf:"bytes,4,opt,name=port_range,json=portRange,proto3" json:"port_range,omitempty"` + IcmpInfo *ProtoICMPInfo `protobuf:"bytes,5,opt,name=icmp_info,json=icmpInfo,proto3" json:"icmp_info,omitempty"` + Log bool `protobuf:"varint,6,opt,name=log,proto3" json:"log,omitempty"` + Annotations []string `protobuf:"bytes,7,rep,name=annotations,proto3" json:"annotations,omitempty"` +} + +func (x *ProtoSecurityGroupRule) Reset() { + *x = ProtoSecurityGroupRule{} + if protoimpl.UnsafeEnabled { + mi := &file_security_group_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoSecurityGroupRule) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoSecurityGroupRule) ProtoMessage() {} + +func (x *ProtoSecurityGroupRule) ProtoReflect() protoreflect.Message { + mi := &file_security_group_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoSecurityGroupRule.ProtoReflect.Descriptor instead. +func (*ProtoSecurityGroupRule) Descriptor() ([]byte, []int) { + return file_security_group_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoSecurityGroupRule) GetProtocol() string { + if x != nil { + return x.Protocol + } + return "" +} + +func (x *ProtoSecurityGroupRule) GetDestinations() []string { + if x != nil { + return x.Destinations + } + return nil +} + +func (x *ProtoSecurityGroupRule) GetPorts() []uint32 { + if x != nil { + return x.Ports + } + return nil +} + +func (x *ProtoSecurityGroupRule) GetPortRange() *ProtoPortRange { + if x != nil { + return x.PortRange + } + return nil +} + +func (x *ProtoSecurityGroupRule) GetIcmpInfo() *ProtoICMPInfo { + if x != nil { + return x.IcmpInfo + } + return nil +} + +func (x *ProtoSecurityGroupRule) GetLog() bool { + if x != nil { + return x.Log + } + return false +} + +func (x *ProtoSecurityGroupRule) GetAnnotations() []string { + if x != nil { + return x.Annotations + } + return nil +} + +var File_security_group_proto protoreflect.FileDescriptor + +var file_security_group_proto_rawDesc = []byte{ + 0x0a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x38, + 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, + 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x37, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x49, 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x22, 0x91, 0x02, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, + 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, + 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x05, + 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, + 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, + 0x61, 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x52, 0x09, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x32, 0x0a, + 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, + 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x69, 0x63, 0x6d, 0x70, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, + 0x6c, 0x6f, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, + 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, + 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, +} + +var ( + file_security_group_proto_rawDescOnce sync.Once + file_security_group_proto_rawDescData = file_security_group_proto_rawDesc +) + +func file_security_group_proto_rawDescGZIP() []byte { + file_security_group_proto_rawDescOnce.Do(func() { + file_security_group_proto_rawDescData = protoimpl.X.CompressGZIP(file_security_group_proto_rawDescData) + }) + return file_security_group_proto_rawDescData +} + +var file_security_group_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_security_group_proto_goTypes = []interface{}{ + (*ProtoPortRange)(nil), // 0: models.ProtoPortRange + (*ProtoICMPInfo)(nil), // 1: models.ProtoICMPInfo + (*ProtoSecurityGroupRule)(nil), // 2: models.ProtoSecurityGroupRule +} +var file_security_group_proto_depIdxs = []int32{ + 0, // 0: models.ProtoSecurityGroupRule.port_range:type_name -> models.ProtoPortRange + 1, // 1: models.ProtoSecurityGroupRule.icmp_info:type_name -> models.ProtoICMPInfo + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_security_group_proto_init() } +func file_security_group_proto_init() { + if File_security_group_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_security_group_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoPortRange); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_security_group_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoICMPInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_security_group_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoSecurityGroupRule); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_security_group_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_security_group_proto_goTypes, + DependencyIndexes: file_security_group_proto_depIdxs, + MessageInfos: file_security_group_proto_msgTypes, + }.Build() + File_security_group_proto = out.File + file_security_group_proto_rawDesc = nil + file_security_group_proto_goTypes = nil + file_security_group_proto_depIdxs = nil +} diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go new file mode 100644 index 00000000..40521743 --- /dev/null +++ b/models/security_group_bbs.pb.go @@ -0,0 +1,83 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: security_group.proto + +package models + +// Prevent copylock errors when using ProtoPortRange directly +type PortRange struct { + Start uint32 + End uint32 +} + +func (x *PortRange) ToProto() *ProtoPortRange { + proto := &ProtoPortRange{ + Start: x.Start, + End: x.End, + } + return proto +} + +func PortRangeProtoMap(values []*PortRange) []*ProtoPortRange { + result := make([]*ProtoPortRange, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoICMPInfo directly +type ICMPInfo struct { + Type int32 + Code int32 +} + +func (x *ICMPInfo) ToProto() *ProtoICMPInfo { + proto := &ProtoICMPInfo{ + Type: x.Type, + Code: x.Code, + } + return proto +} + +func ICMPInfoProtoMap(values []*ICMPInfo) []*ProtoICMPInfo { + result := make([]*ProtoICMPInfo, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoSecurityGroupRule directly +type SecurityGroupRule struct { + Protocol string + Destinations []string + Ports []uint32 + PortRange *PortRange + IcmpInfo *ICMPInfo + Log bool + Annotations []string +} + +func (x *SecurityGroupRule) ToProto() *ProtoSecurityGroupRule { + proto := &ProtoSecurityGroupRule{ + Protocol: x.Protocol, + Destinations: x.Destinations, + Ports: x.Ports, + PortRange: x.PortRange.ToProto(), + IcmpInfo: x.IcmpInfo.ToProto(), + Log: x.Log, + Annotations: x.Annotations, + } + return proto +} + +func SecurityGroupRuleProtoMap(values []*SecurityGroupRule) []*ProtoSecurityGroupRule { + result := make([]*ProtoSecurityGroupRule, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go new file mode 100644 index 00000000..b8c96eeb --- /dev/null +++ b/models/sidecar.pb.go @@ -0,0 +1,168 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: sidecar.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoSidecar struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + MemoryMb int32 `protobuf:"varint,3,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` +} + +func (x *ProtoSidecar) Reset() { + *x = ProtoSidecar{} + if protoimpl.UnsafeEnabled { + mi := &file_sidecar_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoSidecar) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoSidecar) ProtoMessage() {} + +func (x *ProtoSidecar) ProtoReflect() protoreflect.Message { + mi := &file_sidecar_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoSidecar.ProtoReflect.Descriptor instead. +func (*ProtoSidecar) Descriptor() ([]byte, []int) { + return file_sidecar_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoSidecar) GetAction() *ProtoAction { + if x != nil { + return x.Action + } + return nil +} + +func (x *ProtoSidecar) GetDiskMb() int32 { + if x != nil { + return x.DiskMb + } + return 0 +} + +func (x *ProtoSidecar) GetMemoryMb() int32 { + if x != nil { + return x.MemoryMb + } + return 0 +} + +var File_sidecar_proto protoreflect.FileDescriptor + +var file_sidecar_proto_rawDesc = []byte{ + 0x0a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x73, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, + 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, + 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_sidecar_proto_rawDescOnce sync.Once + file_sidecar_proto_rawDescData = file_sidecar_proto_rawDesc +) + +func file_sidecar_proto_rawDescGZIP() []byte { + file_sidecar_proto_rawDescOnce.Do(func() { + file_sidecar_proto_rawDescData = protoimpl.X.CompressGZIP(file_sidecar_proto_rawDescData) + }) + return file_sidecar_proto_rawDescData +} + +var file_sidecar_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_sidecar_proto_goTypes = []interface{}{ + (*ProtoSidecar)(nil), // 0: models.ProtoSidecar + (*ProtoAction)(nil), // 1: models.ProtoAction +} +var file_sidecar_proto_depIdxs = []int32{ + 1, // 0: models.ProtoSidecar.action:type_name -> models.ProtoAction + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_sidecar_proto_init() } +func file_sidecar_proto_init() { + if File_sidecar_proto != nil { + return + } + file_actions_proto_init() + if !protoimpl.UnsafeEnabled { + file_sidecar_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoSidecar); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_sidecar_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_sidecar_proto_goTypes, + DependencyIndexes: file_sidecar_proto_depIdxs, + MessageInfos: file_sidecar_proto_msgTypes, + }.Build() + File_sidecar_proto = out.File + file_sidecar_proto_rawDesc = nil + file_sidecar_proto_goTypes = nil + file_sidecar_proto_depIdxs = nil +} diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go new file mode 100644 index 00000000..eb8725c2 --- /dev/null +++ b/models/sidecar_bbs.pb.go @@ -0,0 +1,31 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: sidecar.proto + +package models + +// Prevent copylock errors when using ProtoSidecar directly +type Sidecar struct { + Action *Action + DiskMb int32 + MemoryMb int32 +} + +func (x *Sidecar) ToProto() *ProtoSidecar { + proto := &ProtoSidecar{ + Action: x.Action.ToProto(), + DiskMb: x.DiskMb, + MemoryMb: x.MemoryMb, + } + return proto +} + +func SidecarProtoMap(values []*Sidecar) []*ProtoSidecar { + result := make([]*ProtoSidecar, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/task.pb.go b/models/task.pb.go new file mode 100644 index 00000000..ced1a59b --- /dev/null +++ b/models/task.pb.go @@ -0,0 +1,736 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: task.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoTask_State int32 + +const ( + ProtoTask_Invalid ProtoTask_State = 0 + ProtoTask_Pending ProtoTask_State = 1 + ProtoTask_Running ProtoTask_State = 2 + ProtoTask_Completed ProtoTask_State = 3 + ProtoTask_Resolving ProtoTask_State = 4 +) + +// Enum value maps for ProtoTask_State. +var ( + ProtoTask_State_name = map[int32]string{ + 0: "Invalid", + 1: "Pending", + 2: "Running", + 3: "Completed", + 4: "Resolving", + } + ProtoTask_State_value = map[string]int32{ + "Invalid": 0, + "Pending": 1, + "Running": 2, + "Completed": 3, + "Resolving": 4, + } +) + +func (x ProtoTask_State) Enum() *ProtoTask_State { + p := new(ProtoTask_State) + *p = x + return p +} + +func (x ProtoTask_State) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ProtoTask_State) Descriptor() protoreflect.EnumDescriptor { + return file_task_proto_enumTypes[0].Descriptor() +} + +func (ProtoTask_State) Type() protoreflect.EnumType { + return &file_task_proto_enumTypes[0] +} + +func (x ProtoTask_State) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ProtoTask_State.Descriptor instead. +func (ProtoTask_State) EnumDescriptor() ([]byte, []int) { + return file_task_proto_rawDescGZIP(), []int{1, 0} +} + +type ProtoTaskDefinition struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RootFs string `protobuf:"bytes,1,opt,name=root_fs,json=rootfs,proto3" json:"root_fs,omitempty"` + EnvironmentVariables []*ProtoEnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=env,proto3" json:"environment_variables,omitempty"` + Action *ProtoAction `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"` + DiskMb int32 `protobuf:"varint,4,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + MemoryMb int32 `protobuf:"varint,5,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` + CpuWeight uint32 `protobuf:"varint,6,opt,name=cpu_weight,proto3" json:"cpu_weight,omitempty"` + Privileged bool `protobuf:"varint,7,opt,name=privileged,proto3" json:"privileged,omitempty"` + LogSource string `protobuf:"bytes,8,opt,name=log_source,proto3" json:"log_source,omitempty"` + LogGuid string `protobuf:"bytes,9,opt,name=log_guid,proto3" json:"log_guid,omitempty"` + MetricsGuid string `protobuf:"bytes,10,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` + ResultFile string `protobuf:"bytes,11,opt,name=result_file,proto3" json:"result_file,omitempty"` + CompletionCallbackUrl string `protobuf:"bytes,12,opt,name=completion_callback_url,json=completionCallbackUrl,proto3" json:"completion_callback_url,omitempty"` + Annotation string `protobuf:"bytes,13,opt,name=annotation,proto3" json:"annotation,omitempty"` + EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,14,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` + CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,15,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` + // Deprecated: Marked as deprecated in task.proto. + LegacyDownloadUser string `protobuf:"bytes,16,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `protobuf:"bytes,17,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,18,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` + Network *ProtoNetwork `protobuf:"bytes,19,opt,name=network,proto3" json:"network,omitempty"` + PlacementTags []string `protobuf:"bytes,20,rep,name=placement_tags,json=placementTags,proto3" json:"placement_tags,omitempty"` + MaxPids int32 `protobuf:"varint,21,opt,name=max_pids,proto3" json:"max_pids,omitempty"` + CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,22,opt,name=certificate_properties,json=certificateProperties,proto3" json:"certificate_properties,omitempty"` + ImageUsername string `protobuf:"bytes,23,opt,name=image_username,proto3" json:"image_username,omitempty"` + ImagePassword string `protobuf:"bytes,24,opt,name=image_password,proto3" json:"image_password,omitempty"` + ImageLayers []*ProtoImageLayer `protobuf:"bytes,25,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` + LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,26,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,27,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (x *ProtoTaskDefinition) Reset() { + *x = ProtoTaskDefinition{} + if protoimpl.UnsafeEnabled { + mi := &file_task_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskDefinition) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskDefinition) ProtoMessage() {} + +func (x *ProtoTaskDefinition) ProtoReflect() protoreflect.Message { + mi := &file_task_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskDefinition.ProtoReflect.Descriptor instead. +func (*ProtoTaskDefinition) Descriptor() ([]byte, []int) { + return file_task_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoTaskDefinition) GetRootFs() string { + if x != nil { + return x.RootFs + } + return "" +} + +func (x *ProtoTaskDefinition) GetEnvironmentVariables() []*ProtoEnvironmentVariable { + if x != nil { + return x.EnvironmentVariables + } + return nil +} + +func (x *ProtoTaskDefinition) GetAction() *ProtoAction { + if x != nil { + return x.Action + } + return nil +} + +func (x *ProtoTaskDefinition) GetDiskMb() int32 { + if x != nil { + return x.DiskMb + } + return 0 +} + +func (x *ProtoTaskDefinition) GetMemoryMb() int32 { + if x != nil { + return x.MemoryMb + } + return 0 +} + +func (x *ProtoTaskDefinition) GetCpuWeight() uint32 { + if x != nil { + return x.CpuWeight + } + return 0 +} + +func (x *ProtoTaskDefinition) GetPrivileged() bool { + if x != nil { + return x.Privileged + } + return false +} + +func (x *ProtoTaskDefinition) GetLogSource() string { + if x != nil { + return x.LogSource + } + return "" +} + +func (x *ProtoTaskDefinition) GetLogGuid() string { + if x != nil { + return x.LogGuid + } + return "" +} + +func (x *ProtoTaskDefinition) GetMetricsGuid() string { + if x != nil { + return x.MetricsGuid + } + return "" +} + +func (x *ProtoTaskDefinition) GetResultFile() string { + if x != nil { + return x.ResultFile + } + return "" +} + +func (x *ProtoTaskDefinition) GetCompletionCallbackUrl() string { + if x != nil { + return x.CompletionCallbackUrl + } + return "" +} + +func (x *ProtoTaskDefinition) GetAnnotation() string { + if x != nil { + return x.Annotation + } + return "" +} + +func (x *ProtoTaskDefinition) GetEgressRules() []*ProtoSecurityGroupRule { + if x != nil { + return x.EgressRules + } + return nil +} + +func (x *ProtoTaskDefinition) GetCachedDependencies() []*ProtoCachedDependency { + if x != nil { + return x.CachedDependencies + } + return nil +} + +// Deprecated: Marked as deprecated in task.proto. +func (x *ProtoTaskDefinition) GetLegacyDownloadUser() string { + if x != nil { + return x.LegacyDownloadUser + } + return "" +} + +func (x *ProtoTaskDefinition) GetTrustedSystemCertificatesPath() string { + if x != nil { + return x.TrustedSystemCertificatesPath + } + return "" +} + +func (x *ProtoTaskDefinition) GetVolumeMounts() []*ProtoVolumeMount { + if x != nil { + return x.VolumeMounts + } + return nil +} + +func (x *ProtoTaskDefinition) GetNetwork() *ProtoNetwork { + if x != nil { + return x.Network + } + return nil +} + +func (x *ProtoTaskDefinition) GetPlacementTags() []string { + if x != nil { + return x.PlacementTags + } + return nil +} + +func (x *ProtoTaskDefinition) GetMaxPids() int32 { + if x != nil { + return x.MaxPids + } + return 0 +} + +func (x *ProtoTaskDefinition) GetCertificateProperties() *ProtoCertificateProperties { + if x != nil { + return x.CertificateProperties + } + return nil +} + +func (x *ProtoTaskDefinition) GetImageUsername() string { + if x != nil { + return x.ImageUsername + } + return "" +} + +func (x *ProtoTaskDefinition) GetImagePassword() string { + if x != nil { + return x.ImagePassword + } + return "" +} + +func (x *ProtoTaskDefinition) GetImageLayers() []*ProtoImageLayer { + if x != nil { + return x.ImageLayers + } + return nil +} + +func (x *ProtoTaskDefinition) GetLogRateLimit() *ProtoLogRateLimit { + if x != nil { + return x.LogRateLimit + } + return nil +} + +func (x *ProtoTaskDefinition) GetMetricTags() map[string]*ProtoMetricTagValue { + if x != nil { + return x.MetricTags + } + return nil +} + +type ProtoTask struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskDefinition *ProtoTaskDefinition `protobuf:"bytes,1,opt,name=task_definition,proto3" json:"task_definition,omitempty"` + TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,proto3" json:"created_at,omitempty"` + UpdatedAt int64 `protobuf:"varint,5,opt,name=updated_at,proto3" json:"updated_at,omitempty"` + FirstCompletedAt int64 `protobuf:"varint,6,opt,name=first_completed_at,proto3" json:"first_completed_at,omitempty"` + State ProtoTask_State `protobuf:"varint,7,opt,name=state,proto3,enum=models.ProtoTask_State" json:"state,omitempty"` + CellId string `protobuf:"bytes,8,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + Result string `protobuf:"bytes,9,opt,name=result,proto3" json:"result,omitempty"` + Failed bool `protobuf:"varint,10,opt,name=failed,proto3" json:"failed,omitempty"` + FailureReason string `protobuf:"bytes,11,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` + RejectionCount int32 `protobuf:"varint,12,opt,name=rejection_count,proto3" json:"rejection_count,omitempty"` + RejectionReason string `protobuf:"bytes,13,opt,name=rejection_reason,proto3" json:"rejection_reason,omitempty"` +} + +func (x *ProtoTask) Reset() { + *x = ProtoTask{} + if protoimpl.UnsafeEnabled { + mi := &file_task_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTask) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTask) ProtoMessage() {} + +func (x *ProtoTask) ProtoReflect() protoreflect.Message { + mi := &file_task_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTask.ProtoReflect.Descriptor instead. +func (*ProtoTask) Descriptor() ([]byte, []int) { + return file_task_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoTask) GetTaskDefinition() *ProtoTaskDefinition { + if x != nil { + return x.TaskDefinition + } + return nil +} + +func (x *ProtoTask) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +func (x *ProtoTask) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoTask) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *ProtoTask) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +func (x *ProtoTask) GetFirstCompletedAt() int64 { + if x != nil { + return x.FirstCompletedAt + } + return 0 +} + +func (x *ProtoTask) GetState() ProtoTask_State { + if x != nil { + return x.State + } + return ProtoTask_Invalid +} + +func (x *ProtoTask) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +func (x *ProtoTask) GetResult() string { + if x != nil { + return x.Result + } + return "" +} + +func (x *ProtoTask) GetFailed() bool { + if x != nil { + return x.Failed + } + return false +} + +func (x *ProtoTask) GetFailureReason() string { + if x != nil { + return x.FailureReason + } + return "" +} + +func (x *ProtoTask) GetRejectionCount() int32 { + if x != nil { + return x.RejectionCount + } + return 0 +} + +func (x *ProtoTask) GetRejectionReason() string { + if x != nil { + return x.RejectionReason + } + return "" +} + +var File_task_proto protoreflect.FileDescriptor + +var file_task_proto_rawDesc = []byte{ + 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, + 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x1a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x1a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89, 0x0b, 0x0a, + 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x44, 0x0a, + 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, + 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, + 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, + 0x65, 0x6e, 0x76, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, + 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, + 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, + 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, + 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, + 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, + 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, + 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x36, 0x0a, 0x17, 0x63, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, + 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x55, + 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, + 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, + 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, + 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, + 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x10, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, + 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, + 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, + 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, + 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x13, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, + 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, + 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x59, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, + 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, + 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, + 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x3f, 0x0a, + 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, + 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, + 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x4c, + 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x1b, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xae, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x36, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, + 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x00, 0x12, 0x1c, + 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, + 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x64, 0x5f, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, + 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x64, 0x5f, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 0x64, 0x5f, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x16, 0x0a, + 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, + 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, + 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, + 0x73, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, + 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, + 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, + 0x73, 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, + 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, + 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_task_proto_rawDescOnce sync.Once + file_task_proto_rawDescData = file_task_proto_rawDesc +) + +func file_task_proto_rawDescGZIP() []byte { + file_task_proto_rawDescOnce.Do(func() { + file_task_proto_rawDescData = protoimpl.X.CompressGZIP(file_task_proto_rawDescData) + }) + return file_task_proto_rawDescData +} + +var file_task_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_task_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_task_proto_goTypes = []interface{}{ + (ProtoTask_State)(0), // 0: models.ProtoTask.State + (*ProtoTaskDefinition)(nil), // 1: models.ProtoTaskDefinition + (*ProtoTask)(nil), // 2: models.ProtoTask + nil, // 3: models.ProtoTaskDefinition.MetricTagsEntry + (*ProtoEnvironmentVariable)(nil), // 4: models.ProtoEnvironmentVariable + (*ProtoAction)(nil), // 5: models.ProtoAction + (*ProtoSecurityGroupRule)(nil), // 6: models.ProtoSecurityGroupRule + (*ProtoCachedDependency)(nil), // 7: models.ProtoCachedDependency + (*ProtoVolumeMount)(nil), // 8: models.ProtoVolumeMount + (*ProtoNetwork)(nil), // 9: models.ProtoNetwork + (*ProtoCertificateProperties)(nil), // 10: models.ProtoCertificateProperties + (*ProtoImageLayer)(nil), // 11: models.ProtoImageLayer + (*ProtoLogRateLimit)(nil), // 12: models.ProtoLogRateLimit + (*ProtoMetricTagValue)(nil), // 13: models.ProtoMetricTagValue +} +var file_task_proto_depIdxs = []int32{ + 4, // 0: models.ProtoTaskDefinition.environment_variables:type_name -> models.ProtoEnvironmentVariable + 5, // 1: models.ProtoTaskDefinition.action:type_name -> models.ProtoAction + 6, // 2: models.ProtoTaskDefinition.egress_rules:type_name -> models.ProtoSecurityGroupRule + 7, // 3: models.ProtoTaskDefinition.cached_dependencies:type_name -> models.ProtoCachedDependency + 8, // 4: models.ProtoTaskDefinition.volume_mounts:type_name -> models.ProtoVolumeMount + 9, // 5: models.ProtoTaskDefinition.network:type_name -> models.ProtoNetwork + 10, // 6: models.ProtoTaskDefinition.certificate_properties:type_name -> models.ProtoCertificateProperties + 11, // 7: models.ProtoTaskDefinition.image_layers:type_name -> models.ProtoImageLayer + 12, // 8: models.ProtoTaskDefinition.log_rate_limit:type_name -> models.ProtoLogRateLimit + 3, // 9: models.ProtoTaskDefinition.metric_tags:type_name -> models.ProtoTaskDefinition.MetricTagsEntry + 1, // 10: models.ProtoTask.task_definition:type_name -> models.ProtoTaskDefinition + 0, // 11: models.ProtoTask.state:type_name -> models.ProtoTask.State + 13, // 12: models.ProtoTaskDefinition.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name +} + +func init() { file_task_proto_init() } +func file_task_proto_init() { + if File_task_proto != nil { + return + } + file_actions_proto_init() + file_environment_variables_proto_init() + file_security_group_proto_init() + file_cached_dependency_proto_init() + file_volume_mount_proto_init() + file_network_proto_init() + file_certificate_properties_proto_init() + file_image_layer_proto_init() + file_log_rate_limit_proto_init() + file_metric_tags_proto_init() + if !protoimpl.UnsafeEnabled { + file_task_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskDefinition); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTask); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_task_proto_rawDesc, + NumEnums: 1, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_task_proto_goTypes, + DependencyIndexes: file_task_proto_depIdxs, + EnumInfos: file_task_proto_enumTypes, + MessageInfos: file_task_proto_msgTypes, + }.Build() + File_task_proto = out.File + file_task_proto_rawDesc = nil + file_task_proto_goTypes = nil + file_task_proto_depIdxs = nil +} diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go new file mode 100644 index 00000000..b1eb2a72 --- /dev/null +++ b/models/task_bbs.pb.go @@ -0,0 +1,133 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: task.proto + +package models + +// Prevent copylock errors when using ProtoTaskDefinition directly +type TaskDefinition struct { + RootFs string + EnvironmentVariables []*EnvironmentVariable + Action *Action + DiskMb int32 + MemoryMb int32 + CpuWeight uint32 + Privileged bool + LogSource string + LogGuid string + MetricsGuid string + ResultFile string + CompletionCallbackUrl string + Annotation string + EgressRules []*SecurityGroupRule + CachedDependencies []*CachedDependency + LegacyDownloadUser string + TrustedSystemCertificatesPath string + VolumeMounts []*VolumeMount + Network *Network + PlacementTags []string + MaxPids int32 + CertificateProperties *CertificateProperties + ImageUsername string + ImagePassword string + ImageLayers []*ImageLayer + LogRateLimit *LogRateLimit + MetricTags map[string]*ProtoMetricTagValue +} + +func (x *TaskDefinition) ToProto() *ProtoTaskDefinition { + proto := &ProtoTaskDefinition{ + RootFs: x.RootFs, + EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), + Action: x.Action.ToProto(), + DiskMb: x.DiskMb, + MemoryMb: x.MemoryMb, + CpuWeight: x.CpuWeight, + Privileged: x.Privileged, + LogSource: x.LogSource, + LogGuid: x.LogGuid, + MetricsGuid: x.MetricsGuid, + ResultFile: x.ResultFile, + CompletionCallbackUrl: x.CompletionCallbackUrl, + Annotation: x.Annotation, + EgressRules: SecurityGroupRuleProtoMap(x.EgressRules), + CachedDependencies: CachedDependencyProtoMap(x.CachedDependencies), + LegacyDownloadUser: x.LegacyDownloadUser, + TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, + VolumeMounts: VolumeMountProtoMap(x.VolumeMounts), + Network: x.Network.ToProto(), + PlacementTags: x.PlacementTags, + MaxPids: x.MaxPids, + CertificateProperties: x.CertificateProperties.ToProto(), + ImageUsername: x.ImageUsername, + ImagePassword: x.ImagePassword, + ImageLayers: ImageLayerProtoMap(x.ImageLayers), + LogRateLimit: x.LogRateLimit.ToProto(), + MetricTags: x.MetricTags, + } + return proto +} + +func TaskDefinitionProtoMap(values []*TaskDefinition) []*ProtoTaskDefinition { + result := make([]*ProtoTaskDefinition, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +type Task_State int32 + +const ( + Task_Invalid Task_State = 0 + Task_Pending Task_State = 1 + Task_Running Task_State = 2 + Task_Completed Task_State = 3 + Task_Resolving Task_State = 4 +) + +// Prevent copylock errors when using ProtoTask directly +type Task struct { + TaskDefinition *TaskDefinition + TaskGuid string + Domain string + CreatedAt int64 + UpdatedAt int64 + FirstCompletedAt int64 + State Task_State + CellId string + Result string + Failed bool + FailureReason string + RejectionCount int32 + RejectionReason string +} + +func (x *Task) ToProto() *ProtoTask { + proto := &ProtoTask{ + TaskDefinition: x.TaskDefinition.ToProto(), + TaskGuid: x.TaskGuid, + Domain: x.Domain, + CreatedAt: x.CreatedAt, + UpdatedAt: x.UpdatedAt, + FirstCompletedAt: x.FirstCompletedAt, + State: ProtoTask_State(x.State), + CellId: x.CellId, + Result: x.Result, + Failed: x.Failed, + FailureReason: x.FailureReason, + RejectionCount: x.RejectionCount, + RejectionReason: x.RejectionReason, + } + return proto +} + +func TaskProtoMap(values []*Task) []*ProtoTask { + result := make([]*ProtoTask, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go new file mode 100644 index 00000000..f4d7d0d9 --- /dev/null +++ b/models/task_requests.pb.go @@ -0,0 +1,1106 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: task_requests.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoTaskLifecycleResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` +} + +func (x *ProtoTaskLifecycleResponse) Reset() { + *x = ProtoTaskLifecycleResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskLifecycleResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskLifecycleResponse) ProtoMessage() {} + +func (x *ProtoTaskLifecycleResponse) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskLifecycleResponse.ProtoReflect.Descriptor instead. +func (*ProtoTaskLifecycleResponse) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoTaskLifecycleResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +type ProtoDesireTaskRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskDefinition *ProtoTaskDefinition `protobuf:"bytes,1,opt,name=task_definition,proto3" json:"task_definition,omitempty"` + TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` +} + +func (x *ProtoDesireTaskRequest) Reset() { + *x = ProtoDesireTaskRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoDesireTaskRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoDesireTaskRequest) ProtoMessage() {} + +func (x *ProtoDesireTaskRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoDesireTaskRequest.ProtoReflect.Descriptor instead. +func (*ProtoDesireTaskRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoDesireTaskRequest) GetTaskDefinition() *ProtoTaskDefinition { + if x != nil { + return x.TaskDefinition + } + return nil +} + +func (x *ProtoDesireTaskRequest) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +func (x *ProtoDesireTaskRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +type ProtoStartTaskRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` +} + +func (x *ProtoStartTaskRequest) Reset() { + *x = ProtoStartTaskRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoStartTaskRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoStartTaskRequest) ProtoMessage() {} + +func (x *ProtoStartTaskRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoStartTaskRequest.ProtoReflect.Descriptor instead. +func (*ProtoStartTaskRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoStartTaskRequest) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +func (x *ProtoStartTaskRequest) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +type ProtoStartTaskResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + ShouldStart bool `protobuf:"varint,2,opt,name=should_start,proto3" json:"should_start,omitempty"` +} + +func (x *ProtoStartTaskResponse) Reset() { + *x = ProtoStartTaskResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoStartTaskResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoStartTaskResponse) ProtoMessage() {} + +func (x *ProtoStartTaskResponse) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoStartTaskResponse.ProtoReflect.Descriptor instead. +func (*ProtoStartTaskResponse) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{3} +} + +func (x *ProtoStartTaskResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoStartTaskResponse) GetShouldStart() bool { + if x != nil { + return x.ShouldStart + } + return false +} + +// Deprecated: Marked as deprecated in task_requests.proto. +type ProtoFailTaskRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + FailureReason string `protobuf:"bytes,2,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` +} + +func (x *ProtoFailTaskRequest) Reset() { + *x = ProtoFailTaskRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoFailTaskRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoFailTaskRequest) ProtoMessage() {} + +func (x *ProtoFailTaskRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoFailTaskRequest.ProtoReflect.Descriptor instead. +func (*ProtoFailTaskRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{4} +} + +func (x *ProtoFailTaskRequest) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +func (x *ProtoFailTaskRequest) GetFailureReason() string { + if x != nil { + return x.FailureReason + } + return "" +} + +type ProtoRejectTaskRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + RejectionReason string `protobuf:"bytes,2,opt,name=rejection_reason,proto3" json:"rejection_reason,omitempty"` +} + +func (x *ProtoRejectTaskRequest) Reset() { + *x = ProtoRejectTaskRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoRejectTaskRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoRejectTaskRequest) ProtoMessage() {} + +func (x *ProtoRejectTaskRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoRejectTaskRequest.ProtoReflect.Descriptor instead. +func (*ProtoRejectTaskRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{5} +} + +func (x *ProtoRejectTaskRequest) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +func (x *ProtoRejectTaskRequest) GetRejectionReason() string { + if x != nil { + return x.RejectionReason + } + return "" +} + +type ProtoTaskGuidRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` +} + +func (x *ProtoTaskGuidRequest) Reset() { + *x = ProtoTaskGuidRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskGuidRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskGuidRequest) ProtoMessage() {} + +func (x *ProtoTaskGuidRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskGuidRequest.ProtoReflect.Descriptor instead. +func (*ProtoTaskGuidRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{6} +} + +func (x *ProtoTaskGuidRequest) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +type ProtoCompleteTaskRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + Failed bool `protobuf:"varint,3,opt,name=failed,proto3" json:"failed,omitempty"` + FailureReason string `protobuf:"bytes,4,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` + Result string `protobuf:"bytes,5,opt,name=result,proto3" json:"result,omitempty"` +} + +func (x *ProtoCompleteTaskRequest) Reset() { + *x = ProtoCompleteTaskRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoCompleteTaskRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoCompleteTaskRequest) ProtoMessage() {} + +func (x *ProtoCompleteTaskRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoCompleteTaskRequest.ProtoReflect.Descriptor instead. +func (*ProtoCompleteTaskRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{7} +} + +func (x *ProtoCompleteTaskRequest) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +func (x *ProtoCompleteTaskRequest) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +func (x *ProtoCompleteTaskRequest) GetFailed() bool { + if x != nil { + return x.Failed + } + return false +} + +func (x *ProtoCompleteTaskRequest) GetFailureReason() string { + if x != nil { + return x.FailureReason + } + return "" +} + +func (x *ProtoCompleteTaskRequest) GetResult() string { + if x != nil { + return x.Result + } + return "" +} + +type ProtoTaskCallbackResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + Failed bool `protobuf:"varint,2,opt,name=failed,proto3" json:"failed,omitempty"` + FailureReason string `protobuf:"bytes,3,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` + Result string `protobuf:"bytes,4,opt,name=result,proto3" json:"result,omitempty"` + Annotation string `protobuf:"bytes,5,opt,name=annotation,proto3" json:"annotation,omitempty"` + CreatedAt int64 `protobuf:"varint,6,opt,name=created_at,proto3" json:"created_at,omitempty"` +} + +func (x *ProtoTaskCallbackResponse) Reset() { + *x = ProtoTaskCallbackResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskCallbackResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskCallbackResponse) ProtoMessage() {} + +func (x *ProtoTaskCallbackResponse) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[8] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskCallbackResponse.ProtoReflect.Descriptor instead. +func (*ProtoTaskCallbackResponse) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{8} +} + +func (x *ProtoTaskCallbackResponse) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +func (x *ProtoTaskCallbackResponse) GetFailed() bool { + if x != nil { + return x.Failed + } + return false +} + +func (x *ProtoTaskCallbackResponse) GetFailureReason() string { + if x != nil { + return x.FailureReason + } + return "" +} + +func (x *ProtoTaskCallbackResponse) GetResult() string { + if x != nil { + return x.Result + } + return "" +} + +func (x *ProtoTaskCallbackResponse) GetAnnotation() string { + if x != nil { + return x.Annotation + } + return "" +} + +func (x *ProtoTaskCallbackResponse) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +type ProtoTasksRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` +} + +func (x *ProtoTasksRequest) Reset() { + *x = ProtoTasksRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTasksRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTasksRequest) ProtoMessage() {} + +func (x *ProtoTasksRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTasksRequest.ProtoReflect.Descriptor instead. +func (*ProtoTasksRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{9} +} + +func (x *ProtoTasksRequest) GetDomain() string { + if x != nil { + return x.Domain + } + return "" +} + +func (x *ProtoTasksRequest) GetCellId() string { + if x != nil { + return x.CellId + } + return "" +} + +type ProtoTasksResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Tasks []*ProtoTask `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks,omitempty"` +} + +func (x *ProtoTasksResponse) Reset() { + *x = ProtoTasksResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTasksResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTasksResponse) ProtoMessage() {} + +func (x *ProtoTasksResponse) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[10] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTasksResponse.ProtoReflect.Descriptor instead. +func (*ProtoTasksResponse) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{10} +} + +func (x *ProtoTasksResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoTasksResponse) GetTasks() []*ProtoTask { + if x != nil { + return x.Tasks + } + return nil +} + +type ProtoTaskByGuidRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` +} + +func (x *ProtoTaskByGuidRequest) Reset() { + *x = ProtoTaskByGuidRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskByGuidRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskByGuidRequest) ProtoMessage() {} + +func (x *ProtoTaskByGuidRequest) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[11] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskByGuidRequest.ProtoReflect.Descriptor instead. +func (*ProtoTaskByGuidRequest) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{11} +} + +func (x *ProtoTaskByGuidRequest) GetTaskGuid() string { + if x != nil { + return x.TaskGuid + } + return "" +} + +type ProtoTaskResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Task *ProtoTask `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"` +} + +func (x *ProtoTaskResponse) Reset() { + *x = ProtoTaskResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_task_requests_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoTaskResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoTaskResponse) ProtoMessage() {} + +func (x *ProtoTaskResponse) ProtoReflect() protoreflect.Message { + mi := &file_task_requests_proto_msgTypes[12] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoTaskResponse.ProtoReflect.Descriptor instead. +func (*ProtoTaskResponse) Descriptor() ([]byte, []int) { + return file_task_requests_proto_rawDescGZIP(), []int{12} +} + +func (x *ProtoTaskResponse) GetError() *ProtoError { + if x != nil { + return x.Error + } + return nil +} + +func (x *ProtoTaskResponse) GetTask() *ProtoTask { + if x != nil { + return x.Task + } + return nil +} + +var File_task_requests_proto protoreflect.FileDescriptor + +var file_task_requests_proto_rawDesc = []byte{ + 0x0a, 0x13, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0a, 0x74, + 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x46, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, + 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x95, + 0x01, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x54, 0x61, + 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x45, 0x0a, 0x0f, 0x74, 0x61, 0x73, + 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x4f, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, + 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x66, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x73, + 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x0c, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x60, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, 0x6c, 0x54, 0x61, 0x73, 0x6b, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, + 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, + 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x3a, 0x02, 0x18, + 0x01, 0x22, 0x62, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, + 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x6a, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x34, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, + 0x73, 0x6b, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, + 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0xaa, 0x01, 0x0a, 0x18, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, + 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, + 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, + 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, + 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0xd1, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x0e, + 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1e, 0x0a, 0x0a, + 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x22, 0x45, 0x0a, 0x11, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, + 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, + 0x5f, 0x69, 0x64, 0x22, 0x67, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x12, 0x27, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x36, 0x0a, 0x16, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x79, 0x47, 0x75, 0x69, 0x64, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x22, 0x64, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, + 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, + 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_task_requests_proto_rawDescOnce sync.Once + file_task_requests_proto_rawDescData = file_task_requests_proto_rawDesc +) + +func file_task_requests_proto_rawDescGZIP() []byte { + file_task_requests_proto_rawDescOnce.Do(func() { + file_task_requests_proto_rawDescData = protoimpl.X.CompressGZIP(file_task_requests_proto_rawDescData) + }) + return file_task_requests_proto_rawDescData +} + +var file_task_requests_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_task_requests_proto_goTypes = []interface{}{ + (*ProtoTaskLifecycleResponse)(nil), // 0: models.ProtoTaskLifecycleResponse + (*ProtoDesireTaskRequest)(nil), // 1: models.ProtoDesireTaskRequest + (*ProtoStartTaskRequest)(nil), // 2: models.ProtoStartTaskRequest + (*ProtoStartTaskResponse)(nil), // 3: models.ProtoStartTaskResponse + (*ProtoFailTaskRequest)(nil), // 4: models.ProtoFailTaskRequest + (*ProtoRejectTaskRequest)(nil), // 5: models.ProtoRejectTaskRequest + (*ProtoTaskGuidRequest)(nil), // 6: models.ProtoTaskGuidRequest + (*ProtoCompleteTaskRequest)(nil), // 7: models.ProtoCompleteTaskRequest + (*ProtoTaskCallbackResponse)(nil), // 8: models.ProtoTaskCallbackResponse + (*ProtoTasksRequest)(nil), // 9: models.ProtoTasksRequest + (*ProtoTasksResponse)(nil), // 10: models.ProtoTasksResponse + (*ProtoTaskByGuidRequest)(nil), // 11: models.ProtoTaskByGuidRequest + (*ProtoTaskResponse)(nil), // 12: models.ProtoTaskResponse + (*ProtoError)(nil), // 13: models.ProtoError + (*ProtoTaskDefinition)(nil), // 14: models.ProtoTaskDefinition + (*ProtoTask)(nil), // 15: models.ProtoTask +} +var file_task_requests_proto_depIdxs = []int32{ + 13, // 0: models.ProtoTaskLifecycleResponse.error:type_name -> models.ProtoError + 14, // 1: models.ProtoDesireTaskRequest.task_definition:type_name -> models.ProtoTaskDefinition + 13, // 2: models.ProtoStartTaskResponse.error:type_name -> models.ProtoError + 13, // 3: models.ProtoTasksResponse.error:type_name -> models.ProtoError + 15, // 4: models.ProtoTasksResponse.tasks:type_name -> models.ProtoTask + 13, // 5: models.ProtoTaskResponse.error:type_name -> models.ProtoError + 15, // 6: models.ProtoTaskResponse.task:type_name -> models.ProtoTask + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name +} + +func init() { file_task_requests_proto_init() } +func file_task_requests_proto_init() { + if File_task_requests_proto != nil { + return + } + file_task_proto_init() + file_error_proto_init() + if !protoimpl.UnsafeEnabled { + file_task_requests_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskLifecycleResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoDesireTaskRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoStartTaskRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoStartTaskResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoFailTaskRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoRejectTaskRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskGuidRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoCompleteTaskRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskCallbackResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTasksRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTasksResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskByGuidRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_task_requests_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoTaskResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_task_requests_proto_rawDesc, + NumEnums: 0, + NumMessages: 13, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_task_requests_proto_goTypes, + DependencyIndexes: file_task_requests_proto_depIdxs, + MessageInfos: file_task_requests_proto_msgTypes, + }.Build() + File_task_requests_proto = out.File + file_task_requests_proto_rawDesc = nil + file_task_requests_proto_goTypes = nil + file_task_requests_proto_depIdxs = nil +} diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go new file mode 100644 index 00000000..83a0856b --- /dev/null +++ b/models/task_requests_bbs.pb.go @@ -0,0 +1,303 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: task_requests.proto + +package models + +// Prevent copylock errors when using ProtoTaskLifecycleResponse directly +type TaskLifecycleResponse struct { + Error *Error +} + +func (x *TaskLifecycleResponse) ToProto() *ProtoTaskLifecycleResponse { + proto := &ProtoTaskLifecycleResponse{ + Error: x.Error.ToProto(), + } + return proto +} + +func TaskLifecycleResponseProtoMap(values []*TaskLifecycleResponse) []*ProtoTaskLifecycleResponse { + result := make([]*ProtoTaskLifecycleResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoDesireTaskRequest directly +type DesireTaskRequest struct { + TaskDefinition *TaskDefinition + TaskGuid string + Domain string +} + +func (x *DesireTaskRequest) ToProto() *ProtoDesireTaskRequest { + proto := &ProtoDesireTaskRequest{ + TaskDefinition: x.TaskDefinition.ToProto(), + TaskGuid: x.TaskGuid, + Domain: x.Domain, + } + return proto +} + +func DesireTaskRequestProtoMap(values []*DesireTaskRequest) []*ProtoDesireTaskRequest { + result := make([]*ProtoDesireTaskRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoStartTaskRequest directly +type StartTaskRequest struct { + TaskGuid string + CellId string +} + +func (x *StartTaskRequest) ToProto() *ProtoStartTaskRequest { + proto := &ProtoStartTaskRequest{ + TaskGuid: x.TaskGuid, + CellId: x.CellId, + } + return proto +} + +func StartTaskRequestProtoMap(values []*StartTaskRequest) []*ProtoStartTaskRequest { + result := make([]*ProtoStartTaskRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoStartTaskResponse directly +type StartTaskResponse struct { + Error *Error + ShouldStart bool +} + +func (x *StartTaskResponse) ToProto() *ProtoStartTaskResponse { + proto := &ProtoStartTaskResponse{ + Error: x.Error.ToProto(), + ShouldStart: x.ShouldStart, + } + return proto +} + +func StartTaskResponseProtoMap(values []*StartTaskResponse) []*ProtoStartTaskResponse { + result := make([]*ProtoStartTaskResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoFailTaskRequest directly +type FailTaskRequest struct { + TaskGuid string + FailureReason string +} + +func (x *FailTaskRequest) ToProto() *ProtoFailTaskRequest { + proto := &ProtoFailTaskRequest{ + TaskGuid: x.TaskGuid, + FailureReason: x.FailureReason, + } + return proto +} + +func FailTaskRequestProtoMap(values []*FailTaskRequest) []*ProtoFailTaskRequest { + result := make([]*ProtoFailTaskRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoRejectTaskRequest directly +type RejectTaskRequest struct { + TaskGuid string + RejectionReason string +} + +func (x *RejectTaskRequest) ToProto() *ProtoRejectTaskRequest { + proto := &ProtoRejectTaskRequest{ + TaskGuid: x.TaskGuid, + RejectionReason: x.RejectionReason, + } + return proto +} + +func RejectTaskRequestProtoMap(values []*RejectTaskRequest) []*ProtoRejectTaskRequest { + result := make([]*ProtoRejectTaskRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTaskGuidRequest directly +type TaskGuidRequest struct { + TaskGuid string +} + +func (x *TaskGuidRequest) ToProto() *ProtoTaskGuidRequest { + proto := &ProtoTaskGuidRequest{ + TaskGuid: x.TaskGuid, + } + return proto +} + +func TaskGuidRequestProtoMap(values []*TaskGuidRequest) []*ProtoTaskGuidRequest { + result := make([]*ProtoTaskGuidRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoCompleteTaskRequest directly +type CompleteTaskRequest struct { + TaskGuid string + CellId string + Failed bool + FailureReason string + Result string +} + +func (x *CompleteTaskRequest) ToProto() *ProtoCompleteTaskRequest { + proto := &ProtoCompleteTaskRequest{ + TaskGuid: x.TaskGuid, + CellId: x.CellId, + Failed: x.Failed, + FailureReason: x.FailureReason, + Result: x.Result, + } + return proto +} + +func CompleteTaskRequestProtoMap(values []*CompleteTaskRequest) []*ProtoCompleteTaskRequest { + result := make([]*ProtoCompleteTaskRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTaskCallbackResponse directly +type TaskCallbackResponse struct { + TaskGuid string + Failed bool + FailureReason string + Result string + Annotation string + CreatedAt int64 +} + +func (x *TaskCallbackResponse) ToProto() *ProtoTaskCallbackResponse { + proto := &ProtoTaskCallbackResponse{ + TaskGuid: x.TaskGuid, + Failed: x.Failed, + FailureReason: x.FailureReason, + Result: x.Result, + Annotation: x.Annotation, + CreatedAt: x.CreatedAt, + } + return proto +} + +func TaskCallbackResponseProtoMap(values []*TaskCallbackResponse) []*ProtoTaskCallbackResponse { + result := make([]*ProtoTaskCallbackResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTasksRequest directly +type TasksRequest struct { + Domain string + CellId string +} + +func (x *TasksRequest) ToProto() *ProtoTasksRequest { + proto := &ProtoTasksRequest{ + Domain: x.Domain, + CellId: x.CellId, + } + return proto +} + +func TasksRequestProtoMap(values []*TasksRequest) []*ProtoTasksRequest { + result := make([]*ProtoTasksRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTasksResponse directly +type TasksResponse struct { + Error *Error + Tasks []*Task +} + +func (x *TasksResponse) ToProto() *ProtoTasksResponse { + proto := &ProtoTasksResponse{ + Error: x.Error.ToProto(), + Tasks: TaskProtoMap(x.Tasks), + } + return proto +} + +func TasksResponseProtoMap(values []*TasksResponse) []*ProtoTasksResponse { + result := make([]*ProtoTasksResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTaskByGuidRequest directly +type TaskByGuidRequest struct { + TaskGuid string +} + +func (x *TaskByGuidRequest) ToProto() *ProtoTaskByGuidRequest { + proto := &ProtoTaskByGuidRequest{ + TaskGuid: x.TaskGuid, + } + return proto +} + +func TaskByGuidRequestProtoMap(values []*TaskByGuidRequest) []*ProtoTaskByGuidRequest { + result := make([]*ProtoTaskByGuidRequest, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoTaskResponse directly +type TaskResponse struct { + Error *Error + Task *Task +} + +func (x *TaskResponse) ToProto() *ProtoTaskResponse { + proto := &ProtoTaskResponse{ + Error: x.Error.ToProto(), + Task: x.Task.ToProto(), + } + return proto +} + +func TaskResponseProtoMap(values []*TaskResponse) []*ProtoTaskResponse { + result := make([]*ProtoTaskResponse, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go new file mode 100644 index 00000000..0c2018bc --- /dev/null +++ b/models/volume_mount.pb.go @@ -0,0 +1,315 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.27.0--rc1 +// source: volume_mount.proto + +package models + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type ProtoSharedDevice struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + VolumeId string `protobuf:"bytes,1,opt,name=volume_id,proto3" json:"volume_id,omitempty"` + MountConfig string `protobuf:"bytes,2,opt,name=mount_config,proto3" json:"mount_config,omitempty"` +} + +func (x *ProtoSharedDevice) Reset() { + *x = ProtoSharedDevice{} + if protoimpl.UnsafeEnabled { + mi := &file_volume_mount_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoSharedDevice) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoSharedDevice) ProtoMessage() {} + +func (x *ProtoSharedDevice) ProtoReflect() protoreflect.Message { + mi := &file_volume_mount_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoSharedDevice.ProtoReflect.Descriptor instead. +func (*ProtoSharedDevice) Descriptor() ([]byte, []int) { + return file_volume_mount_proto_rawDescGZIP(), []int{0} +} + +func (x *ProtoSharedDevice) GetVolumeId() string { + if x != nil { + return x.VolumeId + } + return "" +} + +func (x *ProtoSharedDevice) GetMountConfig() string { + if x != nil { + return x.MountConfig + } + return "" +} + +type ProtoVolumeMount struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Driver string `protobuf:"bytes,1,opt,name=driver,proto3" json:"driver,omitempty"` + ContainerDir string `protobuf:"bytes,3,opt,name=container_dir,proto3" json:"container_dir,omitempty"` + Mode string `protobuf:"bytes,6,opt,name=mode,proto3" json:"mode,omitempty"` + // oneof device { + Shared *ProtoSharedDevice `protobuf:"bytes,7,opt,name=shared,proto3" json:"shared,omitempty"` // } +} + +func (x *ProtoVolumeMount) Reset() { + *x = ProtoVolumeMount{} + if protoimpl.UnsafeEnabled { + mi := &file_volume_mount_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoVolumeMount) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoVolumeMount) ProtoMessage() {} + +func (x *ProtoVolumeMount) ProtoReflect() protoreflect.Message { + mi := &file_volume_mount_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoVolumeMount.ProtoReflect.Descriptor instead. +func (*ProtoVolumeMount) Descriptor() ([]byte, []int) { + return file_volume_mount_proto_rawDescGZIP(), []int{1} +} + +func (x *ProtoVolumeMount) GetDriver() string { + if x != nil { + return x.Driver + } + return "" +} + +func (x *ProtoVolumeMount) GetContainerDir() string { + if x != nil { + return x.ContainerDir + } + return "" +} + +func (x *ProtoVolumeMount) GetMode() string { + if x != nil { + return x.Mode + } + return "" +} + +func (x *ProtoVolumeMount) GetShared() *ProtoSharedDevice { + if x != nil { + return x.Shared + } + return nil +} + +type ProtoVolumePlacement struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DriverNames []string `protobuf:"bytes,1,rep,name=driver_names,proto3" json:"driver_names,omitempty"` +} + +func (x *ProtoVolumePlacement) Reset() { + *x = ProtoVolumePlacement{} + if protoimpl.UnsafeEnabled { + mi := &file_volume_mount_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoVolumePlacement) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoVolumePlacement) ProtoMessage() {} + +func (x *ProtoVolumePlacement) ProtoReflect() protoreflect.Message { + mi := &file_volume_mount_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoVolumePlacement.ProtoReflect.Descriptor instead. +func (*ProtoVolumePlacement) Descriptor() ([]byte, []int) { + return file_volume_mount_proto_rawDescGZIP(), []int{2} +} + +func (x *ProtoVolumePlacement) GetDriverNames() []string { + if x != nil { + return x.DriverNames + } + return nil +} + +var File_volume_mount_proto protoreflect.FileDescriptor + +var file_volume_mount_proto_rawDesc = []byte{ + 0x0a, 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x55, 0x0a, 0x11, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x12, + 0x22, 0x0a, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x22, 0xa9, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, + 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, + 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x64, 0x69, + 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, + 0x65, 0x72, 0x5f, 0x64, 0x69, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x73, 0x68, + 0x61, 0x72, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x44, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x4a, 0x04, 0x08, + 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x22, + 0x3a, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, + 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x72, 0x69, 0x76, 0x65, + 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x64, + 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_volume_mount_proto_rawDescOnce sync.Once + file_volume_mount_proto_rawDescData = file_volume_mount_proto_rawDesc +) + +func file_volume_mount_proto_rawDescGZIP() []byte { + file_volume_mount_proto_rawDescOnce.Do(func() { + file_volume_mount_proto_rawDescData = protoimpl.X.CompressGZIP(file_volume_mount_proto_rawDescData) + }) + return file_volume_mount_proto_rawDescData +} + +var file_volume_mount_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_volume_mount_proto_goTypes = []interface{}{ + (*ProtoSharedDevice)(nil), // 0: models.ProtoSharedDevice + (*ProtoVolumeMount)(nil), // 1: models.ProtoVolumeMount + (*ProtoVolumePlacement)(nil), // 2: models.ProtoVolumePlacement +} +var file_volume_mount_proto_depIdxs = []int32{ + 0, // 0: models.ProtoVolumeMount.shared:type_name -> models.ProtoSharedDevice + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_volume_mount_proto_init() } +func file_volume_mount_proto_init() { + if File_volume_mount_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_volume_mount_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoSharedDevice); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_volume_mount_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoVolumeMount); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_volume_mount_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProtoVolumePlacement); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_volume_mount_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_volume_mount_proto_goTypes, + DependencyIndexes: file_volume_mount_proto_depIdxs, + MessageInfos: file_volume_mount_proto_msgTypes, + }.Build() + File_volume_mount_proto = out.File + file_volume_mount_proto_rawDesc = nil + file_volume_mount_proto_goTypes = nil + file_volume_mount_proto_depIdxs = nil +} diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go new file mode 100644 index 00000000..2982930c --- /dev/null +++ b/models/volume_mount_bbs.pb.go @@ -0,0 +1,75 @@ +// Code generated by protoc-gen-go-bbs. DO NOT EDIT. +// versions: +// - protoc-gen-go-bbs v0.0.1 +// - protoc v5.27.0--rc1 +// source: volume_mount.proto + +package models + +// Prevent copylock errors when using ProtoSharedDevice directly +type SharedDevice struct { + VolumeId string + MountConfig string +} + +func (x *SharedDevice) ToProto() *ProtoSharedDevice { + proto := &ProtoSharedDevice{ + VolumeId: x.VolumeId, + MountConfig: x.MountConfig, + } + return proto +} + +func SharedDeviceProtoMap(values []*SharedDevice) []*ProtoSharedDevice { + result := make([]*ProtoSharedDevice, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoVolumeMount directly +type VolumeMount struct { + Driver string + ContainerDir string + Mode string + Shared *SharedDevice +} + +func (x *VolumeMount) ToProto() *ProtoVolumeMount { + proto := &ProtoVolumeMount{ + Driver: x.Driver, + ContainerDir: x.ContainerDir, + Mode: x.Mode, + Shared: x.Shared.ToProto(), + } + return proto +} + +func VolumeMountProtoMap(values []*VolumeMount) []*ProtoVolumeMount { + result := make([]*ProtoVolumeMount, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +// Prevent copylock errors when using ProtoVolumePlacement directly +type VolumePlacement struct { + DriverNames []string +} + +func (x *VolumePlacement) ToProto() *ProtoVolumePlacement { + proto := &ProtoVolumePlacement{ + DriverNames: x.DriverNames, + } + return proto +} + +func VolumePlacementProtoMap(values []*VolumePlacement) []*ProtoVolumePlacement { + result := make([]*ProtoVolumePlacement, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} From 6e4f60157ab7c3f9fb87693b0fa08850b1fe4c07 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 14:54:14 +0000 Subject: [PATCH 023/155] Support generating accessors (Get/Set) Rearrange some code for scope changes --- protoc-gen-go-bbs/bbs.go | 73 +++++++++++++++++++++++++++++++++++-- protoc-gen-go-bbs/bbs.pb.go | 7 ++-- protoc-gen-go-bbs/bbs.proto | 2 +- protoc-gen-go-bbs/go.mod | 13 +------ protoc-gen-go-bbs/go.sum | 61 +------------------------------ 5 files changed, 78 insertions(+), 78 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index d7e05ee1..01819799 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -17,9 +17,12 @@ type bbsGenerateHelperInterface interface { genToProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) genProtoMapMethod(g *protogen.GeneratedFile, msg *protogen.Message) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) + genAccessors(g *protogen.GeneratedFile, msg *protogen.Message) } type bbsGenerateHelper struct{} +var helper bbsGenerateHelperInterface = bbsGenerateHelper{} + func getUnsafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) string { return g.QualifiedGoIdent(ident) } @@ -34,9 +37,9 @@ func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *proto g.P("// Prevent copylock errors when using ", msg.GoIdent.GoName, " directly") g.P("type ", copysafeName, " struct {") for _, field := range msg.Fields { + options := field.Desc.Options().(*descriptorpb.FieldOptions) if *debug { log.Printf("New Field Detected: %+v\n\n", field) - options := field.Desc.Options().(*descriptorpb.FieldOptions) log.Printf("Field Options: %+v\n\n", options) } @@ -44,6 +47,72 @@ func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *proto g.P(field.GoName, " ", fieldType) } g.P("}") + + helper.genAccessors(g, msg) + } +} + +func (bbsGenerateHelper) genAccessors(g *protogen.GeneratedFile, msg *protogen.Message) { + if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + for _, field := range msg.Fields { + fieldName := field.GoName + fieldType := getActualType(g, field) + options := field.Desc.Options().(*descriptorpb.FieldOptions) + + if *debug { + log.Printf("Generating accessors for %s...\n", fieldName) + } + + if options.GetDeprecated() { + g.P("// DEPRECATED: DO NOT USE") + } + defaultValue := getDefaultValueString(field) + genGetter(g, copysafeName, fieldName, fieldType, defaultValue) + genSetter(g, copysafeName, fieldName, fieldType) + } + } +} + +func genGetter(g *protogen.GeneratedFile, copysafeName string, fieldName string, fieldType string, defaultValue string) { + if *debug { + log.Print("Getter...") + } + g.P("func (m *", copysafeName, ") Get", fieldName, "() ", fieldType, " {") + g.P("if m != nil {") + g.P("return m.", fieldName) + g.P("}") + g.P("return ", defaultValue) + g.P("}") +} + +func genSetter(g *protogen.GeneratedFile, copysafeName string, fieldName string, fieldType string) { + if *debug { + log.Print("Setter...") + } + g.P("func (m *", copysafeName, ") Set", fieldName, "(value ", fieldType, ") {") + g.P("if m != nil {") + g.P("m.", fieldName, " = value") + g.P("}") + g.P("}") +} + +func getDefaultValueString(field *protogen.Field) string { + switch kind := field.Desc.Kind(); kind { + case protoreflect.BytesKind, protoreflect.GroupKind, protoreflect.MessageKind: + return "nil" + case protoreflect.BoolKind: + return "false" + case protoreflect.EnumKind: + return "0" + case protoreflect.DoubleKind, protoreflect.Fixed32Kind, protoreflect.Fixed64Kind, protoreflect.FloatKind, protoreflect.Int32Kind, protoreflect.Sfixed32Kind, protoreflect.Sfixed64Kind, protoreflect.Sint32Kind, protoreflect.Sint64Kind, protoreflect.Uint32Kind, protoreflect.Uint64Kind, protoreflect.Int64Kind: + return "0" + case protoreflect.StringKind: + if field.Desc.Cardinality() == protoreflect.Repeated { + return "nil" + } + return `""` + default: + panic(fmt.Sprintf("Unrecognized type: %s", kind)) } } @@ -174,8 +243,6 @@ func (bbsGenerateHelper) genProtoMapMethod(g *protogen.GeneratedFile, msg *proto } } -var helper bbsGenerateHelperInterface = bbsGenerateHelper{} - func generateFile(plugin *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile { filename := file.GeneratedFilenamePrefix + "_bbs.pb.go" g := plugin.NewGeneratedFile(filename, file.GoImportPath) diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 6d7aa073..26c6363c 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -68,10 +68,11 @@ var file_bbs_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, + 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x2d, 0x5a, 0x2b, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, + 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x62, 0x62, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var file_bbs_proto_goTypes = []interface{}{ diff --git a/protoc-gen-go-bbs/bbs.proto b/protoc-gen-go-bbs/bbs.proto index 1181f36c..150c8c40 100644 --- a/protoc-gen-go-bbs/bbs.proto +++ b/protoc-gen-go-bbs/bbs.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bbs; -option go_package="main"; +option go_package="code.cloudfoundry.org/bbs/models"; import "google/protobuf/descriptor.proto"; diff --git a/protoc-gen-go-bbs/go.mod b/protoc-gen-go-bbs/go.mod index 1bdafbde..c44ff9c0 100644 --- a/protoc-gen-go-bbs/go.mod +++ b/protoc-gen-go-bbs/go.mod @@ -2,15 +2,4 @@ module code.cloudfoundry.org/bbs/protoc-gen-go-bbs go 1.22.2 -require google.golang.org/protobuf v1.33.0 - -require ( - code.cloudfoundry.org/bbs v0.0.0-20240418184526-a7ed0dccd9f7 // indirect - code.cloudfoundry.org/lager/v3 v3.0.3 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect - github.com/onsi/ginkgo/v2 v2.13.2 // indirect - github.com/openzipkin/zipkin-go v0.4.2 // indirect - golang.org/x/tools v0.14.0 // indirect -) +require google.golang.org/protobuf v1.34.0 diff --git a/protoc-gen-go-bbs/go.sum b/protoc-gen-go-bbs/go.sum index 793164b2..1bfbf95c 100644 --- a/protoc-gen-go-bbs/go.sum +++ b/protoc-gen-go-bbs/go.sum @@ -1,63 +1,6 @@ -code.cloudfoundry.org/bbs v0.0.0-20240418184526-a7ed0dccd9f7 h1:vmwkTM1T0Hx6V4LgOGrU6dgkwNNJg5yf8Wyk1I6ptpg= -code.cloudfoundry.org/bbs v0.0.0-20240418184526-a7ed0dccd9f7/go.mod h1:XKlGVVXFi5EcHHMPzw3xgONK9PeEZuUbIC43XNwxD10= -code.cloudfoundry.org/lager/v3 v3.0.3 h1:/UTmadZfIaKuT/whEinSxK1mzRfNu1uPfvjFfGqiwzM= -code.cloudfoundry.org/lager/v3 v3.0.3/go.mod h1:Zn5q1SrIuuHjEUE7xerMKt3ztunrJQCZETAo7rV0CH8= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs= -github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= -github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= -github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= -golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= +google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= From 816650a7bbac3ce0357406ae6078b1713414eec1 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 15:03:29 +0000 Subject: [PATCH 024/155] Import bbs.proto for enum customname extension Regen protos --- models/actions_bbs.pb.go | 543 ++++++++++++++ models/actual_lrp_bbs.pb.go | 330 +++++++++ models/actual_lrp_requests_bbs.pb.go | 385 ++++++++++ models/cached_dependency_bbs.pb.go | 77 ++ models/cells_bbs.pb.go | 165 +++++ models/certificate_properties_bbs.pb.go | 11 + models/check_definition_bbs.pb.go | 132 ++++ models/desired_lrp_bbs.pb.go | 925 ++++++++++++++++++++++++ models/desired_lrp_requests_bbs.pb.go | 176 +++++ models/domain_bbs.pb.go | 55 ++ models/environment_variables_bbs.pb.go | 22 + models/error_bbs.pb.go | 22 + models/evacuation_bbs.pb.go | 209 ++++++ models/events_bbs.pb.go | 440 +++++++++++ models/image_layer.pb.go | 85 ++- models/image_layer.proto | 1 + models/image_layer_bbs.pb.go | 93 ++- models/log_rate_limit_bbs.pb.go | 11 + models/metric_tags.pb.go | 38 +- models/metric_tags.proto | 1 + models/metric_tags_bbs.pb.go | 28 +- models/modification_tag_bbs.pb.go | 22 + models/network_bbs.pb.go | 11 + models/ping_bbs.pb.go | 11 + models/security_group_bbs.pb.go | 121 ++++ models/sidecar_bbs.pb.go | 33 + models/task_bbs.pb.go | 442 +++++++++++ models/task_requests_bbs.pb.go | 341 +++++++++ models/volume_mount_bbs.pb.go | 77 ++ 29 files changed, 4743 insertions(+), 64 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index df3099a6..1b3d85bc 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -19,6 +19,105 @@ type Action struct { CodependentAction *CodependentAction } +func (m *Action) GetDownloadAction() *DownloadAction { + if m != nil { + return m.DownloadAction + } + return nil +} +func (m *Action) SetDownloadAction(value *DownloadAction) { + if m != nil { + m.DownloadAction = value + } +} +func (m *Action) GetUploadAction() *UploadAction { + if m != nil { + return m.UploadAction + } + return nil +} +func (m *Action) SetUploadAction(value *UploadAction) { + if m != nil { + m.UploadAction = value + } +} +func (m *Action) GetRunAction() *RunAction { + if m != nil { + return m.RunAction + } + return nil +} +func (m *Action) SetRunAction(value *RunAction) { + if m != nil { + m.RunAction = value + } +} +func (m *Action) GetTimeoutAction() *TimeoutAction { + if m != nil { + return m.TimeoutAction + } + return nil +} +func (m *Action) SetTimeoutAction(value *TimeoutAction) { + if m != nil { + m.TimeoutAction = value + } +} +func (m *Action) GetEmitProgressAction() *EmitProgressAction { + if m != nil { + return m.EmitProgressAction + } + return nil +} +func (m *Action) SetEmitProgressAction(value *EmitProgressAction) { + if m != nil { + m.EmitProgressAction = value + } +} +func (m *Action) GetTryAction() *TryAction { + if m != nil { + return m.TryAction + } + return nil +} +func (m *Action) SetTryAction(value *TryAction) { + if m != nil { + m.TryAction = value + } +} +func (m *Action) GetParallelAction() *ParallelAction { + if m != nil { + return m.ParallelAction + } + return nil +} +func (m *Action) SetParallelAction(value *ParallelAction) { + if m != nil { + m.ParallelAction = value + } +} +func (m *Action) GetSerialAction() *SerialAction { + if m != nil { + return m.SerialAction + } + return nil +} +func (m *Action) SetSerialAction(value *SerialAction) { + if m != nil { + m.SerialAction = value + } +} +func (m *Action) GetCodependentAction() *CodependentAction { + if m != nil { + return m.CodependentAction + } + return nil +} +func (m *Action) SetCodependentAction(value *CodependentAction) { + if m != nil { + m.CodependentAction = value + } +} func (x *Action) ToProto() *ProtoAction { proto := &ProtoAction{ DownloadAction: x.DownloadAction.ToProto(), @@ -54,6 +153,94 @@ type DownloadAction struct { ChecksumValue string } +func (m *DownloadAction) GetArtifact() string { + if m != nil { + return m.Artifact + } + return "" +} +func (m *DownloadAction) SetArtifact(value string) { + if m != nil { + m.Artifact = value + } +} +func (m *DownloadAction) GetFrom() string { + if m != nil { + return m.From + } + return "" +} +func (m *DownloadAction) SetFrom(value string) { + if m != nil { + m.From = value + } +} +func (m *DownloadAction) GetTo() string { + if m != nil { + return m.To + } + return "" +} +func (m *DownloadAction) SetTo(value string) { + if m != nil { + m.To = value + } +} +func (m *DownloadAction) GetCacheKey() string { + if m != nil { + return m.CacheKey + } + return "" +} +func (m *DownloadAction) SetCacheKey(value string) { + if m != nil { + m.CacheKey = value + } +} +func (m *DownloadAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *DownloadAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *DownloadAction) GetUser() string { + if m != nil { + return m.User + } + return "" +} +func (m *DownloadAction) SetUser(value string) { + if m != nil { + m.User = value + } +} +func (m *DownloadAction) GetChecksumAlgorithm() string { + if m != nil { + return m.ChecksumAlgorithm + } + return "" +} +func (m *DownloadAction) SetChecksumAlgorithm(value string) { + if m != nil { + m.ChecksumAlgorithm = value + } +} +func (m *DownloadAction) GetChecksumValue() string { + if m != nil { + return m.ChecksumValue + } + return "" +} +func (m *DownloadAction) SetChecksumValue(value string) { + if m != nil { + m.ChecksumValue = value + } +} func (x *DownloadAction) ToProto() *ProtoDownloadAction { proto := &ProtoDownloadAction{ Artifact: x.Artifact, @@ -85,6 +272,61 @@ type UploadAction struct { User string } +func (m *UploadAction) GetArtifact() string { + if m != nil { + return m.Artifact + } + return "" +} +func (m *UploadAction) SetArtifact(value string) { + if m != nil { + m.Artifact = value + } +} +func (m *UploadAction) GetFrom() string { + if m != nil { + return m.From + } + return "" +} +func (m *UploadAction) SetFrom(value string) { + if m != nil { + m.From = value + } +} +func (m *UploadAction) GetTo() string { + if m != nil { + return m.To + } + return "" +} +func (m *UploadAction) SetTo(value string) { + if m != nil { + m.To = value + } +} +func (m *UploadAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *UploadAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *UploadAction) GetUser() string { + if m != nil { + return m.User + } + return "" +} +func (m *UploadAction) SetUser(value string) { + if m != nil { + m.User = value + } +} func (x *UploadAction) ToProto() *ProtoUploadAction { proto := &ProtoUploadAction{ Artifact: x.Artifact, @@ -116,6 +358,94 @@ type RunAction struct { SuppressLogOutput bool } +func (m *RunAction) GetPath() string { + if m != nil { + return m.Path + } + return "" +} +func (m *RunAction) SetPath(value string) { + if m != nil { + m.Path = value + } +} +func (m *RunAction) GetArgs() []string { + if m != nil { + return m.Args + } + return nil +} +func (m *RunAction) SetArgs(value []string) { + if m != nil { + m.Args = value + } +} +func (m *RunAction) GetDir() string { + if m != nil { + return m.Dir + } + return "" +} +func (m *RunAction) SetDir(value string) { + if m != nil { + m.Dir = value + } +} +func (m *RunAction) GetEnv() []*EnvironmentVariable { + if m != nil { + return m.Env + } + return nil +} +func (m *RunAction) SetEnv(value []*EnvironmentVariable) { + if m != nil { + m.Env = value + } +} +func (m *RunAction) GetResourceLimits() *ResourceLimits { + if m != nil { + return m.ResourceLimits + } + return nil +} +func (m *RunAction) SetResourceLimits(value *ResourceLimits) { + if m != nil { + m.ResourceLimits = value + } +} +func (m *RunAction) GetUser() string { + if m != nil { + return m.User + } + return "" +} +func (m *RunAction) SetUser(value string) { + if m != nil { + m.User = value + } +} +func (m *RunAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *RunAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *RunAction) GetSuppressLogOutput() bool { + if m != nil { + return m.SuppressLogOutput + } + return false +} +func (m *RunAction) SetSuppressLogOutput(value bool) { + if m != nil { + m.SuppressLogOutput = value + } +} func (x *RunAction) ToProto() *ProtoRunAction { proto := &ProtoRunAction{ Path: x.Path, @@ -146,6 +476,52 @@ type TimeoutAction struct { TimeoutMs int64 } +func (m *TimeoutAction) GetAction() *Action { + if m != nil { + return m.Action + } + return nil +} +func (m *TimeoutAction) SetAction(value *Action) { + if m != nil { + m.Action = value + } +} + +// DEPRECATED: DO NOT USE +func (m *TimeoutAction) GetDeprecatedTimeoutNs() int64 { + if m != nil { + return m.DeprecatedTimeoutNs + } + return 0 +} +func (m *TimeoutAction) SetDeprecatedTimeoutNs(value int64) { + if m != nil { + m.DeprecatedTimeoutNs = value + } +} +func (m *TimeoutAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *TimeoutAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *TimeoutAction) GetTimeoutMs() int64 { + if m != nil { + return m.TimeoutMs + } + return 0 +} +func (m *TimeoutAction) SetTimeoutMs(value int64) { + if m != nil { + m.TimeoutMs = value + } +} func (x *TimeoutAction) ToProto() *ProtoTimeoutAction { proto := &ProtoTimeoutAction{ Action: x.Action.ToProto(), @@ -173,6 +549,61 @@ type EmitProgressAction struct { LogSource string } +func (m *EmitProgressAction) GetAction() *Action { + if m != nil { + return m.Action + } + return nil +} +func (m *EmitProgressAction) SetAction(value *Action) { + if m != nil { + m.Action = value + } +} +func (m *EmitProgressAction) GetStartMessage() string { + if m != nil { + return m.StartMessage + } + return "" +} +func (m *EmitProgressAction) SetStartMessage(value string) { + if m != nil { + m.StartMessage = value + } +} +func (m *EmitProgressAction) GetSuccessMessage() string { + if m != nil { + return m.SuccessMessage + } + return "" +} +func (m *EmitProgressAction) SetSuccessMessage(value string) { + if m != nil { + m.SuccessMessage = value + } +} +func (m *EmitProgressAction) GetFailureMessagePrefix() string { + if m != nil { + return m.FailureMessagePrefix + } + return "" +} +func (m *EmitProgressAction) SetFailureMessagePrefix(value string) { + if m != nil { + m.FailureMessagePrefix = value + } +} +func (m *EmitProgressAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *EmitProgressAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} func (x *EmitProgressAction) ToProto() *ProtoEmitProgressAction { proto := &ProtoEmitProgressAction{ Action: x.Action.ToProto(), @@ -198,6 +629,28 @@ type TryAction struct { LogSource string } +func (m *TryAction) GetAction() *Action { + if m != nil { + return m.Action + } + return nil +} +func (m *TryAction) SetAction(value *Action) { + if m != nil { + m.Action = value + } +} +func (m *TryAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *TryAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} func (x *TryAction) ToProto() *ProtoTryAction { proto := &ProtoTryAction{ Action: x.Action.ToProto(), @@ -220,6 +673,28 @@ type ParallelAction struct { LogSource string } +func (m *ParallelAction) GetActions() []*Action { + if m != nil { + return m.Actions + } + return nil +} +func (m *ParallelAction) SetActions(value []*Action) { + if m != nil { + m.Actions = value + } +} +func (m *ParallelAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *ParallelAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} func (x *ParallelAction) ToProto() *ProtoParallelAction { proto := &ProtoParallelAction{ Actions: ActionProtoMap(x.Actions), @@ -242,6 +717,28 @@ type SerialAction struct { LogSource string } +func (m *SerialAction) GetActions() []*Action { + if m != nil { + return m.Actions + } + return nil +} +func (m *SerialAction) SetActions(value []*Action) { + if m != nil { + m.Actions = value + } +} +func (m *SerialAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *SerialAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} func (x *SerialAction) ToProto() *ProtoSerialAction { proto := &ProtoSerialAction{ Actions: ActionProtoMap(x.Actions), @@ -264,6 +761,28 @@ type CodependentAction struct { LogSource string } +func (m *CodependentAction) GetActions() []*Action { + if m != nil { + return m.Actions + } + return nil +} +func (m *CodependentAction) SetActions(value []*Action) { + if m != nil { + m.Actions = value + } +} +func (m *CodependentAction) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *CodependentAction) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} func (x *CodependentAction) ToProto() *ProtoCodependentAction { proto := &ProtoCodependentAction{ Actions: ActionProtoMap(x.Actions), @@ -286,6 +805,30 @@ type ResourceLimits struct { Nproc uint64 } +func (m *ResourceLimits) GetNofile() uint64 { + if m != nil { + return m.Nofile + } + return 0 +} +func (m *ResourceLimits) SetNofile(value uint64) { + if m != nil { + m.Nofile = value + } +} + +// DEPRECATED: DO NOT USE +func (m *ResourceLimits) GetNproc() uint64 { + if m != nil { + return m.Nproc + } + return 0 +} +func (m *ResourceLimits) SetNproc(value uint64) { + if m != nil { + m.Nproc = value + } +} func (x *ResourceLimits) ToProto() *ProtoResourceLimits { proto := &ProtoResourceLimits{ Nofile: &x.Nofile, diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index ca459f05..655217fa 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -12,6 +12,28 @@ type ActualLRPGroup struct { Evacuating *ActualLRP } +func (m *ActualLRPGroup) GetInstance() *ActualLRP { + if m != nil { + return m.Instance + } + return nil +} +func (m *ActualLRPGroup) SetInstance(value *ActualLRP) { + if m != nil { + m.Instance = value + } +} +func (m *ActualLRPGroup) GetEvacuating() *ActualLRP { + if m != nil { + return m.Evacuating + } + return nil +} +func (m *ActualLRPGroup) SetEvacuating(value *ActualLRP) { + if m != nil { + m.Evacuating = value + } +} func (x *ActualLRPGroup) ToProto() *ProtoActualLRPGroup { proto := &ProtoActualLRPGroup{ Instance: x.Instance.ToProto(), @@ -36,6 +58,50 @@ type PortMapping struct { HostTlsProxyPort uint32 } +func (m *PortMapping) GetContainerPort() uint32 { + if m != nil { + return m.ContainerPort + } + return 0 +} +func (m *PortMapping) SetContainerPort(value uint32) { + if m != nil { + m.ContainerPort = value + } +} +func (m *PortMapping) GetHostPort() uint32 { + if m != nil { + return m.HostPort + } + return 0 +} +func (m *PortMapping) SetHostPort(value uint32) { + if m != nil { + m.HostPort = value + } +} +func (m *PortMapping) GetContainerTlsProxyPort() uint32 { + if m != nil { + return m.ContainerTlsProxyPort + } + return 0 +} +func (m *PortMapping) SetContainerTlsProxyPort(value uint32) { + if m != nil { + m.ContainerTlsProxyPort = value + } +} +func (m *PortMapping) GetHostTlsProxyPort() uint32 { + if m != nil { + return m.HostTlsProxyPort + } + return 0 +} +func (m *PortMapping) SetHostTlsProxyPort(value uint32) { + if m != nil { + m.HostTlsProxyPort = value + } +} func (x *PortMapping) ToProto() *ProtoPortMapping { proto := &ProtoPortMapping{ ContainerPort: x.ContainerPort, @@ -61,6 +127,39 @@ type ActualLRPKey struct { Domain string } +func (m *ActualLRPKey) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *ActualLRPKey) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *ActualLRPKey) GetIndex() int32 { + if m != nil { + return m.Index + } + return 0 +} +func (m *ActualLRPKey) SetIndex(value int32) { + if m != nil { + m.Index = value + } +} +func (m *ActualLRPKey) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *ActualLRPKey) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} func (x *ActualLRPKey) ToProto() *ProtoActualLRPKey { proto := &ProtoActualLRPKey{ ProcessGuid: x.ProcessGuid, @@ -84,6 +183,28 @@ type ActualLRPInstanceKey struct { CellId string } +func (m *ActualLRPInstanceKey) GetInstanceGuid() string { + if m != nil { + return m.InstanceGuid + } + return "" +} +func (m *ActualLRPInstanceKey) SetInstanceGuid(value string) { + if m != nil { + m.InstanceGuid = value + } +} +func (m *ActualLRPInstanceKey) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *ActualLRPInstanceKey) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} func (x *ActualLRPInstanceKey) ToProto() *ProtoActualLRPInstanceKey { proto := &ProtoActualLRPInstanceKey{ InstanceGuid: x.InstanceGuid, @@ -116,6 +237,50 @@ type ActualLRPNetInfo struct { PreferredAddress ActualLRPNetInfo_PreferredAddress } +func (m *ActualLRPNetInfo) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} +func (m *ActualLRPNetInfo) SetAddress(value string) { + if m != nil { + m.Address = value + } +} +func (m *ActualLRPNetInfo) GetPorts() []*PortMapping { + if m != nil { + return m.Ports + } + return nil +} +func (m *ActualLRPNetInfo) SetPorts(value []*PortMapping) { + if m != nil { + m.Ports = value + } +} +func (m *ActualLRPNetInfo) GetInstanceAddress() string { + if m != nil { + return m.InstanceAddress + } + return "" +} +func (m *ActualLRPNetInfo) SetInstanceAddress(value string) { + if m != nil { + m.InstanceAddress = value + } +} +func (m *ActualLRPNetInfo) GetPreferredAddress() ActualLRPNetInfo_PreferredAddress { + if m != nil { + return m.PreferredAddress + } + return 0 +} +func (m *ActualLRPNetInfo) SetPreferredAddress(value ActualLRPNetInfo_PreferredAddress) { + if m != nil { + m.PreferredAddress = value + } +} func (x *ActualLRPNetInfo) ToProto() *ProtoActualLRPNetInfo { proto := &ProtoActualLRPNetInfo{ Address: x.Address, @@ -139,6 +304,17 @@ type ActualLRPInternalRoute struct { Hostname string } +func (m *ActualLRPInternalRoute) GetHostname() string { + if m != nil { + return m.Hostname + } + return "" +} +func (m *ActualLRPInternalRoute) SetHostname(value string) { + if m != nil { + m.Hostname = value + } +} func (x *ActualLRPInternalRoute) ToProto() *ProtoActualLRPInternalRoute { proto := &ProtoActualLRPInternalRoute{ Hostname: x.Hostname, @@ -180,6 +356,160 @@ type ActualLRP struct { AvailabilityZone string } +func (m *ActualLRP) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *ActualLRP) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *ActualLRP) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *ActualLRP) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} +func (m *ActualLRP) GetActualLrpNetInfo() *ActualLRPNetInfo { + if m != nil { + return m.ActualLrpNetInfo + } + return nil +} +func (m *ActualLRP) SetActualLrpNetInfo(value *ActualLRPNetInfo) { + if m != nil { + m.ActualLrpNetInfo = value + } +} +func (m *ActualLRP) GetCrashCount() int32 { + if m != nil { + return m.CrashCount + } + return 0 +} +func (m *ActualLRP) SetCrashCount(value int32) { + if m != nil { + m.CrashCount = value + } +} +func (m *ActualLRP) GetCrashReason() string { + if m != nil { + return m.CrashReason + } + return "" +} +func (m *ActualLRP) SetCrashReason(value string) { + if m != nil { + m.CrashReason = value + } +} +func (m *ActualLRP) GetState() string { + if m != nil { + return m.State + } + return "" +} +func (m *ActualLRP) SetState(value string) { + if m != nil { + m.State = value + } +} +func (m *ActualLRP) GetPlacementError() string { + if m != nil { + return m.PlacementError + } + return "" +} +func (m *ActualLRP) SetPlacementError(value string) { + if m != nil { + m.PlacementError = value + } +} +func (m *ActualLRP) GetSince() int64 { + if m != nil { + return m.Since + } + return 0 +} +func (m *ActualLRP) SetSince(value int64) { + if m != nil { + m.Since = value + } +} +func (m *ActualLRP) GetModificationTag() *ModificationTag { + if m != nil { + return m.ModificationTag + } + return nil +} +func (m *ActualLRP) SetModificationTag(value *ModificationTag) { + if m != nil { + m.ModificationTag = value + } +} +func (m *ActualLRP) GetPresence() ActualLRP_Presence { + if m != nil { + return m.Presence + } + return 0 +} +func (m *ActualLRP) SetPresence(value ActualLRP_Presence) { + if m != nil { + m.Presence = value + } +} +func (m *ActualLRP) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { + if m != nil { + return m.ActualLrpInternalRoutes + } + return nil +} +func (m *ActualLRP) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { + if m != nil { + m.ActualLrpInternalRoutes = value + } +} +func (m *ActualLRP) GetMetricTags() map[string]string { + if m != nil { + return m.MetricTags + } + return nil +} +func (m *ActualLRP) SetMetricTags(value map[string]string) { + if m != nil { + m.MetricTags = value + } +} +func (m *ActualLRP) GetRoutable() bool { + if m != nil { + return m.Routable + } + return false +} +func (m *ActualLRP) SetRoutable(value bool) { + if m != nil { + m.Routable = value + } +} +func (m *ActualLRP) GetAvailabilityZone() string { + if m != nil { + return m.AvailabilityZone + } + return "" +} +func (m *ActualLRP) SetAvailabilityZone(value string) { + if m != nil { + m.AvailabilityZone = value + } +} func (x *ActualLRP) ToProto() *ProtoActualLRP { proto := &ProtoActualLRP{ ActualLrpKey: x.ActualLrpKey.ToProto(), diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 62d2cc58..0ecadca8 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -11,6 +11,17 @@ type ActualLRPLifecycleResponse struct { Error *Error } +func (m *ActualLRPLifecycleResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *ActualLRPLifecycleResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} func (x *ActualLRPLifecycleResponse) ToProto() *ProtoActualLRPLifecycleResponse { proto := &ProtoActualLRPLifecycleResponse{ Error: x.Error.ToProto(), @@ -32,6 +43,28 @@ type ActualLRPGroupsResponse struct { ActualLrpGroups []*ActualLRPGroup } +func (m *ActualLRPGroupsResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *ActualLRPGroupsResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *ActualLRPGroupsResponse) GetActualLrpGroups() []*ActualLRPGroup { + if m != nil { + return m.ActualLrpGroups + } + return nil +} +func (m *ActualLRPGroupsResponse) SetActualLrpGroups(value []*ActualLRPGroup) { + if m != nil { + m.ActualLrpGroups = value + } +} func (x *ActualLRPGroupsResponse) ToProto() *ProtoActualLRPGroupsResponse { proto := &ProtoActualLRPGroupsResponse{ Error: x.Error.ToProto(), @@ -54,6 +87,28 @@ type ActualLRPGroupResponse struct { ActualLrpGroup *ActualLRPGroup } +func (m *ActualLRPGroupResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *ActualLRPGroupResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *ActualLRPGroupResponse) GetActualLrpGroup() *ActualLRPGroup { + if m != nil { + return m.ActualLrpGroup + } + return nil +} +func (m *ActualLRPGroupResponse) SetActualLrpGroup(value *ActualLRPGroup) { + if m != nil { + m.ActualLrpGroup = value + } +} func (x *ActualLRPGroupResponse) ToProto() *ProtoActualLRPGroupResponse { proto := &ProtoActualLRPGroupResponse{ Error: x.Error.ToProto(), @@ -76,6 +131,28 @@ type ActualLRPGroupsRequest struct { CellId string } +func (m *ActualLRPGroupsRequest) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *ActualLRPGroupsRequest) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *ActualLRPGroupsRequest) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *ActualLRPGroupsRequest) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} func (x *ActualLRPGroupsRequest) ToProto() *ProtoActualLRPGroupsRequest { proto := &ProtoActualLRPGroupsRequest{ Domain: x.Domain, @@ -97,6 +174,17 @@ type ActualLRPGroupsByProcessGuidRequest struct { ProcessGuid string } +func (m *ActualLRPGroupsByProcessGuidRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *ActualLRPGroupsByProcessGuidRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} func (x *ActualLRPGroupsByProcessGuidRequest) ToProto() *ProtoActualLRPGroupsByProcessGuidRequest { proto := &ProtoActualLRPGroupsByProcessGuidRequest{ ProcessGuid: x.ProcessGuid, @@ -118,6 +206,28 @@ type ActualLRPGroupByProcessGuidAndIndexRequest struct { Index int32 } +func (m *ActualLRPGroupByProcessGuidAndIndexRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *ActualLRPGroupByProcessGuidAndIndexRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *ActualLRPGroupByProcessGuidAndIndexRequest) GetIndex() int32 { + if m != nil { + return m.Index + } + return 0 +} +func (m *ActualLRPGroupByProcessGuidAndIndexRequest) SetIndex(value int32) { + if m != nil { + m.Index = value + } +} func (x *ActualLRPGroupByProcessGuidAndIndexRequest) ToProto() *ProtoActualLRPGroupByProcessGuidAndIndexRequest { proto := &ProtoActualLRPGroupByProcessGuidAndIndexRequest{ ProcessGuid: x.ProcessGuid, @@ -141,6 +251,39 @@ type ClaimActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (m *ClaimActualLRPRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *ClaimActualLRPRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *ClaimActualLRPRequest) GetIndex() int32 { + if m != nil { + return m.Index + } + return 0 +} +func (m *ClaimActualLRPRequest) SetIndex(value int32) { + if m != nil { + m.Index = value + } +} +func (m *ClaimActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *ClaimActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} func (x *ClaimActualLRPRequest) ToProto() *ProtoClaimActualLRPRequest { proto := &ProtoClaimActualLRPRequest{ ProcessGuid: x.ProcessGuid, @@ -169,6 +312,83 @@ type StartActualLRPRequest struct { AvailabilityZone string } +func (m *StartActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *StartActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *StartActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *StartActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} +func (m *StartActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { + if m != nil { + return m.ActualLrpNetInfo + } + return nil +} +func (m *StartActualLRPRequest) SetActualLrpNetInfo(value *ActualLRPNetInfo) { + if m != nil { + m.ActualLrpNetInfo = value + } +} +func (m *StartActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { + if m != nil { + return m.ActualLrpInternalRoutes + } + return nil +} +func (m *StartActualLRPRequest) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { + if m != nil { + m.ActualLrpInternalRoutes = value + } +} +func (m *StartActualLRPRequest) GetMetricTags() map[string]string { + if m != nil { + return m.MetricTags + } + return nil +} +func (m *StartActualLRPRequest) SetMetricTags(value map[string]string) { + if m != nil { + m.MetricTags = value + } +} +func (m *StartActualLRPRequest) GetRoutable() bool { + if m != nil { + return m.Routable + } + return false +} +func (m *StartActualLRPRequest) SetRoutable(value bool) { + if m != nil { + m.Routable = value + } +} +func (m *StartActualLRPRequest) GetAvailabilityZone() string { + if m != nil { + return m.AvailabilityZone + } + return "" +} +func (m *StartActualLRPRequest) SetAvailabilityZone(value string) { + if m != nil { + m.AvailabilityZone = value + } +} func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { proto := &ProtoStartActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -197,6 +417,39 @@ type CrashActualLRPRequest struct { ErrorMessage string } +func (m *CrashActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *CrashActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *CrashActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *CrashActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} +func (m *CrashActualLRPRequest) GetErrorMessage() string { + if m != nil { + return m.ErrorMessage + } + return "" +} +func (m *CrashActualLRPRequest) SetErrorMessage(value string) { + if m != nil { + m.ErrorMessage = value + } +} func (x *CrashActualLRPRequest) ToProto() *ProtoCrashActualLRPRequest { proto := &ProtoCrashActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -220,6 +473,28 @@ type FailActualLRPRequest struct { ErrorMessage string } +func (m *FailActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *FailActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *FailActualLRPRequest) GetErrorMessage() string { + if m != nil { + return m.ErrorMessage + } + return "" +} +func (m *FailActualLRPRequest) SetErrorMessage(value string) { + if m != nil { + m.ErrorMessage = value + } +} func (x *FailActualLRPRequest) ToProto() *ProtoFailActualLRPRequest { proto := &ProtoFailActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -241,6 +516,17 @@ type RetireActualLRPRequest struct { ActualLrpKey *ActualLRPKey } +func (m *RetireActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *RetireActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} func (x *RetireActualLRPRequest) ToProto() *ProtoRetireActualLRPRequest { proto := &ProtoRetireActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -263,6 +549,39 @@ type RemoveActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (m *RemoveActualLRPRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *RemoveActualLRPRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *RemoveActualLRPRequest) GetIndex() int32 { + if m != nil { + return m.Index + } + return 0 +} +func (m *RemoveActualLRPRequest) SetIndex(value int32) { + if m != nil { + m.Index = value + } +} +func (m *RemoveActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *RemoveActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} func (x *RemoveActualLRPRequest) ToProto() *ProtoRemoveActualLRPRequest { proto := &ProtoRemoveActualLRPRequest{ ProcessGuid: x.ProcessGuid, @@ -286,6 +605,28 @@ type ActualLRPsResponse struct { ActualLrps []*ActualLRP } +func (m *ActualLRPsResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *ActualLRPsResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *ActualLRPsResponse) GetActualLrps() []*ActualLRP { + if m != nil { + return m.ActualLrps + } + return nil +} +func (m *ActualLRPsResponse) SetActualLrps(value []*ActualLRP) { + if m != nil { + m.ActualLrps = value + } +} func (x *ActualLRPsResponse) ToProto() *ProtoActualLRPsResponse { proto := &ProtoActualLRPsResponse{ Error: x.Error.ToProto(), @@ -310,6 +651,50 @@ type ActualLRPsRequest struct { Index int32 } +func (m *ActualLRPsRequest) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *ActualLRPsRequest) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *ActualLRPsRequest) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *ActualLRPsRequest) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} +func (m *ActualLRPsRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *ActualLRPsRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *ActualLRPsRequest) GetIndex() int32 { + if m != nil { + return m.Index + } + return 0 +} +func (m *ActualLRPsRequest) SetIndex(value int32) { + if m != nil { + m.Index = value + } +} func (x *ActualLRPsRequest) ToProto() *ProtoActualLRPsRequest { proto := &ProtoActualLRPsRequest{ Domain: x.Domain, diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 108f5ba8..487a248b 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -17,6 +17,83 @@ type CachedDependency struct { ChecksumValue string } +func (m *CachedDependency) GetName() string { + if m != nil { + return m.Name + } + return "" +} +func (m *CachedDependency) SetName(value string) { + if m != nil { + m.Name = value + } +} +func (m *CachedDependency) GetFrom() string { + if m != nil { + return m.From + } + return "" +} +func (m *CachedDependency) SetFrom(value string) { + if m != nil { + m.From = value + } +} +func (m *CachedDependency) GetTo() string { + if m != nil { + return m.To + } + return "" +} +func (m *CachedDependency) SetTo(value string) { + if m != nil { + m.To = value + } +} +func (m *CachedDependency) GetCacheKey() string { + if m != nil { + return m.CacheKey + } + return "" +} +func (m *CachedDependency) SetCacheKey(value string) { + if m != nil { + m.CacheKey = value + } +} +func (m *CachedDependency) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *CachedDependency) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *CachedDependency) GetChecksumAlgorithm() string { + if m != nil { + return m.ChecksumAlgorithm + } + return "" +} +func (m *CachedDependency) SetChecksumAlgorithm(value string) { + if m != nil { + m.ChecksumAlgorithm = value + } +} +func (m *CachedDependency) GetChecksumValue() string { + if m != nil { + return m.ChecksumValue + } + return "" +} +func (m *CachedDependency) SetChecksumValue(value string) { + if m != nil { + m.ChecksumValue = value + } +} func (x *CachedDependency) ToProto() *ProtoCachedDependency { proto := &ProtoCachedDependency{ Name: x.Name, diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index fd963b03..02f61d47 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -13,6 +13,39 @@ type CellCapacity struct { Containers int32 } +func (m *CellCapacity) GetMemoryMb() int32 { + if m != nil { + return m.MemoryMb + } + return 0 +} +func (m *CellCapacity) SetMemoryMb(value int32) { + if m != nil { + m.MemoryMb = value + } +} +func (m *CellCapacity) GetDiskMb() int32 { + if m != nil { + return m.DiskMb + } + return 0 +} +func (m *CellCapacity) SetDiskMb(value int32) { + if m != nil { + m.DiskMb = value + } +} +func (m *CellCapacity) GetContainers() int32 { + if m != nil { + return m.Containers + } + return 0 +} +func (m *CellCapacity) SetContainers(value int32) { + if m != nil { + m.Containers = value + } +} func (x *CellCapacity) ToProto() *ProtoCellCapacity { proto := &ProtoCellCapacity{ MemoryMb: x.MemoryMb, @@ -42,6 +75,94 @@ type CellPresence struct { RepUrl string } +func (m *CellPresence) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *CellPresence) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} +func (m *CellPresence) GetRepAddress() string { + if m != nil { + return m.RepAddress + } + return "" +} +func (m *CellPresence) SetRepAddress(value string) { + if m != nil { + m.RepAddress = value + } +} +func (m *CellPresence) GetZone() string { + if m != nil { + return m.Zone + } + return "" +} +func (m *CellPresence) SetZone(value string) { + if m != nil { + m.Zone = value + } +} +func (m *CellPresence) GetCapacity() *CellCapacity { + if m != nil { + return m.Capacity + } + return nil +} +func (m *CellPresence) SetCapacity(value *CellCapacity) { + if m != nil { + m.Capacity = value + } +} +func (m *CellPresence) GetRootfsProviders() []*Provider { + if m != nil { + return m.RootfsProviders + } + return nil +} +func (m *CellPresence) SetRootfsProviders(value []*Provider) { + if m != nil { + m.RootfsProviders = value + } +} +func (m *CellPresence) GetPlacementTags() []string { + if m != nil { + return m.PlacementTags + } + return nil +} +func (m *CellPresence) SetPlacementTags(value []string) { + if m != nil { + m.PlacementTags = value + } +} +func (m *CellPresence) GetOptionalPlacementTags() []string { + if m != nil { + return m.OptionalPlacementTags + } + return nil +} +func (m *CellPresence) SetOptionalPlacementTags(value []string) { + if m != nil { + m.OptionalPlacementTags = value + } +} +func (m *CellPresence) GetRepUrl() string { + if m != nil { + return m.RepUrl + } + return "" +} +func (m *CellPresence) SetRepUrl(value string) { + if m != nil { + m.RepUrl = value + } +} func (x *CellPresence) ToProto() *ProtoCellPresence { proto := &ProtoCellPresence{ CellId: x.CellId, @@ -70,6 +191,28 @@ type Provider struct { Properties []string } +func (m *Provider) GetName() string { + if m != nil { + return m.Name + } + return "" +} +func (m *Provider) SetName(value string) { + if m != nil { + m.Name = value + } +} +func (m *Provider) GetProperties() []string { + if m != nil { + return m.Properties + } + return nil +} +func (m *Provider) SetProperties(value []string) { + if m != nil { + m.Properties = value + } +} func (x *Provider) ToProto() *ProtoProvider { proto := &ProtoProvider{ Name: x.Name, @@ -92,6 +235,28 @@ type CellsResponse struct { Cells []*CellPresence } +func (m *CellsResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *CellsResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *CellsResponse) GetCells() []*CellPresence { + if m != nil { + return m.Cells + } + return nil +} +func (m *CellsResponse) SetCells(value []*CellPresence) { + if m != nil { + m.Cells = value + } +} func (x *CellsResponse) ToProto() *ProtoCellsResponse { proto := &ProtoCellsResponse{ Error: x.Error.ToProto(), diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 984f0acd..87f58b39 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -11,6 +11,17 @@ type CertificateProperties struct { OrganizationalUnit []string } +func (m *CertificateProperties) GetOrganizationalUnit() []string { + if m != nil { + return m.OrganizationalUnit + } + return nil +} +func (m *CertificateProperties) SetOrganizationalUnit(value []string) { + if m != nil { + m.OrganizationalUnit = value + } +} func (x *CertificateProperties) ToProto() *ProtoCertificateProperties { proto := &ProtoCertificateProperties{ OrganizationalUnit: x.OrganizationalUnit, diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 36eb8172..b871d882 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -13,6 +13,39 @@ type CheckDefinition struct { ReadinessChecks []*Check } +func (m *CheckDefinition) GetChecks() []*Check { + if m != nil { + return m.Checks + } + return nil +} +func (m *CheckDefinition) SetChecks(value []*Check) { + if m != nil { + m.Checks = value + } +} +func (m *CheckDefinition) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *CheckDefinition) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *CheckDefinition) GetReadinessChecks() []*Check { + if m != nil { + return m.ReadinessChecks + } + return nil +} +func (m *CheckDefinition) SetReadinessChecks(value []*Check) { + if m != nil { + m.ReadinessChecks = value + } +} func (x *CheckDefinition) ToProto() *ProtoCheckDefinition { proto := &ProtoCheckDefinition{ Checks: CheckProtoMap(x.Checks), @@ -36,6 +69,28 @@ type Check struct { HttpCheck *HTTPCheck } +func (m *Check) GetTcpCheck() *TCPCheck { + if m != nil { + return m.TcpCheck + } + return nil +} +func (m *Check) SetTcpCheck(value *TCPCheck) { + if m != nil { + m.TcpCheck = value + } +} +func (m *Check) GetHttpCheck() *HTTPCheck { + if m != nil { + return m.HttpCheck + } + return nil +} +func (m *Check) SetHttpCheck(value *HTTPCheck) { + if m != nil { + m.HttpCheck = value + } +} func (x *Check) ToProto() *ProtoCheck { proto := &ProtoCheck{ TcpCheck: x.TcpCheck.ToProto(), @@ -59,6 +114,39 @@ type TCPCheck struct { IntervalMs uint64 } +func (m *TCPCheck) GetPort() uint32 { + if m != nil { + return m.Port + } + return 0 +} +func (m *TCPCheck) SetPort(value uint32) { + if m != nil { + m.Port = value + } +} +func (m *TCPCheck) GetConnectTimeoutMs() uint64 { + if m != nil { + return m.ConnectTimeoutMs + } + return 0 +} +func (m *TCPCheck) SetConnectTimeoutMs(value uint64) { + if m != nil { + m.ConnectTimeoutMs = value + } +} +func (m *TCPCheck) GetIntervalMs() uint64 { + if m != nil { + return m.IntervalMs + } + return 0 +} +func (m *TCPCheck) SetIntervalMs(value uint64) { + if m != nil { + m.IntervalMs = value + } +} func (x *TCPCheck) ToProto() *ProtoTCPCheck { proto := &ProtoTCPCheck{ Port: x.Port, @@ -84,6 +172,50 @@ type HTTPCheck struct { IntervalMs uint64 } +func (m *HTTPCheck) GetPort() uint32 { + if m != nil { + return m.Port + } + return 0 +} +func (m *HTTPCheck) SetPort(value uint32) { + if m != nil { + m.Port = value + } +} +func (m *HTTPCheck) GetRequestTimeoutMs() uint64 { + if m != nil { + return m.RequestTimeoutMs + } + return 0 +} +func (m *HTTPCheck) SetRequestTimeoutMs(value uint64) { + if m != nil { + m.RequestTimeoutMs = value + } +} +func (m *HTTPCheck) GetPath() string { + if m != nil { + return m.Path + } + return "" +} +func (m *HTTPCheck) SetPath(value string) { + if m != nil { + m.Path = value + } +} +func (m *HTTPCheck) GetIntervalMs() uint64 { + if m != nil { + return m.IntervalMs + } + return 0 +} +func (m *HTTPCheck) SetIntervalMs(value uint64) { + if m != nil { + m.IntervalMs = value + } +} func (x *HTTPCheck) ToProto() *ProtoHTTPCheck { proto := &ProtoHTTPCheck{ Port: x.Port, diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 6c0f0b05..061fc703 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -18,6 +18,94 @@ type DesiredLRPSchedulingInfo struct { ProtoPlacementTags []string } +func (m *DesiredLRPSchedulingInfo) GetDesiredLrpKey() *DesiredLRPKey { + if m != nil { + return m.DesiredLrpKey + } + return nil +} +func (m *DesiredLRPSchedulingInfo) SetDesiredLrpKey(value *DesiredLRPKey) { + if m != nil { + m.DesiredLrpKey = value + } +} +func (m *DesiredLRPSchedulingInfo) GetAnnotation() string { + if m != nil { + return m.Annotation + } + return "" +} +func (m *DesiredLRPSchedulingInfo) SetAnnotation(value string) { + if m != nil { + m.Annotation = value + } +} +func (m *DesiredLRPSchedulingInfo) GetInstances() int32 { + if m != nil { + return m.Instances + } + return 0 +} +func (m *DesiredLRPSchedulingInfo) SetInstances(value int32) { + if m != nil { + m.Instances = value + } +} +func (m *DesiredLRPSchedulingInfo) GetDesiredLrpResource() *DesiredLRPResource { + if m != nil { + return m.DesiredLrpResource + } + return nil +} +func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value *DesiredLRPResource) { + if m != nil { + m.DesiredLrpResource = value + } +} +func (m *DesiredLRPSchedulingInfo) GetRoutes() *Routes { + if m != nil { + return m.Routes + } + return nil +} +func (m *DesiredLRPSchedulingInfo) SetRoutes(value *Routes) { + if m != nil { + m.Routes = value + } +} +func (m *DesiredLRPSchedulingInfo) GetModificationTag() *ModificationTag { + if m != nil { + return m.ModificationTag + } + return nil +} +func (m *DesiredLRPSchedulingInfo) SetModificationTag(value *ModificationTag) { + if m != nil { + m.ModificationTag = value + } +} +func (m *DesiredLRPSchedulingInfo) GetVolumePlacement() *VolumePlacement { + if m != nil { + return m.VolumePlacement + } + return nil +} +func (m *DesiredLRPSchedulingInfo) SetVolumePlacement(value *VolumePlacement) { + if m != nil { + m.VolumePlacement = value + } +} +func (m *DesiredLRPSchedulingInfo) GetProtoPlacementTags() []string { + if m != nil { + return m.ProtoPlacementTags + } + return nil +} +func (m *DesiredLRPSchedulingInfo) SetProtoPlacementTags(value []string) { + if m != nil { + m.ProtoPlacementTags = value + } +} func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { proto := &ProtoDesiredLRPSchedulingInfo{ DesiredLrpKey: x.DesiredLrpKey.ToProto(), @@ -71,6 +159,309 @@ type DesiredLRPRunInfo struct { LogRateLimit *LogRateLimit } +func (m *DesiredLRPRunInfo) GetDesiredLrpKey() *DesiredLRPKey { + if m != nil { + return m.DesiredLrpKey + } + return nil +} +func (m *DesiredLRPRunInfo) SetDesiredLrpKey(value *DesiredLRPKey) { + if m != nil { + m.DesiredLrpKey = value + } +} +func (m *DesiredLRPRunInfo) GetEnvironmentVariables() []*EnvironmentVariable { + if m != nil { + return m.EnvironmentVariables + } + return nil +} +func (m *DesiredLRPRunInfo) SetEnvironmentVariables(value []*EnvironmentVariable) { + if m != nil { + m.EnvironmentVariables = value + } +} +func (m *DesiredLRPRunInfo) GetSetup() *Action { + if m != nil { + return m.Setup + } + return nil +} +func (m *DesiredLRPRunInfo) SetSetup(value *Action) { + if m != nil { + m.Setup = value + } +} +func (m *DesiredLRPRunInfo) GetAction() *Action { + if m != nil { + return m.Action + } + return nil +} +func (m *DesiredLRPRunInfo) SetAction(value *Action) { + if m != nil { + m.Action = value + } +} +func (m *DesiredLRPRunInfo) GetMonitor() *Action { + if m != nil { + return m.Monitor + } + return nil +} +func (m *DesiredLRPRunInfo) SetMonitor(value *Action) { + if m != nil { + m.Monitor = value + } +} + +// DEPRECATED: DO NOT USE +func (m *DesiredLRPRunInfo) GetDeprecatedStartTimeoutS() uint32 { + if m != nil { + return m.DeprecatedStartTimeoutS + } + return 0 +} +func (m *DesiredLRPRunInfo) SetDeprecatedStartTimeoutS(value uint32) { + if m != nil { + m.DeprecatedStartTimeoutS = value + } +} +func (m *DesiredLRPRunInfo) GetPrivileged() bool { + if m != nil { + return m.Privileged + } + return false +} +func (m *DesiredLRPRunInfo) SetPrivileged(value bool) { + if m != nil { + m.Privileged = value + } +} +func (m *DesiredLRPRunInfo) GetCpuWeight() uint32 { + if m != nil { + return m.CpuWeight + } + return 0 +} +func (m *DesiredLRPRunInfo) SetCpuWeight(value uint32) { + if m != nil { + m.CpuWeight = value + } +} +func (m *DesiredLRPRunInfo) GetPorts() []uint32 { + if m != nil { + return m.Ports + } + return 0 +} +func (m *DesiredLRPRunInfo) SetPorts(value []uint32) { + if m != nil { + m.Ports = value + } +} +func (m *DesiredLRPRunInfo) GetEgressRules() []*SecurityGroupRule { + if m != nil { + return m.EgressRules + } + return nil +} +func (m *DesiredLRPRunInfo) SetEgressRules(value []*SecurityGroupRule) { + if m != nil { + m.EgressRules = value + } +} +func (m *DesiredLRPRunInfo) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *DesiredLRPRunInfo) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} + +// DEPRECATED: DO NOT USE +func (m *DesiredLRPRunInfo) GetMetricsGuid() string { + if m != nil { + return m.MetricsGuid + } + return "" +} +func (m *DesiredLRPRunInfo) SetMetricsGuid(value string) { + if m != nil { + m.MetricsGuid = value + } +} +func (m *DesiredLRPRunInfo) GetCreatedAt() int64 { + if m != nil { + return m.CreatedAt + } + return 0 +} +func (m *DesiredLRPRunInfo) SetCreatedAt(value int64) { + if m != nil { + m.CreatedAt = value + } +} +func (m *DesiredLRPRunInfo) GetCachedDependencies() []*CachedDependency { + if m != nil { + return m.CachedDependencies + } + return nil +} +func (m *DesiredLRPRunInfo) SetCachedDependencies(value []*CachedDependency) { + if m != nil { + m.CachedDependencies = value + } +} + +// DEPRECATED: DO NOT USE +func (m *DesiredLRPRunInfo) GetLegacyDownloadUser() string { + if m != nil { + return m.LegacyDownloadUser + } + return "" +} +func (m *DesiredLRPRunInfo) SetLegacyDownloadUser(value string) { + if m != nil { + m.LegacyDownloadUser = value + } +} +func (m *DesiredLRPRunInfo) GetTrustedSystemCertificatesPath() string { + if m != nil { + return m.TrustedSystemCertificatesPath + } + return "" +} +func (m *DesiredLRPRunInfo) SetTrustedSystemCertificatesPath(value string) { + if m != nil { + m.TrustedSystemCertificatesPath = value + } +} +func (m *DesiredLRPRunInfo) GetVolumeMounts() []*VolumeMount { + if m != nil { + return m.VolumeMounts + } + return nil +} +func (m *DesiredLRPRunInfo) SetVolumeMounts(value []*VolumeMount) { + if m != nil { + m.VolumeMounts = value + } +} +func (m *DesiredLRPRunInfo) GetNetwork() *Network { + if m != nil { + return m.Network + } + return nil +} +func (m *DesiredLRPRunInfo) SetNetwork(value *Network) { + if m != nil { + m.Network = value + } +} +func (m *DesiredLRPRunInfo) GetStartTimeoutMs() int64 { + if m != nil { + return m.StartTimeoutMs + } + return 0 +} +func (m *DesiredLRPRunInfo) SetStartTimeoutMs(value int64) { + if m != nil { + m.StartTimeoutMs = value + } +} +func (m *DesiredLRPRunInfo) GetCertificateProperties() *CertificateProperties { + if m != nil { + return m.CertificateProperties + } + return nil +} +func (m *DesiredLRPRunInfo) SetCertificateProperties(value *CertificateProperties) { + if m != nil { + m.CertificateProperties = value + } +} +func (m *DesiredLRPRunInfo) GetImageUsername() string { + if m != nil { + return m.ImageUsername + } + return "" +} +func (m *DesiredLRPRunInfo) SetImageUsername(value string) { + if m != nil { + m.ImageUsername = value + } +} +func (m *DesiredLRPRunInfo) GetImagePassword() string { + if m != nil { + return m.ImagePassword + } + return "" +} +func (m *DesiredLRPRunInfo) SetImagePassword(value string) { + if m != nil { + m.ImagePassword = value + } +} +func (m *DesiredLRPRunInfo) GetCheckDefinition() *CheckDefinition { + if m != nil { + return m.CheckDefinition + } + return nil +} +func (m *DesiredLRPRunInfo) SetCheckDefinition(value *CheckDefinition) { + if m != nil { + m.CheckDefinition = value + } +} +func (m *DesiredLRPRunInfo) GetImageLayers() []*ImageLayer { + if m != nil { + return m.ImageLayers + } + return nil +} +func (m *DesiredLRPRunInfo) SetImageLayers(value []*ImageLayer) { + if m != nil { + m.ImageLayers = value + } +} +func (m *DesiredLRPRunInfo) GetMetricTags() map[string]*ProtoMetricTagValue { + if m != nil { + return m.MetricTags + } + return nil +} +func (m *DesiredLRPRunInfo) SetMetricTags(value map[string]*ProtoMetricTagValue) { + if m != nil { + m.MetricTags = value + } +} +func (m *DesiredLRPRunInfo) GetSidecars() []*Sidecar { + if m != nil { + return m.Sidecars + } + return nil +} +func (m *DesiredLRPRunInfo) SetSidecars(value []*Sidecar) { + if m != nil { + m.Sidecars = value + } +} +func (m *DesiredLRPRunInfo) GetLogRateLimit() *LogRateLimit { + if m != nil { + return m.LogRateLimit + } + return nil +} +func (m *DesiredLRPRunInfo) SetLogRateLimit(value *LogRateLimit) { + if m != nil { + m.LogRateLimit = value + } +} func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { proto := &ProtoDesiredLRPRunInfo{ DesiredLrpKey: x.DesiredLrpKey.ToProto(), @@ -120,6 +511,50 @@ type DesiredLRPUpdate struct { MetricTags map[string]*ProtoMetricTagValue } +func (m *DesiredLRPUpdate) GetInstances() int32 { + if m != nil { + return m.Instances + } + return 0 +} +func (m *DesiredLRPUpdate) SetInstances(value int32) { + if m != nil { + m.Instances = value + } +} +func (m *DesiredLRPUpdate) GetRoutes() *Routes { + if m != nil { + return m.Routes + } + return nil +} +func (m *DesiredLRPUpdate) SetRoutes(value *Routes) { + if m != nil { + m.Routes = value + } +} +func (m *DesiredLRPUpdate) GetAnnotation() string { + if m != nil { + return m.Annotation + } + return "" +} +func (m *DesiredLRPUpdate) SetAnnotation(value string) { + if m != nil { + m.Annotation = value + } +} +func (m *DesiredLRPUpdate) GetMetricTags() map[string]*ProtoMetricTagValue { + if m != nil { + return m.MetricTags + } + return nil +} +func (m *DesiredLRPUpdate) SetMetricTags(value map[string]*ProtoMetricTagValue) { + if m != nil { + m.MetricTags = value + } +} func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { proto := &ProtoDesiredLRPUpdate{ Instances: &x.Instances, @@ -145,6 +580,39 @@ type DesiredLRPKey struct { LogGuid string } +func (m *DesiredLRPKey) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *DesiredLRPKey) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *DesiredLRPKey) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *DesiredLRPKey) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *DesiredLRPKey) GetLogGuid() string { + if m != nil { + return m.LogGuid + } + return "" +} +func (m *DesiredLRPKey) SetLogGuid(value string) { + if m != nil { + m.LogGuid = value + } +} func (x *DesiredLRPKey) ToProto() *ProtoDesiredLRPKey { proto := &ProtoDesiredLRPKey{ ProcessGuid: x.ProcessGuid, @@ -170,6 +638,50 @@ type DesiredLRPResource struct { MaxPids int32 } +func (m *DesiredLRPResource) GetMemoryMb() int32 { + if m != nil { + return m.MemoryMb + } + return 0 +} +func (m *DesiredLRPResource) SetMemoryMb(value int32) { + if m != nil { + m.MemoryMb = value + } +} +func (m *DesiredLRPResource) GetDiskMb() int32 { + if m != nil { + return m.DiskMb + } + return 0 +} +func (m *DesiredLRPResource) SetDiskMb(value int32) { + if m != nil { + m.DiskMb = value + } +} +func (m *DesiredLRPResource) GetRootFs() string { + if m != nil { + return m.RootFs + } + return "" +} +func (m *DesiredLRPResource) SetRootFs(value string) { + if m != nil { + m.RootFs = value + } +} +func (m *DesiredLRPResource) GetMaxPids() int32 { + if m != nil { + return m.MaxPids + } + return 0 +} +func (m *DesiredLRPResource) SetMaxPids(value int32) { + if m != nil { + m.MaxPids = value + } +} func (x *DesiredLRPResource) ToProto() *ProtoDesiredLRPResource { proto := &ProtoDesiredLRPResource{ MemoryMb: x.MemoryMb, @@ -229,6 +741,419 @@ type DesiredLRP struct { LogRateLimit *LogRateLimit } +func (m *DesiredLRP) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *DesiredLRP) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *DesiredLRP) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *DesiredLRP) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *DesiredLRP) GetRootFs() string { + if m != nil { + return m.RootFs + } + return "" +} +func (m *DesiredLRP) SetRootFs(value string) { + if m != nil { + m.RootFs = value + } +} +func (m *DesiredLRP) GetInstances() int32 { + if m != nil { + return m.Instances + } + return 0 +} +func (m *DesiredLRP) SetInstances(value int32) { + if m != nil { + m.Instances = value + } +} +func (m *DesiredLRP) GetEnvironmentVariables() []*EnvironmentVariable { + if m != nil { + return m.EnvironmentVariables + } + return nil +} +func (m *DesiredLRP) SetEnvironmentVariables(value []*EnvironmentVariable) { + if m != nil { + m.EnvironmentVariables = value + } +} +func (m *DesiredLRP) GetSetup() *Action { + if m != nil { + return m.Setup + } + return nil +} +func (m *DesiredLRP) SetSetup(value *Action) { + if m != nil { + m.Setup = value + } +} +func (m *DesiredLRP) GetAction() *Action { + if m != nil { + return m.Action + } + return nil +} +func (m *DesiredLRP) SetAction(value *Action) { + if m != nil { + m.Action = value + } +} +func (m *DesiredLRP) GetStartTimeoutMs() int64 { + if m != nil { + return m.StartTimeoutMs + } + return 0 +} +func (m *DesiredLRP) SetStartTimeoutMs(value int64) { + if m != nil { + m.StartTimeoutMs = value + } +} + +// DEPRECATED: DO NOT USE +func (m *DesiredLRP) GetDeprecatedStartTimeoutS() uint32 { + if m != nil { + return m.DeprecatedStartTimeoutS + } + return 0 +} +func (m *DesiredLRP) SetDeprecatedStartTimeoutS(value uint32) { + if m != nil { + m.DeprecatedStartTimeoutS = value + } +} +func (m *DesiredLRP) GetMonitor() *Action { + if m != nil { + return m.Monitor + } + return nil +} +func (m *DesiredLRP) SetMonitor(value *Action) { + if m != nil { + m.Monitor = value + } +} +func (m *DesiredLRP) GetDiskMb() int32 { + if m != nil { + return m.DiskMb + } + return 0 +} +func (m *DesiredLRP) SetDiskMb(value int32) { + if m != nil { + m.DiskMb = value + } +} +func (m *DesiredLRP) GetMemoryMb() int32 { + if m != nil { + return m.MemoryMb + } + return 0 +} +func (m *DesiredLRP) SetMemoryMb(value int32) { + if m != nil { + m.MemoryMb = value + } +} +func (m *DesiredLRP) GetCpuWeight() uint32 { + if m != nil { + return m.CpuWeight + } + return 0 +} +func (m *DesiredLRP) SetCpuWeight(value uint32) { + if m != nil { + m.CpuWeight = value + } +} +func (m *DesiredLRP) GetPrivileged() bool { + if m != nil { + return m.Privileged + } + return false +} +func (m *DesiredLRP) SetPrivileged(value bool) { + if m != nil { + m.Privileged = value + } +} +func (m *DesiredLRP) GetPorts() []uint32 { + if m != nil { + return m.Ports + } + return 0 +} +func (m *DesiredLRP) SetPorts(value []uint32) { + if m != nil { + m.Ports = value + } +} +func (m *DesiredLRP) GetRoutes() *Routes { + if m != nil { + return m.Routes + } + return nil +} +func (m *DesiredLRP) SetRoutes(value *Routes) { + if m != nil { + m.Routes = value + } +} +func (m *DesiredLRP) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *DesiredLRP) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *DesiredLRP) GetLogGuid() string { + if m != nil { + return m.LogGuid + } + return "" +} +func (m *DesiredLRP) SetLogGuid(value string) { + if m != nil { + m.LogGuid = value + } +} + +// DEPRECATED: DO NOT USE +func (m *DesiredLRP) GetMetricsGuid() string { + if m != nil { + return m.MetricsGuid + } + return "" +} +func (m *DesiredLRP) SetMetricsGuid(value string) { + if m != nil { + m.MetricsGuid = value + } +} +func (m *DesiredLRP) GetAnnotation() string { + if m != nil { + return m.Annotation + } + return "" +} +func (m *DesiredLRP) SetAnnotation(value string) { + if m != nil { + m.Annotation = value + } +} +func (m *DesiredLRP) GetEgressRules() []*SecurityGroupRule { + if m != nil { + return m.EgressRules + } + return nil +} +func (m *DesiredLRP) SetEgressRules(value []*SecurityGroupRule) { + if m != nil { + m.EgressRules = value + } +} +func (m *DesiredLRP) GetModificationTag() *ModificationTag { + if m != nil { + return m.ModificationTag + } + return nil +} +func (m *DesiredLRP) SetModificationTag(value *ModificationTag) { + if m != nil { + m.ModificationTag = value + } +} +func (m *DesiredLRP) GetCachedDependencies() []*CachedDependency { + if m != nil { + return m.CachedDependencies + } + return nil +} +func (m *DesiredLRP) SetCachedDependencies(value []*CachedDependency) { + if m != nil { + m.CachedDependencies = value + } +} + +// DEPRECATED: DO NOT USE +func (m *DesiredLRP) GetLegacyDownloadUser() string { + if m != nil { + return m.LegacyDownloadUser + } + return "" +} +func (m *DesiredLRP) SetLegacyDownloadUser(value string) { + if m != nil { + m.LegacyDownloadUser = value + } +} +func (m *DesiredLRP) GetTrustedSystemCertificatesPath() string { + if m != nil { + return m.TrustedSystemCertificatesPath + } + return "" +} +func (m *DesiredLRP) SetTrustedSystemCertificatesPath(value string) { + if m != nil { + m.TrustedSystemCertificatesPath = value + } +} +func (m *DesiredLRP) GetVolumeMounts() []*VolumeMount { + if m != nil { + return m.VolumeMounts + } + return nil +} +func (m *DesiredLRP) SetVolumeMounts(value []*VolumeMount) { + if m != nil { + m.VolumeMounts = value + } +} +func (m *DesiredLRP) GetNetwork() *Network { + if m != nil { + return m.Network + } + return nil +} +func (m *DesiredLRP) SetNetwork(value *Network) { + if m != nil { + m.Network = value + } +} +func (m *DesiredLRP) GetProtoPlacementTags() []string { + if m != nil { + return m.ProtoPlacementTags + } + return nil +} +func (m *DesiredLRP) SetProtoPlacementTags(value []string) { + if m != nil { + m.ProtoPlacementTags = value + } +} +func (m *DesiredLRP) GetMaxPids() int32 { + if m != nil { + return m.MaxPids + } + return 0 +} +func (m *DesiredLRP) SetMaxPids(value int32) { + if m != nil { + m.MaxPids = value + } +} +func (m *DesiredLRP) GetCertificateProperties() *CertificateProperties { + if m != nil { + return m.CertificateProperties + } + return nil +} +func (m *DesiredLRP) SetCertificateProperties(value *CertificateProperties) { + if m != nil { + m.CertificateProperties = value + } +} +func (m *DesiredLRP) GetImageUsername() string { + if m != nil { + return m.ImageUsername + } + return "" +} +func (m *DesiredLRP) SetImageUsername(value string) { + if m != nil { + m.ImageUsername = value + } +} +func (m *DesiredLRP) GetImagePassword() string { + if m != nil { + return m.ImagePassword + } + return "" +} +func (m *DesiredLRP) SetImagePassword(value string) { + if m != nil { + m.ImagePassword = value + } +} +func (m *DesiredLRP) GetCheckDefinition() *CheckDefinition { + if m != nil { + return m.CheckDefinition + } + return nil +} +func (m *DesiredLRP) SetCheckDefinition(value *CheckDefinition) { + if m != nil { + m.CheckDefinition = value + } +} +func (m *DesiredLRP) GetImageLayers() []*ImageLayer { + if m != nil { + return m.ImageLayers + } + return nil +} +func (m *DesiredLRP) SetImageLayers(value []*ImageLayer) { + if m != nil { + m.ImageLayers = value + } +} +func (m *DesiredLRP) GetMetricTags() map[string]*ProtoMetricTagValue { + if m != nil { + return m.MetricTags + } + return nil +} +func (m *DesiredLRP) SetMetricTags(value map[string]*ProtoMetricTagValue) { + if m != nil { + m.MetricTags = value + } +} +func (m *DesiredLRP) GetSidecars() []*Sidecar { + if m != nil { + return m.Sidecars + } + return nil +} +func (m *DesiredLRP) SetSidecars(value []*Sidecar) { + if m != nil { + m.Sidecars = value + } +} +func (m *DesiredLRP) GetLogRateLimit() *LogRateLimit { + if m != nil { + return m.LogRateLimit + } + return nil +} +func (m *DesiredLRP) SetLogRateLimit(value *LogRateLimit) { + if m != nil { + m.LogRateLimit = value + } +} func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { proto := &ProtoDesiredLRP{ ProcessGuid: x.ProcessGuid, diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index 482e0b41..b7117284 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -11,6 +11,17 @@ type DesiredLRPLifecycleResponse struct { Error *Error } +func (m *DesiredLRPLifecycleResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *DesiredLRPLifecycleResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} func (x *DesiredLRPLifecycleResponse) ToProto() *ProtoDesiredLRPLifecycleResponse { proto := &ProtoDesiredLRPLifecycleResponse{ Error: x.Error.ToProto(), @@ -32,6 +43,28 @@ type DesiredLRPsResponse struct { DesiredLrps []*DesiredLRP } +func (m *DesiredLRPsResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *DesiredLRPsResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *DesiredLRPsResponse) GetDesiredLrps() []*DesiredLRP { + if m != nil { + return m.DesiredLrps + } + return nil +} +func (m *DesiredLRPsResponse) SetDesiredLrps(value []*DesiredLRP) { + if m != nil { + m.DesiredLrps = value + } +} func (x *DesiredLRPsResponse) ToProto() *ProtoDesiredLRPsResponse { proto := &ProtoDesiredLRPsResponse{ Error: x.Error.ToProto(), @@ -54,6 +87,28 @@ type DesiredLRPsRequest struct { ProcessGuids []string } +func (m *DesiredLRPsRequest) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *DesiredLRPsRequest) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *DesiredLRPsRequest) GetProcessGuids() []string { + if m != nil { + return m.ProcessGuids + } + return nil +} +func (m *DesiredLRPsRequest) SetProcessGuids(value []string) { + if m != nil { + m.ProcessGuids = value + } +} func (x *DesiredLRPsRequest) ToProto() *ProtoDesiredLRPsRequest { proto := &ProtoDesiredLRPsRequest{ Domain: x.Domain, @@ -76,6 +131,28 @@ type DesiredLRPResponse struct { DesiredLrp *DesiredLRP } +func (m *DesiredLRPResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *DesiredLRPResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *DesiredLRPResponse) GetDesiredLrp() *DesiredLRP { + if m != nil { + return m.DesiredLrp + } + return nil +} +func (m *DesiredLRPResponse) SetDesiredLrp(value *DesiredLRP) { + if m != nil { + m.DesiredLrp = value + } +} func (x *DesiredLRPResponse) ToProto() *ProtoDesiredLRPResponse { proto := &ProtoDesiredLRPResponse{ Error: x.Error.ToProto(), @@ -98,6 +175,28 @@ type DesiredLRPSchedulingInfosResponse struct { DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo } +func (m *DesiredLRPSchedulingInfosResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *DesiredLRPSchedulingInfosResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *DesiredLRPSchedulingInfosResponse) GetDesiredLrpSchedulingInfos() []*DesiredLRPSchedulingInfo { + if m != nil { + return m.DesiredLrpSchedulingInfos + } + return nil +} +func (m *DesiredLRPSchedulingInfosResponse) SetDesiredLrpSchedulingInfos(value []*DesiredLRPSchedulingInfo) { + if m != nil { + m.DesiredLrpSchedulingInfos = value + } +} func (x *DesiredLRPSchedulingInfosResponse) ToProto() *ProtoDesiredLRPSchedulingInfosResponse { proto := &ProtoDesiredLRPSchedulingInfosResponse{ Error: x.Error.ToProto(), @@ -120,6 +219,28 @@ type DesiredLRPSchedulingInfoByProcessGuidResponse struct { DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo } +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLrpSchedulingInfo() *DesiredLRPSchedulingInfo { + if m != nil { + return m.DesiredLrpSchedulingInfo + } + return nil +} +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetDesiredLrpSchedulingInfo(value *DesiredLRPSchedulingInfo) { + if m != nil { + m.DesiredLrpSchedulingInfo = value + } +} func (x *DesiredLRPSchedulingInfoByProcessGuidResponse) ToProto() *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { proto := &ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{ Error: x.Error.ToProto(), @@ -141,6 +262,17 @@ type DesiredLRPByProcessGuidRequest struct { ProcessGuid string } +func (m *DesiredLRPByProcessGuidRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *DesiredLRPByProcessGuidRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} func (x *DesiredLRPByProcessGuidRequest) ToProto() *ProtoDesiredLRPByProcessGuidRequest { proto := &ProtoDesiredLRPByProcessGuidRequest{ ProcessGuid: x.ProcessGuid, @@ -161,6 +293,17 @@ type DesireLRPRequest struct { DesiredLrp *DesiredLRP } +func (m *DesireLRPRequest) GetDesiredLrp() *DesiredLRP { + if m != nil { + return m.DesiredLrp + } + return nil +} +func (m *DesireLRPRequest) SetDesiredLrp(value *DesiredLRP) { + if m != nil { + m.DesiredLrp = value + } +} func (x *DesireLRPRequest) ToProto() *ProtoDesireLRPRequest { proto := &ProtoDesireLRPRequest{ DesiredLrp: x.DesiredLrp.ToProto(), @@ -182,6 +325,28 @@ type UpdateDesiredLRPRequest struct { Update *DesiredLRPUpdate } +func (m *UpdateDesiredLRPRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *UpdateDesiredLRPRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} +func (m *UpdateDesiredLRPRequest) GetUpdate() *DesiredLRPUpdate { + if m != nil { + return m.Update + } + return nil +} +func (m *UpdateDesiredLRPRequest) SetUpdate(value *DesiredLRPUpdate) { + if m != nil { + m.Update = value + } +} func (x *UpdateDesiredLRPRequest) ToProto() *ProtoUpdateDesiredLRPRequest { proto := &ProtoUpdateDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, @@ -203,6 +368,17 @@ type RemoveDesiredLRPRequest struct { ProcessGuid string } +func (m *RemoveDesiredLRPRequest) GetProcessGuid() string { + if m != nil { + return m.ProcessGuid + } + return "" +} +func (m *RemoveDesiredLRPRequest) SetProcessGuid(value string) { + if m != nil { + m.ProcessGuid = value + } +} func (x *RemoveDesiredLRPRequest) ToProto() *ProtoRemoveDesiredLRPRequest { proto := &ProtoRemoveDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 9cc77b35..45e5a577 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -12,6 +12,28 @@ type DomainsResponse struct { Domains []string } +func (m *DomainsResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *DomainsResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *DomainsResponse) GetDomains() []string { + if m != nil { + return m.Domains + } + return nil +} +func (m *DomainsResponse) SetDomains(value []string) { + if m != nil { + m.Domains = value + } +} func (x *DomainsResponse) ToProto() *ProtoDomainsResponse { proto := &ProtoDomainsResponse{ Error: x.Error.ToProto(), @@ -33,6 +55,17 @@ type UpsertDomainResponse struct { Error *Error } +func (m *UpsertDomainResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *UpsertDomainResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} func (x *UpsertDomainResponse) ToProto() *ProtoUpsertDomainResponse { proto := &ProtoUpsertDomainResponse{ Error: x.Error.ToProto(), @@ -54,6 +87,28 @@ type UpsertDomainRequest struct { Ttl uint32 } +func (m *UpsertDomainRequest) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *UpsertDomainRequest) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *UpsertDomainRequest) GetTtl() uint32 { + if m != nil { + return m.Ttl + } + return 0 +} +func (m *UpsertDomainRequest) SetTtl(value uint32) { + if m != nil { + m.Ttl = value + } +} func (x *UpsertDomainRequest) ToProto() *ProtoUpsertDomainRequest { proto := &ProtoUpsertDomainRequest{ Domain: x.Domain, diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index b322b06d..740c946d 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -12,6 +12,28 @@ type EnvironmentVariable struct { Value string } +func (m *EnvironmentVariable) GetName() string { + if m != nil { + return m.Name + } + return "" +} +func (m *EnvironmentVariable) SetName(value string) { + if m != nil { + m.Name = value + } +} +func (m *EnvironmentVariable) GetValue() string { + if m != nil { + return m.Value + } + return "" +} +func (m *EnvironmentVariable) SetValue(value string) { + if m != nil { + m.Value = value + } +} func (x *EnvironmentVariable) ToProto() *ProtoEnvironmentVariable { proto := &ProtoEnvironmentVariable{ Name: x.Name, diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index d4bb6648..b3807c99 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -42,6 +42,28 @@ type Error struct { Message string } +func (m *Error) GetType() Error_Type { + if m != nil { + return m.Type + } + return 0 +} +func (m *Error) SetType(value Error_Type) { + if m != nil { + m.Type = value + } +} +func (m *Error) GetMessage() string { + if m != nil { + return m.Message + } + return "" +} +func (m *Error) SetMessage(value string) { + if m != nil { + m.Message = value + } +} func (x *Error) ToProto() *ProtoError { proto := &ProtoError{ Type: ProtoError_Type(x.Type), diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index d323dd6e..70a7a7dc 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -12,6 +12,28 @@ type EvacuationResponse struct { KeepContainer bool } +func (m *EvacuationResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *EvacuationResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *EvacuationResponse) GetKeepContainer() bool { + if m != nil { + return m.KeepContainer + } + return false +} +func (m *EvacuationResponse) SetKeepContainer(value bool) { + if m != nil { + m.KeepContainer = value + } +} func (x *EvacuationResponse) ToProto() *ProtoEvacuationResponse { proto := &ProtoEvacuationResponse{ Error: x.Error.ToProto(), @@ -34,6 +56,28 @@ type EvacuateClaimedActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (m *EvacuateClaimedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *EvacuateClaimedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *EvacuateClaimedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *EvacuateClaimedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} func (x *EvacuateClaimedActualLRPRequest) ToProto() *ProtoEvacuateClaimedActualLRPRequest { proto := &ProtoEvacuateClaimedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -61,6 +105,83 @@ type EvacuateRunningActualLRPRequest struct { AvailabilityZone string } +func (m *EvacuateRunningActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *EvacuateRunningActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *EvacuateRunningActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *EvacuateRunningActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} +func (m *EvacuateRunningActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { + if m != nil { + return m.ActualLrpNetInfo + } + return nil +} +func (m *EvacuateRunningActualLRPRequest) SetActualLrpNetInfo(value *ActualLRPNetInfo) { + if m != nil { + m.ActualLrpNetInfo = value + } +} +func (m *EvacuateRunningActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { + if m != nil { + return m.ActualLrpInternalRoutes + } + return nil +} +func (m *EvacuateRunningActualLRPRequest) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { + if m != nil { + m.ActualLrpInternalRoutes = value + } +} +func (m *EvacuateRunningActualLRPRequest) GetMetricTags() map[string]string { + if m != nil { + return m.MetricTags + } + return nil +} +func (m *EvacuateRunningActualLRPRequest) SetMetricTags(value map[string]string) { + if m != nil { + m.MetricTags = value + } +} +func (m *EvacuateRunningActualLRPRequest) GetProtoRoutable() bool { + if m != nil { + return m.ProtoRoutable + } + return false +} +func (m *EvacuateRunningActualLRPRequest) SetProtoRoutable(value bool) { + if m != nil { + m.ProtoRoutable = value + } +} +func (m *EvacuateRunningActualLRPRequest) GetAvailabilityZone() string { + if m != nil { + return m.AvailabilityZone + } + return "" +} +func (m *EvacuateRunningActualLRPRequest) SetAvailabilityZone(value string) { + if m != nil { + m.AvailabilityZone = value + } +} func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualLRPRequest { proto := &ProtoEvacuateRunningActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -88,6 +209,28 @@ type EvacuateStoppedActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (m *EvacuateStoppedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *EvacuateStoppedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *EvacuateStoppedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *EvacuateStoppedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} func (x *EvacuateStoppedActualLRPRequest) ToProto() *ProtoEvacuateStoppedActualLRPRequest { proto := &ProtoEvacuateStoppedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -111,6 +254,39 @@ type EvacuateCrashedActualLRPRequest struct { ErrorMessage string } +func (m *EvacuateCrashedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *EvacuateCrashedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *EvacuateCrashedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *EvacuateCrashedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} +func (m *EvacuateCrashedActualLRPRequest) GetErrorMessage() string { + if m != nil { + return m.ErrorMessage + } + return "" +} +func (m *EvacuateCrashedActualLRPRequest) SetErrorMessage(value string) { + if m != nil { + m.ErrorMessage = value + } +} func (x *EvacuateCrashedActualLRPRequest) ToProto() *ProtoEvacuateCrashedActualLRPRequest { proto := &ProtoEvacuateCrashedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -134,6 +310,28 @@ type RemoveEvacuatingActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *RemoveEvacuatingActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *RemoveEvacuatingActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} func (x *RemoveEvacuatingActualLRPRequest) ToProto() *ProtoRemoveEvacuatingActualLRPRequest { proto := &ProtoRemoveEvacuatingActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -155,6 +353,17 @@ type RemoveEvacuatingActualLRPResponse struct { Error *Error } +func (m *RemoveEvacuatingActualLRPResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *RemoveEvacuatingActualLRPResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} func (x *RemoveEvacuatingActualLRPResponse) ToProto() *ProtoRemoveEvacuatingActualLRPResponse { proto := &ProtoRemoveEvacuatingActualLRPResponse{ Error: x.Error.ToProto(), diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index a815626c..b2ab5fa5 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -11,6 +11,17 @@ type ActualLRPCreatedEvent struct { ActualLrpGroup *ActualLRPGroup } +func (m *ActualLRPCreatedEvent) GetActualLrpGroup() *ActualLRPGroup { + if m != nil { + return m.ActualLrpGroup + } + return nil +} +func (m *ActualLRPCreatedEvent) SetActualLrpGroup(value *ActualLRPGroup) { + if m != nil { + m.ActualLrpGroup = value + } +} func (x *ActualLRPCreatedEvent) ToProto() *ProtoActualLRPCreatedEvent { proto := &ProtoActualLRPCreatedEvent{ ActualLrpGroup: x.ActualLrpGroup.ToProto(), @@ -32,6 +43,28 @@ type ActualLRPChangedEvent struct { After *ActualLRPGroup } +func (m *ActualLRPChangedEvent) GetBefore() *ActualLRPGroup { + if m != nil { + return m.Before + } + return nil +} +func (m *ActualLRPChangedEvent) SetBefore(value *ActualLRPGroup) { + if m != nil { + m.Before = value + } +} +func (m *ActualLRPChangedEvent) GetAfter() *ActualLRPGroup { + if m != nil { + return m.After + } + return nil +} +func (m *ActualLRPChangedEvent) SetAfter(value *ActualLRPGroup) { + if m != nil { + m.After = value + } +} func (x *ActualLRPChangedEvent) ToProto() *ProtoActualLRPChangedEvent { proto := &ProtoActualLRPChangedEvent{ Before: x.Before.ToProto(), @@ -53,6 +86,17 @@ type ActualLRPRemovedEvent struct { ActualLrpGroup *ActualLRPGroup } +func (m *ActualLRPRemovedEvent) GetActualLrpGroup() *ActualLRPGroup { + if m != nil { + return m.ActualLrpGroup + } + return nil +} +func (m *ActualLRPRemovedEvent) SetActualLrpGroup(value *ActualLRPGroup) { + if m != nil { + m.ActualLrpGroup = value + } +} func (x *ActualLRPRemovedEvent) ToProto() *ProtoActualLRPRemovedEvent { proto := &ProtoActualLRPRemovedEvent{ ActualLrpGroup: x.ActualLrpGroup.ToProto(), @@ -74,6 +118,28 @@ type ActualLRPInstanceCreatedEvent struct { TraceId string } +func (m *ActualLRPInstanceCreatedEvent) GetActualLrp() *ActualLRP { + if m != nil { + return m.ActualLrp + } + return nil +} +func (m *ActualLRPInstanceCreatedEvent) SetActualLrp(value *ActualLRP) { + if m != nil { + m.ActualLrp = value + } +} +func (m *ActualLRPInstanceCreatedEvent) GetTraceId() string { + if m != nil { + return m.TraceId + } + return "" +} +func (m *ActualLRPInstanceCreatedEvent) SetTraceId(value string) { + if m != nil { + m.TraceId = value + } +} func (x *ActualLRPInstanceCreatedEvent) ToProto() *ProtoActualLRPInstanceCreatedEvent { proto := &ProtoActualLRPInstanceCreatedEvent{ ActualLrp: x.ActualLrp.ToProto(), @@ -104,6 +170,116 @@ type ActualLRPInfo struct { AvailabilityZone string } +func (m *ActualLRPInfo) GetActualLrpNetInfo() *ActualLRPNetInfo { + if m != nil { + return m.ActualLrpNetInfo + } + return nil +} +func (m *ActualLRPInfo) SetActualLrpNetInfo(value *ActualLRPNetInfo) { + if m != nil { + m.ActualLrpNetInfo = value + } +} +func (m *ActualLRPInfo) GetCrashCount() int32 { + if m != nil { + return m.CrashCount + } + return 0 +} +func (m *ActualLRPInfo) SetCrashCount(value int32) { + if m != nil { + m.CrashCount = value + } +} +func (m *ActualLRPInfo) GetCrashReason() string { + if m != nil { + return m.CrashReason + } + return "" +} +func (m *ActualLRPInfo) SetCrashReason(value string) { + if m != nil { + m.CrashReason = value + } +} +func (m *ActualLRPInfo) GetState() string { + if m != nil { + return m.State + } + return "" +} +func (m *ActualLRPInfo) SetState(value string) { + if m != nil { + m.State = value + } +} +func (m *ActualLRPInfo) GetPlacementError() string { + if m != nil { + return m.PlacementError + } + return "" +} +func (m *ActualLRPInfo) SetPlacementError(value string) { + if m != nil { + m.PlacementError = value + } +} +func (m *ActualLRPInfo) GetSince() int64 { + if m != nil { + return m.Since + } + return 0 +} +func (m *ActualLRPInfo) SetSince(value int64) { + if m != nil { + m.Since = value + } +} +func (m *ActualLRPInfo) GetModificationTag() *ModificationTag { + if m != nil { + return m.ModificationTag + } + return nil +} +func (m *ActualLRPInfo) SetModificationTag(value *ModificationTag) { + if m != nil { + m.ModificationTag = value + } +} +func (m *ActualLRPInfo) GetPresence() ActualLRP_Presence { + if m != nil { + return m.Presence + } + return 0 +} +func (m *ActualLRPInfo) SetPresence(value ActualLRP_Presence) { + if m != nil { + m.Presence = value + } +} +func (m *ActualLRPInfo) GetProtoRoutable() bool { + if m != nil { + return m.ProtoRoutable + } + return false +} +func (m *ActualLRPInfo) SetProtoRoutable(value bool) { + if m != nil { + m.ProtoRoutable = value + } +} +func (m *ActualLRPInfo) GetAvailabilityZone() string { + if m != nil { + return m.AvailabilityZone + } + return "" +} +func (m *ActualLRPInfo) SetAvailabilityZone(value string) { + if m != nil { + m.AvailabilityZone = value + } +} func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { proto := &ProtoActualLRPInfo{ ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), @@ -137,6 +313,61 @@ type ActualLRPInstanceChangedEvent struct { TraceId string } +func (m *ActualLRPInstanceChangedEvent) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *ActualLRPInstanceChangedEvent) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *ActualLRPInstanceChangedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *ActualLRPInstanceChangedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} +func (m *ActualLRPInstanceChangedEvent) GetBefore() *ActualLRPInfo { + if m != nil { + return m.Before + } + return nil +} +func (m *ActualLRPInstanceChangedEvent) SetBefore(value *ActualLRPInfo) { + if m != nil { + m.Before = value + } +} +func (m *ActualLRPInstanceChangedEvent) GetAfter() *ActualLRPInfo { + if m != nil { + return m.After + } + return nil +} +func (m *ActualLRPInstanceChangedEvent) SetAfter(value *ActualLRPInfo) { + if m != nil { + m.After = value + } +} +func (m *ActualLRPInstanceChangedEvent) GetTraceId() string { + if m != nil { + return m.TraceId + } + return "" +} +func (m *ActualLRPInstanceChangedEvent) SetTraceId(value string) { + if m != nil { + m.TraceId = value + } +} func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChangedEvent { proto := &ProtoActualLRPInstanceChangedEvent{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -162,6 +393,28 @@ type ActualLRPInstanceRemovedEvent struct { TraceId string } +func (m *ActualLRPInstanceRemovedEvent) GetActualLrp() *ActualLRP { + if m != nil { + return m.ActualLrp + } + return nil +} +func (m *ActualLRPInstanceRemovedEvent) SetActualLrp(value *ActualLRP) { + if m != nil { + m.ActualLrp = value + } +} +func (m *ActualLRPInstanceRemovedEvent) GetTraceId() string { + if m != nil { + return m.TraceId + } + return "" +} +func (m *ActualLRPInstanceRemovedEvent) SetTraceId(value string) { + if m != nil { + m.TraceId = value + } +} func (x *ActualLRPInstanceRemovedEvent) ToProto() *ProtoActualLRPInstanceRemovedEvent { proto := &ProtoActualLRPInstanceRemovedEvent{ ActualLrp: x.ActualLrp.ToProto(), @@ -184,6 +437,28 @@ type DesiredLRPCreatedEvent struct { TraceId string } +func (m *DesiredLRPCreatedEvent) GetDesiredLrp() *DesiredLRP { + if m != nil { + return m.DesiredLrp + } + return nil +} +func (m *DesiredLRPCreatedEvent) SetDesiredLrp(value *DesiredLRP) { + if m != nil { + m.DesiredLrp = value + } +} +func (m *DesiredLRPCreatedEvent) GetTraceId() string { + if m != nil { + return m.TraceId + } + return "" +} +func (m *DesiredLRPCreatedEvent) SetTraceId(value string) { + if m != nil { + m.TraceId = value + } +} func (x *DesiredLRPCreatedEvent) ToProto() *ProtoDesiredLRPCreatedEvent { proto := &ProtoDesiredLRPCreatedEvent{ DesiredLrp: x.DesiredLrp.ToProto(), @@ -207,6 +482,39 @@ type DesiredLRPChangedEvent struct { TraceId string } +func (m *DesiredLRPChangedEvent) GetBefore() *DesiredLRP { + if m != nil { + return m.Before + } + return nil +} +func (m *DesiredLRPChangedEvent) SetBefore(value *DesiredLRP) { + if m != nil { + m.Before = value + } +} +func (m *DesiredLRPChangedEvent) GetAfter() *DesiredLRP { + if m != nil { + return m.After + } + return nil +} +func (m *DesiredLRPChangedEvent) SetAfter(value *DesiredLRP) { + if m != nil { + m.After = value + } +} +func (m *DesiredLRPChangedEvent) GetTraceId() string { + if m != nil { + return m.TraceId + } + return "" +} +func (m *DesiredLRPChangedEvent) SetTraceId(value string) { + if m != nil { + m.TraceId = value + } +} func (x *DesiredLRPChangedEvent) ToProto() *ProtoDesiredLRPChangedEvent { proto := &ProtoDesiredLRPChangedEvent{ Before: x.Before.ToProto(), @@ -230,6 +538,28 @@ type DesiredLRPRemovedEvent struct { TraceId string } +func (m *DesiredLRPRemovedEvent) GetDesiredLrp() *DesiredLRP { + if m != nil { + return m.DesiredLrp + } + return nil +} +func (m *DesiredLRPRemovedEvent) SetDesiredLrp(value *DesiredLRP) { + if m != nil { + m.DesiredLrp = value + } +} +func (m *DesiredLRPRemovedEvent) GetTraceId() string { + if m != nil { + return m.TraceId + } + return "" +} +func (m *DesiredLRPRemovedEvent) SetTraceId(value string) { + if m != nil { + m.TraceId = value + } +} func (x *DesiredLRPRemovedEvent) ToProto() *ProtoDesiredLRPRemovedEvent { proto := &ProtoDesiredLRPRemovedEvent{ DesiredLrp: x.DesiredLrp.ToProto(), @@ -255,6 +585,61 @@ type ActualLRPCrashedEvent struct { Since int64 } +func (m *ActualLRPCrashedEvent) GetActualLrpKey() *ActualLRPKey { + if m != nil { + return m.ActualLrpKey + } + return nil +} +func (m *ActualLRPCrashedEvent) SetActualLrpKey(value *ActualLRPKey) { + if m != nil { + m.ActualLrpKey = value + } +} +func (m *ActualLRPCrashedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { + if m != nil { + return m.ActualLrpInstanceKey + } + return nil +} +func (m *ActualLRPCrashedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { + if m != nil { + m.ActualLrpInstanceKey = value + } +} +func (m *ActualLRPCrashedEvent) GetCrashCount() int32 { + if m != nil { + return m.CrashCount + } + return 0 +} +func (m *ActualLRPCrashedEvent) SetCrashCount(value int32) { + if m != nil { + m.CrashCount = value + } +} +func (m *ActualLRPCrashedEvent) GetCrashReason() string { + if m != nil { + return m.CrashReason + } + return "" +} +func (m *ActualLRPCrashedEvent) SetCrashReason(value string) { + if m != nil { + m.CrashReason = value + } +} +func (m *ActualLRPCrashedEvent) GetSince() int64 { + if m != nil { + return m.Since + } + return 0 +} +func (m *ActualLRPCrashedEvent) SetSince(value int64) { + if m != nil { + m.Since = value + } +} func (x *ActualLRPCrashedEvent) ToProto() *ProtoActualLRPCrashedEvent { proto := &ProtoActualLRPCrashedEvent{ ActualLrpKey: x.ActualLrpKey.ToProto(), @@ -279,6 +664,17 @@ type EventsByCellId struct { CellId string } +func (m *EventsByCellId) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *EventsByCellId) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} func (x *EventsByCellId) ToProto() *ProtoEventsByCellId { proto := &ProtoEventsByCellId{ CellId: x.CellId, @@ -299,6 +695,17 @@ type TaskCreatedEvent struct { Task *Task } +func (m *TaskCreatedEvent) GetTask() *Task { + if m != nil { + return m.Task + } + return nil +} +func (m *TaskCreatedEvent) SetTask(value *Task) { + if m != nil { + m.Task = value + } +} func (x *TaskCreatedEvent) ToProto() *ProtoTaskCreatedEvent { proto := &ProtoTaskCreatedEvent{ Task: x.Task.ToProto(), @@ -320,6 +727,28 @@ type TaskChangedEvent struct { After *Task } +func (m *TaskChangedEvent) GetBefore() *Task { + if m != nil { + return m.Before + } + return nil +} +func (m *TaskChangedEvent) SetBefore(value *Task) { + if m != nil { + m.Before = value + } +} +func (m *TaskChangedEvent) GetAfter() *Task { + if m != nil { + return m.After + } + return nil +} +func (m *TaskChangedEvent) SetAfter(value *Task) { + if m != nil { + m.After = value + } +} func (x *TaskChangedEvent) ToProto() *ProtoTaskChangedEvent { proto := &ProtoTaskChangedEvent{ Before: x.Before.ToProto(), @@ -341,6 +770,17 @@ type TaskRemovedEvent struct { Task *Task } +func (m *TaskRemovedEvent) GetTask() *Task { + if m != nil { + return m.Task + } + return nil +} +func (m *TaskRemovedEvent) SetTask(value *Task) { + if m != nil { + m.Task = value + } +} func (x *TaskRemovedEvent) ToProto() *ProtoTaskRemovedEvent { proto := &ProtoTaskRemovedEvent{ Task: x.Task.ToProto(), diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 6b3467d9..df9ae46b 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -270,44 +270,54 @@ var File_image_layer_proto protoreflect.FileDescriptor var file_image_layer_proto_rawDesc = []byte{ 0x0a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x9d, 0x04, 0x0a, 0x0f, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, - 0x68, 0x12, 0x3c, 0x0a, 0x0a, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x54, - 0x79, 0x70, 0x65, 0x52, 0x0a, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, - 0x41, 0x0a, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x64, - 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x12, 0x52, 0x0a, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, - 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, - 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, - 0x72, 0x69, 0x74, 0x68, 0x6d, 0x52, 0x0f, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, - 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, - 0x67, 0x65, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x49, 0x0a, 0x0f, 0x44, 0x69, 0x67, - 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x16, - 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x49, - 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x32, - 0x35, 0x36, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x35, 0x31, 0x32, 0x10, 0x02, - 0x1a, 0x02, 0x08, 0x01, 0x22, 0x3c, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, - 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x47, 0x5a, 0x10, 0x01, - 0x12, 0x07, 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x5a, 0x49, 0x50, - 0x10, 0x03, 0x22, 0x37, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x61, + 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xad, 0x05, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, + 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x65, 0x73, 0x74, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3c, 0x0a, 0x0a, + 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, + 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x41, 0x0a, 0x0a, 0x6d, 0x65, + 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, + 0x65, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x52, 0x0a, + 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, + 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, + 0x2e, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, + 0x52, 0x0f, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, + 0x6d, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7b, 0x0a, 0x0f, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, + 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x16, 0x44, 0x69, 0x67, 0x65, 0x73, + 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, + 0x64, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x01, 0x1a, + 0x18, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, + 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x26, 0x0a, 0x06, 0x53, 0x48, 0x41, + 0x35, 0x31, 0x32, 0x10, 0x02, 0x1a, 0x1a, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, + 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x35, 0x31, 0x32, 0x08, + 0x01, 0x22, 0x6f, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, + 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, + 0x69, 0x64, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x47, 0x5a, 0x10, 0x01, 0x1a, 0x0f, 0x82, + 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x67, 0x7a, 0x12, 0x18, + 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, + 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x03, 0x5a, 0x49, 0x50, 0x10, + 0x03, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x5a, + 0x69, 0x70, 0x22, 0x62, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, - 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, - 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, 0x49, 0x56, 0x45, 0x10, 0x02, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x1e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x10, 0x01, 0x1a, 0x12, 0x82, 0x7d, + 0x0f, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, + 0x12, 0x24, 0x0a, 0x09, 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, 0x49, 0x56, 0x45, 0x10, 0x02, 0x1a, + 0x15, 0x82, 0x7d, 0x12, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x45, 0x78, 0x63, + 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, + 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, + 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -346,6 +356,7 @@ func file_image_layer_proto_init() { if File_image_layer_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_image_layer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoImageLayer); i { diff --git a/models/image_layer.proto b/models/image_layer.proto index 5cacb4fb..c6b06e80 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; message ProtoImageLayer { enum DigestAlgorithm { diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 9d28b397..f0ff6436 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -10,25 +10,25 @@ type ImageLayer_DigestAlgorithm int32 const ( ImageLayer_DigestAlgorithmInvalid ImageLayer_DigestAlgorithm = 0 - ImageLayer_SHA256 ImageLayer_DigestAlgorithm = 1 - ImageLayer_SHA512 ImageLayer_DigestAlgorithm = 2 + ImageLayer_DigestAlgorithmSha256 ImageLayer_DigestAlgorithm = 1 + ImageLayer_DigestAlgorithmSha512 ImageLayer_DigestAlgorithm = 2 ) type ImageLayer_MediaType int32 const ( ImageLayer_MediaTypeInvalid ImageLayer_MediaType = 0 - ImageLayer_TGZ ImageLayer_MediaType = 1 - ImageLayer_TAR ImageLayer_MediaType = 2 - ImageLayer_ZIP ImageLayer_MediaType = 3 + ImageLayer_MediaTypeTgz ImageLayer_MediaType = 1 + ImageLayer_MediaTypeTar ImageLayer_MediaType = 2 + ImageLayer_MediaTypeZip ImageLayer_MediaType = 3 ) type ImageLayer_Type int32 const ( - ImageLayer_LayerTypeInvalid ImageLayer_Type = 0 - ImageLayer_SHARED ImageLayer_Type = 1 - ImageLayer_EXCLUSIVE ImageLayer_Type = 2 + ImageLayer_LayerTypeInvalid ImageLayer_Type = 0 + ImageLayer_LayerTypeShared ImageLayer_Type = 1 + ImageLayer_LayerTypeExclusive ImageLayer_Type = 2 ) // Prevent copylock errors when using ProtoImageLayer directly @@ -42,6 +42,83 @@ type ImageLayer struct { DigestValue string } +func (m *ImageLayer) GetName() string { + if m != nil { + return m.Name + } + return "" +} +func (m *ImageLayer) SetName(value string) { + if m != nil { + m.Name = value + } +} +func (m *ImageLayer) GetUrl() string { + if m != nil { + return m.Url + } + return "" +} +func (m *ImageLayer) SetUrl(value string) { + if m != nil { + m.Url = value + } +} +func (m *ImageLayer) GetDestinationPath() string { + if m != nil { + return m.DestinationPath + } + return "" +} +func (m *ImageLayer) SetDestinationPath(value string) { + if m != nil { + m.DestinationPath = value + } +} +func (m *ImageLayer) GetLayerType() ImageLayer_Type { + if m != nil { + return m.LayerType + } + return 0 +} +func (m *ImageLayer) SetLayerType(value ImageLayer_Type) { + if m != nil { + m.LayerType = value + } +} +func (m *ImageLayer) GetMediaType() ImageLayer_MediaType { + if m != nil { + return m.MediaType + } + return 0 +} +func (m *ImageLayer) SetMediaType(value ImageLayer_MediaType) { + if m != nil { + m.MediaType = value + } +} +func (m *ImageLayer) GetDigestAlgorithm() ImageLayer_DigestAlgorithm { + if m != nil { + return m.DigestAlgorithm + } + return 0 +} +func (m *ImageLayer) SetDigestAlgorithm(value ImageLayer_DigestAlgorithm) { + if m != nil { + m.DigestAlgorithm = value + } +} +func (m *ImageLayer) GetDigestValue() string { + if m != nil { + return m.DigestValue + } + return "" +} +func (m *ImageLayer) SetDigestValue(value string) { + if m != nil { + m.DigestValue = value + } +} func (x *ImageLayer) ToProto() *ProtoImageLayer { proto := &ProtoImageLayer{ Name: x.Name, diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 70562511..dec11284 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -11,6 +11,17 @@ type LogRateLimit struct { BytesPerSecond int64 } +func (m *LogRateLimit) GetBytesPerSecond() int64 { + if m != nil { + return m.BytesPerSecond + } + return 0 +} +func (m *LogRateLimit) SetBytesPerSecond(value int64) { + if m != nil { + m.BytesPerSecond = value + } +} func (x *LogRateLimit) ToProto() *ProtoLogRateLimit { proto := &ProtoLogRateLimit{ BytesPerSecond: x.BytesPerSecond, diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 4e66eda6..38f7ee4d 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -130,22 +130,27 @@ var File_metric_tags_proto protoreflect.FileDescriptor var file_metric_tags_proto_rawDesc = []byte{ 0x0a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0xb8, 0x01, 0x0a, 0x13, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x12, 0x42, 0x0a, 0x07, 0x64, - 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, - 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x22, - 0x45, 0x0a, 0x0c, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, - 0x17, 0x0a, 0x13, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, - 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x49, 0x4e, 0x44, 0x45, - 0x58, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x5f, - 0x47, 0x55, 0x49, 0x44, 0x10, 0x02, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, - 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, - 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfc, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, + 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x12, 0x42, 0x0a, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, + 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x52, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x22, 0x88, 0x01, 0x0a, 0x0c, 0x44, + 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x44, + 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, + 0x69, 0x64, 0x10, 0x00, 0x12, 0x27, 0x0a, 0x05, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0x01, 0x1a, + 0x1c, 0x82, 0x7d, 0x19, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x79, 0x6e, 0x61, + 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x36, 0x0a, + 0x0d, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x47, 0x55, 0x49, 0x44, 0x10, 0x02, + 0x1a, 0x23, 0x82, 0x7d, 0x20, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x79, 0x6e, + 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x47, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, + 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, + 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -180,6 +185,7 @@ func file_metric_tags_proto_init() { if File_metric_tags_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_metric_tags_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoMetricTagValue); i { diff --git a/models/metric_tags.proto b/models/metric_tags.proto index 6aaa89cb..1e1374b4 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; message ProtoMetricTagValue { enum DynamicValue { diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 21387faa..249f22ce 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -9,9 +9,9 @@ package models type MetricTagValue_DynamicValue int32 const ( - MetricTagValue_DynamicValueInvalid MetricTagValue_DynamicValue = 0 - MetricTagValue_INDEX MetricTagValue_DynamicValue = 1 - MetricTagValue_INSTANCE_GUID MetricTagValue_DynamicValue = 2 + MetricTagValue_DynamicValueInvalid MetricTagValue_DynamicValue = 0 + MetricTagValue_MetricTagynamicValueIndex MetricTagValue_DynamicValue = 1 + MetricTagValue_MetricTagynamicValueInstanceGuid MetricTagValue_DynamicValue = 2 ) // Prevent copylock errors when using ProtoMetricTagValue directly @@ -20,6 +20,28 @@ type MetricTagValue struct { Dynamic MetricTagValue_DynamicValue } +func (m *MetricTagValue) GetStatic() string { + if m != nil { + return m.Static + } + return "" +} +func (m *MetricTagValue) SetStatic(value string) { + if m != nil { + m.Static = value + } +} +func (m *MetricTagValue) GetDynamic() MetricTagValue_DynamicValue { + if m != nil { + return m.Dynamic + } + return 0 +} +func (m *MetricTagValue) SetDynamic(value MetricTagValue_DynamicValue) { + if m != nil { + m.Dynamic = value + } +} func (x *MetricTagValue) ToProto() *ProtoMetricTagValue { proto := &ProtoMetricTagValue{ Static: x.Static, diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index c6f03cd8..223e23c7 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -12,6 +12,28 @@ type ModificationTag struct { Index uint32 } +func (m *ModificationTag) GetEpoch() string { + if m != nil { + return m.Epoch + } + return "" +} +func (m *ModificationTag) SetEpoch(value string) { + if m != nil { + m.Epoch = value + } +} +func (m *ModificationTag) GetIndex() uint32 { + if m != nil { + return m.Index + } + return 0 +} +func (m *ModificationTag) SetIndex(value uint32) { + if m != nil { + m.Index = value + } +} func (x *ModificationTag) ToProto() *ProtoModificationTag { proto := &ProtoModificationTag{ Epoch: x.Epoch, diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index ad47d9c6..d972799a 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -11,6 +11,17 @@ type Network struct { Properties map[string]string } +func (m *Network) GetProperties() map[string]string { + if m != nil { + return m.Properties + } + return nil +} +func (m *Network) SetProperties(value map[string]string) { + if m != nil { + m.Properties = value + } +} func (x *Network) ToProto() *ProtoNetwork { proto := &ProtoNetwork{ Properties: x.Properties, diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 36518224..bebc7e0e 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -11,6 +11,17 @@ type PingResponse struct { Available bool } +func (m *PingResponse) GetAvailable() bool { + if m != nil { + return m.Available + } + return false +} +func (m *PingResponse) SetAvailable(value bool) { + if m != nil { + m.Available = value + } +} func (x *PingResponse) ToProto() *ProtoPingResponse { proto := &ProtoPingResponse{ Available: x.Available, diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 40521743..a06b38da 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -12,6 +12,28 @@ type PortRange struct { End uint32 } +func (m *PortRange) GetStart() uint32 { + if m != nil { + return m.Start + } + return 0 +} +func (m *PortRange) SetStart(value uint32) { + if m != nil { + m.Start = value + } +} +func (m *PortRange) GetEnd() uint32 { + if m != nil { + return m.End + } + return 0 +} +func (m *PortRange) SetEnd(value uint32) { + if m != nil { + m.End = value + } +} func (x *PortRange) ToProto() *ProtoPortRange { proto := &ProtoPortRange{ Start: x.Start, @@ -34,6 +56,28 @@ type ICMPInfo struct { Code int32 } +func (m *ICMPInfo) GetType() int32 { + if m != nil { + return m.Type + } + return 0 +} +func (m *ICMPInfo) SetType(value int32) { + if m != nil { + m.Type = value + } +} +func (m *ICMPInfo) GetCode() int32 { + if m != nil { + return m.Code + } + return 0 +} +func (m *ICMPInfo) SetCode(value int32) { + if m != nil { + m.Code = value + } +} func (x *ICMPInfo) ToProto() *ProtoICMPInfo { proto := &ProtoICMPInfo{ Type: x.Type, @@ -61,6 +105,83 @@ type SecurityGroupRule struct { Annotations []string } +func (m *SecurityGroupRule) GetProtocol() string { + if m != nil { + return m.Protocol + } + return "" +} +func (m *SecurityGroupRule) SetProtocol(value string) { + if m != nil { + m.Protocol = value + } +} +func (m *SecurityGroupRule) GetDestinations() []string { + if m != nil { + return m.Destinations + } + return nil +} +func (m *SecurityGroupRule) SetDestinations(value []string) { + if m != nil { + m.Destinations = value + } +} +func (m *SecurityGroupRule) GetPorts() []uint32 { + if m != nil { + return m.Ports + } + return 0 +} +func (m *SecurityGroupRule) SetPorts(value []uint32) { + if m != nil { + m.Ports = value + } +} +func (m *SecurityGroupRule) GetPortRange() *PortRange { + if m != nil { + return m.PortRange + } + return nil +} +func (m *SecurityGroupRule) SetPortRange(value *PortRange) { + if m != nil { + m.PortRange = value + } +} +func (m *SecurityGroupRule) GetIcmpInfo() *ICMPInfo { + if m != nil { + return m.IcmpInfo + } + return nil +} +func (m *SecurityGroupRule) SetIcmpInfo(value *ICMPInfo) { + if m != nil { + m.IcmpInfo = value + } +} +func (m *SecurityGroupRule) GetLog() bool { + if m != nil { + return m.Log + } + return false +} +func (m *SecurityGroupRule) SetLog(value bool) { + if m != nil { + m.Log = value + } +} +func (m *SecurityGroupRule) GetAnnotations() []string { + if m != nil { + return m.Annotations + } + return nil +} +func (m *SecurityGroupRule) SetAnnotations(value []string) { + if m != nil { + m.Annotations = value + } +} func (x *SecurityGroupRule) ToProto() *ProtoSecurityGroupRule { proto := &ProtoSecurityGroupRule{ Protocol: x.Protocol, diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index eb8725c2..06a22af1 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -13,6 +13,39 @@ type Sidecar struct { MemoryMb int32 } +func (m *Sidecar) GetAction() *Action { + if m != nil { + return m.Action + } + return nil +} +func (m *Sidecar) SetAction(value *Action) { + if m != nil { + m.Action = value + } +} +func (m *Sidecar) GetDiskMb() int32 { + if m != nil { + return m.DiskMb + } + return 0 +} +func (m *Sidecar) SetDiskMb(value int32) { + if m != nil { + m.DiskMb = value + } +} +func (m *Sidecar) GetMemoryMb() int32 { + if m != nil { + return m.MemoryMb + } + return 0 +} +func (m *Sidecar) SetMemoryMb(value int32) { + if m != nil { + m.MemoryMb = value + } +} func (x *Sidecar) ToProto() *ProtoSidecar { proto := &ProtoSidecar{ Action: x.Action.ToProto(), diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index b1eb2a72..78ef0dc1 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -37,6 +37,305 @@ type TaskDefinition struct { MetricTags map[string]*ProtoMetricTagValue } +func (m *TaskDefinition) GetRootFs() string { + if m != nil { + return m.RootFs + } + return "" +} +func (m *TaskDefinition) SetRootFs(value string) { + if m != nil { + m.RootFs = value + } +} +func (m *TaskDefinition) GetEnvironmentVariables() []*EnvironmentVariable { + if m != nil { + return m.EnvironmentVariables + } + return nil +} +func (m *TaskDefinition) SetEnvironmentVariables(value []*EnvironmentVariable) { + if m != nil { + m.EnvironmentVariables = value + } +} +func (m *TaskDefinition) GetAction() *Action { + if m != nil { + return m.Action + } + return nil +} +func (m *TaskDefinition) SetAction(value *Action) { + if m != nil { + m.Action = value + } +} +func (m *TaskDefinition) GetDiskMb() int32 { + if m != nil { + return m.DiskMb + } + return 0 +} +func (m *TaskDefinition) SetDiskMb(value int32) { + if m != nil { + m.DiskMb = value + } +} +func (m *TaskDefinition) GetMemoryMb() int32 { + if m != nil { + return m.MemoryMb + } + return 0 +} +func (m *TaskDefinition) SetMemoryMb(value int32) { + if m != nil { + m.MemoryMb = value + } +} +func (m *TaskDefinition) GetCpuWeight() uint32 { + if m != nil { + return m.CpuWeight + } + return 0 +} +func (m *TaskDefinition) SetCpuWeight(value uint32) { + if m != nil { + m.CpuWeight = value + } +} +func (m *TaskDefinition) GetPrivileged() bool { + if m != nil { + return m.Privileged + } + return false +} +func (m *TaskDefinition) SetPrivileged(value bool) { + if m != nil { + m.Privileged = value + } +} +func (m *TaskDefinition) GetLogSource() string { + if m != nil { + return m.LogSource + } + return "" +} +func (m *TaskDefinition) SetLogSource(value string) { + if m != nil { + m.LogSource = value + } +} +func (m *TaskDefinition) GetLogGuid() string { + if m != nil { + return m.LogGuid + } + return "" +} +func (m *TaskDefinition) SetLogGuid(value string) { + if m != nil { + m.LogGuid = value + } +} +func (m *TaskDefinition) GetMetricsGuid() string { + if m != nil { + return m.MetricsGuid + } + return "" +} +func (m *TaskDefinition) SetMetricsGuid(value string) { + if m != nil { + m.MetricsGuid = value + } +} +func (m *TaskDefinition) GetResultFile() string { + if m != nil { + return m.ResultFile + } + return "" +} +func (m *TaskDefinition) SetResultFile(value string) { + if m != nil { + m.ResultFile = value + } +} +func (m *TaskDefinition) GetCompletionCallbackUrl() string { + if m != nil { + return m.CompletionCallbackUrl + } + return "" +} +func (m *TaskDefinition) SetCompletionCallbackUrl(value string) { + if m != nil { + m.CompletionCallbackUrl = value + } +} +func (m *TaskDefinition) GetAnnotation() string { + if m != nil { + return m.Annotation + } + return "" +} +func (m *TaskDefinition) SetAnnotation(value string) { + if m != nil { + m.Annotation = value + } +} +func (m *TaskDefinition) GetEgressRules() []*SecurityGroupRule { + if m != nil { + return m.EgressRules + } + return nil +} +func (m *TaskDefinition) SetEgressRules(value []*SecurityGroupRule) { + if m != nil { + m.EgressRules = value + } +} +func (m *TaskDefinition) GetCachedDependencies() []*CachedDependency { + if m != nil { + return m.CachedDependencies + } + return nil +} +func (m *TaskDefinition) SetCachedDependencies(value []*CachedDependency) { + if m != nil { + m.CachedDependencies = value + } +} + +// DEPRECATED: DO NOT USE +func (m *TaskDefinition) GetLegacyDownloadUser() string { + if m != nil { + return m.LegacyDownloadUser + } + return "" +} +func (m *TaskDefinition) SetLegacyDownloadUser(value string) { + if m != nil { + m.LegacyDownloadUser = value + } +} +func (m *TaskDefinition) GetTrustedSystemCertificatesPath() string { + if m != nil { + return m.TrustedSystemCertificatesPath + } + return "" +} +func (m *TaskDefinition) SetTrustedSystemCertificatesPath(value string) { + if m != nil { + m.TrustedSystemCertificatesPath = value + } +} +func (m *TaskDefinition) GetVolumeMounts() []*VolumeMount { + if m != nil { + return m.VolumeMounts + } + return nil +} +func (m *TaskDefinition) SetVolumeMounts(value []*VolumeMount) { + if m != nil { + m.VolumeMounts = value + } +} +func (m *TaskDefinition) GetNetwork() *Network { + if m != nil { + return m.Network + } + return nil +} +func (m *TaskDefinition) SetNetwork(value *Network) { + if m != nil { + m.Network = value + } +} +func (m *TaskDefinition) GetPlacementTags() []string { + if m != nil { + return m.PlacementTags + } + return nil +} +func (m *TaskDefinition) SetPlacementTags(value []string) { + if m != nil { + m.PlacementTags = value + } +} +func (m *TaskDefinition) GetMaxPids() int32 { + if m != nil { + return m.MaxPids + } + return 0 +} +func (m *TaskDefinition) SetMaxPids(value int32) { + if m != nil { + m.MaxPids = value + } +} +func (m *TaskDefinition) GetCertificateProperties() *CertificateProperties { + if m != nil { + return m.CertificateProperties + } + return nil +} +func (m *TaskDefinition) SetCertificateProperties(value *CertificateProperties) { + if m != nil { + m.CertificateProperties = value + } +} +func (m *TaskDefinition) GetImageUsername() string { + if m != nil { + return m.ImageUsername + } + return "" +} +func (m *TaskDefinition) SetImageUsername(value string) { + if m != nil { + m.ImageUsername = value + } +} +func (m *TaskDefinition) GetImagePassword() string { + if m != nil { + return m.ImagePassword + } + return "" +} +func (m *TaskDefinition) SetImagePassword(value string) { + if m != nil { + m.ImagePassword = value + } +} +func (m *TaskDefinition) GetImageLayers() []*ImageLayer { + if m != nil { + return m.ImageLayers + } + return nil +} +func (m *TaskDefinition) SetImageLayers(value []*ImageLayer) { + if m != nil { + m.ImageLayers = value + } +} +func (m *TaskDefinition) GetLogRateLimit() *LogRateLimit { + if m != nil { + return m.LogRateLimit + } + return nil +} +func (m *TaskDefinition) SetLogRateLimit(value *LogRateLimit) { + if m != nil { + m.LogRateLimit = value + } +} +func (m *TaskDefinition) GetMetricTags() map[string]*ProtoMetricTagValue { + if m != nil { + return m.MetricTags + } + return nil +} +func (m *TaskDefinition) SetMetricTags(value map[string]*ProtoMetricTagValue) { + if m != nil { + m.MetricTags = value + } +} func (x *TaskDefinition) ToProto() *ProtoTaskDefinition { proto := &ProtoTaskDefinition{ RootFs: x.RootFs, @@ -105,6 +404,149 @@ type Task struct { RejectionReason string } +func (m *Task) GetTaskDefinition() *TaskDefinition { + if m != nil { + return m.TaskDefinition + } + return nil +} +func (m *Task) SetTaskDefinition(value *TaskDefinition) { + if m != nil { + m.TaskDefinition = value + } +} +func (m *Task) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *Task) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} +func (m *Task) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *Task) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *Task) GetCreatedAt() int64 { + if m != nil { + return m.CreatedAt + } + return 0 +} +func (m *Task) SetCreatedAt(value int64) { + if m != nil { + m.CreatedAt = value + } +} +func (m *Task) GetUpdatedAt() int64 { + if m != nil { + return m.UpdatedAt + } + return 0 +} +func (m *Task) SetUpdatedAt(value int64) { + if m != nil { + m.UpdatedAt = value + } +} +func (m *Task) GetFirstCompletedAt() int64 { + if m != nil { + return m.FirstCompletedAt + } + return 0 +} +func (m *Task) SetFirstCompletedAt(value int64) { + if m != nil { + m.FirstCompletedAt = value + } +} +func (m *Task) GetState() Task_State { + if m != nil { + return m.State + } + return 0 +} +func (m *Task) SetState(value Task_State) { + if m != nil { + m.State = value + } +} +func (m *Task) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *Task) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} +func (m *Task) GetResult() string { + if m != nil { + return m.Result + } + return "" +} +func (m *Task) SetResult(value string) { + if m != nil { + m.Result = value + } +} +func (m *Task) GetFailed() bool { + if m != nil { + return m.Failed + } + return false +} +func (m *Task) SetFailed(value bool) { + if m != nil { + m.Failed = value + } +} +func (m *Task) GetFailureReason() string { + if m != nil { + return m.FailureReason + } + return "" +} +func (m *Task) SetFailureReason(value string) { + if m != nil { + m.FailureReason = value + } +} +func (m *Task) GetRejectionCount() int32 { + if m != nil { + return m.RejectionCount + } + return 0 +} +func (m *Task) SetRejectionCount(value int32) { + if m != nil { + m.RejectionCount = value + } +} +func (m *Task) GetRejectionReason() string { + if m != nil { + return m.RejectionReason + } + return "" +} +func (m *Task) SetRejectionReason(value string) { + if m != nil { + m.RejectionReason = value + } +} func (x *Task) ToProto() *ProtoTask { proto := &ProtoTask{ TaskDefinition: x.TaskDefinition.ToProto(), diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 83a0856b..71f34c84 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -11,6 +11,17 @@ type TaskLifecycleResponse struct { Error *Error } +func (m *TaskLifecycleResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *TaskLifecycleResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} func (x *TaskLifecycleResponse) ToProto() *ProtoTaskLifecycleResponse { proto := &ProtoTaskLifecycleResponse{ Error: x.Error.ToProto(), @@ -33,6 +44,39 @@ type DesireTaskRequest struct { Domain string } +func (m *DesireTaskRequest) GetTaskDefinition() *TaskDefinition { + if m != nil { + return m.TaskDefinition + } + return nil +} +func (m *DesireTaskRequest) SetTaskDefinition(value *TaskDefinition) { + if m != nil { + m.TaskDefinition = value + } +} +func (m *DesireTaskRequest) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *DesireTaskRequest) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} +func (m *DesireTaskRequest) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *DesireTaskRequest) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} func (x *DesireTaskRequest) ToProto() *ProtoDesireTaskRequest { proto := &ProtoDesireTaskRequest{ TaskDefinition: x.TaskDefinition.ToProto(), @@ -56,6 +100,28 @@ type StartTaskRequest struct { CellId string } +func (m *StartTaskRequest) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *StartTaskRequest) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} +func (m *StartTaskRequest) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *StartTaskRequest) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} func (x *StartTaskRequest) ToProto() *ProtoStartTaskRequest { proto := &ProtoStartTaskRequest{ TaskGuid: x.TaskGuid, @@ -78,6 +144,28 @@ type StartTaskResponse struct { ShouldStart bool } +func (m *StartTaskResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *StartTaskResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *StartTaskResponse) GetShouldStart() bool { + if m != nil { + return m.ShouldStart + } + return false +} +func (m *StartTaskResponse) SetShouldStart(value bool) { + if m != nil { + m.ShouldStart = value + } +} func (x *StartTaskResponse) ToProto() *ProtoStartTaskResponse { proto := &ProtoStartTaskResponse{ Error: x.Error.ToProto(), @@ -100,6 +188,28 @@ type FailTaskRequest struct { FailureReason string } +func (m *FailTaskRequest) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *FailTaskRequest) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} +func (m *FailTaskRequest) GetFailureReason() string { + if m != nil { + return m.FailureReason + } + return "" +} +func (m *FailTaskRequest) SetFailureReason(value string) { + if m != nil { + m.FailureReason = value + } +} func (x *FailTaskRequest) ToProto() *ProtoFailTaskRequest { proto := &ProtoFailTaskRequest{ TaskGuid: x.TaskGuid, @@ -122,6 +232,28 @@ type RejectTaskRequest struct { RejectionReason string } +func (m *RejectTaskRequest) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *RejectTaskRequest) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} +func (m *RejectTaskRequest) GetRejectionReason() string { + if m != nil { + return m.RejectionReason + } + return "" +} +func (m *RejectTaskRequest) SetRejectionReason(value string) { + if m != nil { + m.RejectionReason = value + } +} func (x *RejectTaskRequest) ToProto() *ProtoRejectTaskRequest { proto := &ProtoRejectTaskRequest{ TaskGuid: x.TaskGuid, @@ -143,6 +275,17 @@ type TaskGuidRequest struct { TaskGuid string } +func (m *TaskGuidRequest) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *TaskGuidRequest) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} func (x *TaskGuidRequest) ToProto() *ProtoTaskGuidRequest { proto := &ProtoTaskGuidRequest{ TaskGuid: x.TaskGuid, @@ -167,6 +310,61 @@ type CompleteTaskRequest struct { Result string } +func (m *CompleteTaskRequest) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *CompleteTaskRequest) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} +func (m *CompleteTaskRequest) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *CompleteTaskRequest) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} +func (m *CompleteTaskRequest) GetFailed() bool { + if m != nil { + return m.Failed + } + return false +} +func (m *CompleteTaskRequest) SetFailed(value bool) { + if m != nil { + m.Failed = value + } +} +func (m *CompleteTaskRequest) GetFailureReason() string { + if m != nil { + return m.FailureReason + } + return "" +} +func (m *CompleteTaskRequest) SetFailureReason(value string) { + if m != nil { + m.FailureReason = value + } +} +func (m *CompleteTaskRequest) GetResult() string { + if m != nil { + return m.Result + } + return "" +} +func (m *CompleteTaskRequest) SetResult(value string) { + if m != nil { + m.Result = value + } +} func (x *CompleteTaskRequest) ToProto() *ProtoCompleteTaskRequest { proto := &ProtoCompleteTaskRequest{ TaskGuid: x.TaskGuid, @@ -196,6 +394,72 @@ type TaskCallbackResponse struct { CreatedAt int64 } +func (m *TaskCallbackResponse) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *TaskCallbackResponse) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} +func (m *TaskCallbackResponse) GetFailed() bool { + if m != nil { + return m.Failed + } + return false +} +func (m *TaskCallbackResponse) SetFailed(value bool) { + if m != nil { + m.Failed = value + } +} +func (m *TaskCallbackResponse) GetFailureReason() string { + if m != nil { + return m.FailureReason + } + return "" +} +func (m *TaskCallbackResponse) SetFailureReason(value string) { + if m != nil { + m.FailureReason = value + } +} +func (m *TaskCallbackResponse) GetResult() string { + if m != nil { + return m.Result + } + return "" +} +func (m *TaskCallbackResponse) SetResult(value string) { + if m != nil { + m.Result = value + } +} +func (m *TaskCallbackResponse) GetAnnotation() string { + if m != nil { + return m.Annotation + } + return "" +} +func (m *TaskCallbackResponse) SetAnnotation(value string) { + if m != nil { + m.Annotation = value + } +} +func (m *TaskCallbackResponse) GetCreatedAt() int64 { + if m != nil { + return m.CreatedAt + } + return 0 +} +func (m *TaskCallbackResponse) SetCreatedAt(value int64) { + if m != nil { + m.CreatedAt = value + } +} func (x *TaskCallbackResponse) ToProto() *ProtoTaskCallbackResponse { proto := &ProtoTaskCallbackResponse{ TaskGuid: x.TaskGuid, @@ -222,6 +486,28 @@ type TasksRequest struct { CellId string } +func (m *TasksRequest) GetDomain() string { + if m != nil { + return m.Domain + } + return "" +} +func (m *TasksRequest) SetDomain(value string) { + if m != nil { + m.Domain = value + } +} +func (m *TasksRequest) GetCellId() string { + if m != nil { + return m.CellId + } + return "" +} +func (m *TasksRequest) SetCellId(value string) { + if m != nil { + m.CellId = value + } +} func (x *TasksRequest) ToProto() *ProtoTasksRequest { proto := &ProtoTasksRequest{ Domain: x.Domain, @@ -244,6 +530,28 @@ type TasksResponse struct { Tasks []*Task } +func (m *TasksResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *TasksResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *TasksResponse) GetTasks() []*Task { + if m != nil { + return m.Tasks + } + return nil +} +func (m *TasksResponse) SetTasks(value []*Task) { + if m != nil { + m.Tasks = value + } +} func (x *TasksResponse) ToProto() *ProtoTasksResponse { proto := &ProtoTasksResponse{ Error: x.Error.ToProto(), @@ -265,6 +573,17 @@ type TaskByGuidRequest struct { TaskGuid string } +func (m *TaskByGuidRequest) GetTaskGuid() string { + if m != nil { + return m.TaskGuid + } + return "" +} +func (m *TaskByGuidRequest) SetTaskGuid(value string) { + if m != nil { + m.TaskGuid = value + } +} func (x *TaskByGuidRequest) ToProto() *ProtoTaskByGuidRequest { proto := &ProtoTaskByGuidRequest{ TaskGuid: x.TaskGuid, @@ -286,6 +605,28 @@ type TaskResponse struct { Task *Task } +func (m *TaskResponse) GetError() *Error { + if m != nil { + return m.Error + } + return nil +} +func (m *TaskResponse) SetError(value *Error) { + if m != nil { + m.Error = value + } +} +func (m *TaskResponse) GetTask() *Task { + if m != nil { + return m.Task + } + return nil +} +func (m *TaskResponse) SetTask(value *Task) { + if m != nil { + m.Task = value + } +} func (x *TaskResponse) ToProto() *ProtoTaskResponse { proto := &ProtoTaskResponse{ Error: x.Error.ToProto(), diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 2982930c..b98d7e55 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -12,6 +12,28 @@ type SharedDevice struct { MountConfig string } +func (m *SharedDevice) GetVolumeId() string { + if m != nil { + return m.VolumeId + } + return "" +} +func (m *SharedDevice) SetVolumeId(value string) { + if m != nil { + m.VolumeId = value + } +} +func (m *SharedDevice) GetMountConfig() string { + if m != nil { + return m.MountConfig + } + return "" +} +func (m *SharedDevice) SetMountConfig(value string) { + if m != nil { + m.MountConfig = value + } +} func (x *SharedDevice) ToProto() *ProtoSharedDevice { proto := &ProtoSharedDevice{ VolumeId: x.VolumeId, @@ -36,6 +58,50 @@ type VolumeMount struct { Shared *SharedDevice } +func (m *VolumeMount) GetDriver() string { + if m != nil { + return m.Driver + } + return "" +} +func (m *VolumeMount) SetDriver(value string) { + if m != nil { + m.Driver = value + } +} +func (m *VolumeMount) GetContainerDir() string { + if m != nil { + return m.ContainerDir + } + return "" +} +func (m *VolumeMount) SetContainerDir(value string) { + if m != nil { + m.ContainerDir = value + } +} +func (m *VolumeMount) GetMode() string { + if m != nil { + return m.Mode + } + return "" +} +func (m *VolumeMount) SetMode(value string) { + if m != nil { + m.Mode = value + } +} +func (m *VolumeMount) GetShared() *SharedDevice { + if m != nil { + return m.Shared + } + return nil +} +func (m *VolumeMount) SetShared(value *SharedDevice) { + if m != nil { + m.Shared = value + } +} func (x *VolumeMount) ToProto() *ProtoVolumeMount { proto := &ProtoVolumeMount{ Driver: x.Driver, @@ -59,6 +125,17 @@ type VolumePlacement struct { DriverNames []string } +func (m *VolumePlacement) GetDriverNames() []string { + if m != nil { + return m.DriverNames + } + return nil +} +func (m *VolumePlacement) SetDriverNames(value []string) { + if m != nil { + m.DriverNames = value + } +} func (x *VolumePlacement) ToProto() *ProtoVolumePlacement { proto := &ProtoVolumePlacement{ DriverNames: x.DriverNames, From 89d401495edc5f50a9e09a581d0b254cc58e57b4 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 16:25:46 +0000 Subject: [PATCH 025/155] Remove duplicate methods generated by our protoc plugin --- models/actions.go | 41 ++++------------------------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/models/actions.go b/models/actions.go index 1c2a13c8..c5091ba4 100644 --- a/models/actions.go +++ b/models/actions.go @@ -551,42 +551,9 @@ func (l *ResourceLimits) UnmarshalJSON(data []byte) error { func (l ResourceLimits) MarshalJSON() ([]byte, error) { var limit internalResourceLimits - if l.NofileExists() { - n := l.GetNofile() - limit.Nofile = &n - } - if l.NprocExists() { - n := l.GetNproc() - limit.Nproc = &n - } + n := l.GetNofile() + limit.Nofile = &n + p := l.GetNproc() + limit.Nproc = &p return json.Marshal(limit) } - -func (l *ResourceLimits) SetNofile(nofile uint64) { - l.OptionalNofile = &ResourceLimits_Nofile{ - Nofile: nofile, - } -} - -func (m *ResourceLimits) GetNofilePtr() *uint64 { - if x, ok := m.GetOptionalNofile().(*ResourceLimits_Nofile); ok { - return &x.Nofile - } - return nil -} - -func (l *ResourceLimits) NofileExists() bool { - _, ok := l.GetOptionalNofile().(*ResourceLimits_Nofile) - return ok -} - -func (l *ResourceLimits) SetNproc(nproc uint64) { - l.OptionalNproc = &ResourceLimits_Nproc{ - Nproc: nproc, - } -} - -func (l *ResourceLimits) NprocExists() bool { - _, ok := l.GetOptionalNproc().(*ResourceLimits_Nproc) - return ok -} From 1d8c84870025d97750192fa82038bf9bafc7140a Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 16:27:11 +0000 Subject: [PATCH 026/155] Remove gogoproto proto.Message from ActionInterface --- models/actions.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/models/actions.go b/models/actions.go index c5091ba4..c2e36094 100644 --- a/models/actions.go +++ b/models/actions.go @@ -8,7 +8,6 @@ import ( "time" "code.cloudfoundry.org/bbs/format" - proto "github.com/gogo/protobuf/proto" ) const ( @@ -28,7 +27,6 @@ var ErrInvalidActionType = errors.New("invalid action type") type ActionInterface interface { ActionType() string Validate() error - proto.Message } func (a *Action) GetValue() interface{} { From 00ef73ad8257ba32a44a43920c3f1ad431f79e1a Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 16:28:08 +0000 Subject: [PATCH 027/155] Remove duplicate methods generated by our protoc plugin --- models/actual_lrp.go | 11 ----------- models/actual_lrp_requests.go | 26 ++------------------------ models/desired_lrp.go | 22 ---------------------- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/models/actual_lrp.go b/models/actual_lrp.go index 9ad655b5..f8f069ad 100644 --- a/models/actual_lrp.go +++ b/models/actual_lrp.go @@ -144,17 +144,6 @@ func (actual ActualLRP) ShouldRestartCrash(now time.Time, calc RestartCalculator return calc.ShouldRestart(now.UnixNano(), actual.Since, actual.CrashCount) } -func (actual *ActualLRP) SetRoutable(routable bool) { - actual.OptionalRoutable = &ActualLRP_Routable{ - Routable: routable, - } -} - -func (actual *ActualLRP) RoutableExists() bool { - _, ok := actual.GetOptionalRoutable().(*ActualLRP_Routable) - return ok -} - func (before ActualLRP) AllowsTransitionTo(lrpKey *ActualLRPKey, instanceKey *ActualLRPInstanceKey, newState string) bool { if !before.ActualLRPKey.Equal(lrpKey) { return false diff --git a/models/actual_lrp_requests.go b/models/actual_lrp_requests.go index 96268193..974605f1 100644 --- a/models/actual_lrp_requests.go +++ b/models/actual_lrp_requests.go @@ -6,15 +6,6 @@ func (request *ActualLRPsRequest) Validate() error { return nil } -func (request *ActualLRPsRequest) SetIndex(index int32) { - request.OptionalIndex = &ActualLRPsRequest_Index{Index: index} -} - -func (request ActualLRPsRequest) IndexExists() bool { - _, ok := request.GetOptionalIndex().(*ActualLRPsRequest_Index) - return ok -} - type internalActualLRPsRequest struct { Domain string `json:"domain"` CellId string `json:"cell_id"` @@ -45,10 +36,8 @@ func (request ActualLRPsRequest) MarshalJSON() ([]byte, error) { ProcessGuid: request.ProcessGuid, } - if request.IndexExists() { - i := request.GetIndex() - internalRequest.Index = &i - } + i := request.GetIndex() + internalRequest.Index = &i return json.Marshal(internalRequest) } @@ -157,17 +146,6 @@ func (request *StartActualLRPRequest) Validate() error { return nil } -func (request *StartActualLRPRequest) SetRoutable(routable bool) { - request.OptionalRoutable = &StartActualLRPRequest_Routable{ - Routable: routable, - } -} - -func (request *StartActualLRPRequest) RoutableExists() bool { - _, ok := request.GetOptionalRoutable().(*StartActualLRPRequest_Routable) - return ok -} - func (request *CrashActualLRPRequest) Validate() error { var validationError ValidationError diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 572a9a3a..d18e0b55 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -407,28 +407,6 @@ func (desired *DesiredLRPUpdate) Validate() error { return validationError.ToError() } -func (desired *DesiredLRPUpdate) SetInstances(instances int32) { - desired.OptionalInstances = &DesiredLRPUpdate_Instances{ - Instances: instances, - } -} - -func (desired DesiredLRPUpdate) InstancesExists() bool { - _, ok := desired.GetOptionalInstances().(*DesiredLRPUpdate_Instances) - return ok -} - -func (desired *DesiredLRPUpdate) SetAnnotation(annotation string) { - desired.OptionalAnnotation = &DesiredLRPUpdate_Annotation{ - Annotation: annotation, - } -} - -func (desired DesiredLRPUpdate) AnnotationExists() bool { - _, ok := desired.GetOptionalAnnotation().(*DesiredLRPUpdate_Annotation) - return ok -} - func (desired DesiredLRPUpdate) IsRoutesGroupUpdated(routes *Routes, routerGroup string) bool { if desired.Routes == nil { return false From 3ab24a1272a44cdec9acd4c692d9ad9adf937bb1 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 16:58:49 +0000 Subject: [PATCH 028/155] Add name/value maps to enum generation Regen protos --- models/actual_lrp_bbs.pb.go | 28 +++++++++++++++++ models/error_bbs.pb.go | 58 ++++++++++++++++++++++++++++++++++++ models/image_layer_bbs.pb.go | 44 +++++++++++++++++++++++++++ models/metric_tags_bbs.pb.go | 14 +++++++++ models/task_bbs.pb.go | 18 +++++++++++ protoc-gen-go-bbs/bbs.go | 19 ++++++++++++ 6 files changed, 181 insertions(+) diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 655217fa..bd262304 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -229,6 +229,20 @@ const ( ActualLRPNetInfo_PreferredAddressHost ActualLRPNetInfo_PreferredAddress = 2 ) +// Enum value maps for ActualLRPNetInfo_PreferredAddress +var ( + ActualLRPNetInfo_PreferredAddress_name = map[int32]string{ + 0: "UNKNOWN", + 1: "INSTANCE", + 2: "HOST", + } + ActualLRPNetInfo_PreferredAddress_value = map[string]int32{ + "UNKNOWN": 0, + "INSTANCE": 1, + "HOST": 2, + } +) + // Prevent copylock errors when using ProtoActualLRPNetInfo directly type ActualLRPNetInfo struct { Address string @@ -338,6 +352,20 @@ const ( ActualLRP_Suspect ActualLRP_Presence = 2 ) +// Enum value maps for ActualLRP_Presence +var ( + ActualLRP_Presence_name = map[int32]string{ + 0: "ORDINARY", + 1: "EVACUATING", + 2: "SUSPECT", + } + ActualLRP_Presence_value = map[string]int32{ + "ORDINARY": 0, + "EVACUATING": 1, + "SUSPECT": 2, + } +) + // Prevent copylock errors when using ProtoActualLRP directly type ActualLRP struct { ActualLrpKey *ActualLRPKey diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index b3807c99..adbb966f 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -36,6 +36,64 @@ const ( Error_Timeout Error_Type = 31 ) +// Enum value maps for Error_Type +var ( + Error_Type_name = map[int32]string{ + 0: "UnknownError", + 3: "InvalidRecord", + 4: "InvalidRequest", + 5: "InvalidResponse", + 6: "InvalidProtobufMessage", + 7: "InvalidJSON", + 8: "FailedToOpenEnvelope", + 9: "InvalidStateTransition", + 11: "ResourceConflict", + 12: "ResourceExists", + 13: "ResourceNotFound", + 14: "RouterError", + 15: "ActualLRPCannotBeClaimed", + 16: "ActualLRPCannotBeStarted", + 17: "ActualLRPCannotBeCrashed", + 18: "ActualLRPCannotBeFailed", + 19: "ActualLRPCannotBeRemoved", + 21: "ActualLRPCannotBeUnclaimed", + 24: "RunningOnDifferentCell", + 26: "GUIDGeneration", + 27: "Deserialize", + 28: "Deadlock", + 29: "Unrecoverable", + 30: "LockCollision", + 31: "Timeout", + } + Error_Type_value = map[string]int32{ + "UnknownError": 0, + "InvalidRecord": 3, + "InvalidRequest": 4, + "InvalidResponse": 5, + "InvalidProtobufMessage": 6, + "InvalidJSON": 7, + "FailedToOpenEnvelope": 8, + "InvalidStateTransition": 9, + "ResourceConflict": 11, + "ResourceExists": 12, + "ResourceNotFound": 13, + "RouterError": 14, + "ActualLRPCannotBeClaimed": 15, + "ActualLRPCannotBeStarted": 16, + "ActualLRPCannotBeCrashed": 17, + "ActualLRPCannotBeFailed": 18, + "ActualLRPCannotBeRemoved": 19, + "ActualLRPCannotBeUnclaimed": 21, + "RunningOnDifferentCell": 24, + "GUIDGeneration": 26, + "Deserialize": 27, + "Deadlock": 28, + "Unrecoverable": 29, + "LockCollision": 30, + "Timeout": 31, + } +) + // Prevent copylock errors when using ProtoError directly type Error struct { Type Error_Type diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index f0ff6436..9d60aec8 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -14,6 +14,20 @@ const ( ImageLayer_DigestAlgorithmSha512 ImageLayer_DigestAlgorithm = 2 ) +// Enum value maps for ImageLayer_DigestAlgorithm +var ( + ImageLayer_DigestAlgorithm_name = map[int32]string{ + 0: "DigestAlgorithmInvalid", + 1: "SHA256", + 2: "SHA512", + } + ImageLayer_DigestAlgorithm_value = map[string]int32{ + "DigestAlgorithmInvalid": 0, + "SHA256": 1, + "SHA512": 2, + } +) + type ImageLayer_MediaType int32 const ( @@ -23,6 +37,22 @@ const ( ImageLayer_MediaTypeZip ImageLayer_MediaType = 3 ) +// Enum value maps for ImageLayer_MediaType +var ( + ImageLayer_MediaType_name = map[int32]string{ + 0: "MediaTypeInvalid", + 1: "TGZ", + 2: "TAR", + 3: "ZIP", + } + ImageLayer_MediaType_value = map[string]int32{ + "MediaTypeInvalid": 0, + "TGZ": 1, + "TAR": 2, + "ZIP": 3, + } +) + type ImageLayer_Type int32 const ( @@ -31,6 +61,20 @@ const ( ImageLayer_LayerTypeExclusive ImageLayer_Type = 2 ) +// Enum value maps for ImageLayer_Type +var ( + ImageLayer_Type_name = map[int32]string{ + 0: "LayerTypeInvalid", + 1: "SHARED", + 2: "EXCLUSIVE", + } + ImageLayer_Type_value = map[string]int32{ + "LayerTypeInvalid": 0, + "SHARED": 1, + "EXCLUSIVE": 2, + } +) + // Prevent copylock errors when using ProtoImageLayer directly type ImageLayer struct { Name string diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 249f22ce..fadf7b06 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -14,6 +14,20 @@ const ( MetricTagValue_MetricTagynamicValueInstanceGuid MetricTagValue_DynamicValue = 2 ) +// Enum value maps for MetricTagValue_DynamicValue +var ( + MetricTagValue_DynamicValue_name = map[int32]string{ + 0: "DynamicValueInvalid", + 1: "INDEX", + 2: "INSTANCE_GUID", + } + MetricTagValue_DynamicValue_value = map[string]int32{ + "DynamicValueInvalid": 0, + "INDEX": 1, + "INSTANCE_GUID": 2, + } +) + // Prevent copylock errors when using ProtoMetricTagValue directly type MetricTagValue struct { Static string diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 78ef0dc1..1b309487 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -387,6 +387,24 @@ const ( Task_Resolving Task_State = 4 ) +// Enum value maps for Task_State +var ( + Task_State_name = map[int32]string{ + 0: "Invalid", + 1: "Pending", + 2: "Running", + 3: "Completed", + 4: "Resolving", + } + Task_State_value = map[string]int32{ + "Invalid": 0, + "Pending": 1, + "Running": 2, + "Completed": 3, + "Resolving": 4, + } +) + // Prevent copylock errors when using ProtoTask directly type Task struct { TaskDefinition *TaskDefinition diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 01819799..c7844ed1 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -175,6 +175,25 @@ func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protog g.P(enumValueName, " ", copysafeName, "=", actualValue) } g.P(")") + g.P("// Enum value maps for ", copysafeName) + g.P("var (") + g.P(copysafeName, "_name = map[int32]string{") + for _, enumValue := range eNuM.Values { + enumValueName := enumValue.Desc.Name() + actualValue := enumValue.Desc.Number() + + g.P(actualValue, `: "`, enumValueName, `",`) + } + g.P("}") + g.P(copysafeName, "_value = map[string]int32{") + for _, enumValue := range eNuM.Values { + enumValueName := enumValue.Desc.Name() + actualValue := enumValue.Desc.Number() + + g.P(`"`, enumValueName, `": `, actualValue, `,`) + } + g.P("}") + g.P(")") } } } From 8b8226eb066fe3869d9d467d9f5e0838e1937967 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 18:03:24 +0000 Subject: [PATCH 029/155] Add String function to enum generation Remove unnecessary check on len(msg.Enums) Regen protos --- models/actual_lrp_bbs.pb.go | 20 ++++++++ models/error_bbs.pb.go | 12 +++++ models/image_layer_bbs.pb.go | 28 ++++++++++++ models/metric_tags_bbs.pb.go | 12 +++++ models/task_bbs.pb.go | 12 +++++ protoc-gen-go-bbs/bbs.go | 88 ++++++++++++++++++++++-------------- 6 files changed, 138 insertions(+), 34 deletions(-) diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index bd262304..3f811733 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -6,6 +6,10 @@ package models +import ( + strconv "strconv" +) + // Prevent copylock errors when using ProtoActualLRPGroup directly type ActualLRPGroup struct { Instance *ActualLRP @@ -243,6 +247,14 @@ var ( } ) +func (m ActualLRPNetInfo_PreferredAddress) String() string { + s, ok := ActualLRPNetInfo_PreferredAddress_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + // Prevent copylock errors when using ProtoActualLRPNetInfo directly type ActualLRPNetInfo struct { Address string @@ -366,6 +378,14 @@ var ( } ) +func (m ActualLRP_Presence) String() string { + s, ok := ActualLRP_Presence_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + // Prevent copylock errors when using ProtoActualLRP directly type ActualLRP struct { ActualLrpKey *ActualLRPKey diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index adbb966f..452a8c6f 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -6,6 +6,10 @@ package models +import ( + strconv "strconv" +) + type Error_Type int32 const ( @@ -94,6 +98,14 @@ var ( } ) +func (m Error_Type) String() string { + s, ok := Error_Type_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + // Prevent copylock errors when using ProtoError directly type Error struct { Type Error_Type diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 9d60aec8..fadf4a62 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -6,6 +6,10 @@ package models +import ( + strconv "strconv" +) + type ImageLayer_DigestAlgorithm int32 const ( @@ -28,6 +32,14 @@ var ( } ) +func (m ImageLayer_DigestAlgorithm) String() string { + s, ok := ImageLayer_DigestAlgorithm_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + type ImageLayer_MediaType int32 const ( @@ -53,6 +65,14 @@ var ( } ) +func (m ImageLayer_MediaType) String() string { + s, ok := ImageLayer_MediaType_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + type ImageLayer_Type int32 const ( @@ -75,6 +95,14 @@ var ( } ) +func (m ImageLayer_Type) String() string { + s, ok := ImageLayer_Type_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + // Prevent copylock errors when using ProtoImageLayer directly type ImageLayer struct { Name string diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index fadf7b06..75605fb2 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -6,6 +6,10 @@ package models +import ( + strconv "strconv" +) + type MetricTagValue_DynamicValue int32 const ( @@ -28,6 +32,14 @@ var ( } ) +func (m MetricTagValue_DynamicValue) String() string { + s, ok := MetricTagValue_DynamicValue_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + // Prevent copylock errors when using ProtoMetricTagValue directly type MetricTagValue struct { Static string diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 1b309487..bfc53806 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -6,6 +6,10 @@ package models +import ( + strconv "strconv" +) + // Prevent copylock errors when using ProtoTaskDefinition directly type TaskDefinition struct { RootFs string @@ -405,6 +409,14 @@ var ( } ) +func (m Task_State) String() string { + s, ok := Task_State_name[int32(m)] + if ok { + return s + } + return strconv.Itoa(int(m)) +} + // Prevent copylock errors when using ProtoTask directly type Task struct { TaskDefinition *TaskDefinition diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index c7844ed1..b16c8ad8 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -158,44 +158,64 @@ func getActualType(g *protogen.GeneratedFile, field *protogen.Field) string { } func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) { - if len(msg.Enums) > 0 { - for _, eNuM := range msg.Enums { - if *debug { - log.Printf("Nested Enum: %+v\n", eNuM) - } + for _, eNuM := range msg.Enums { + if *debug { + log.Printf("Nested Enum: %+v\n", eNuM) + } - copysafeName, _ := getCopysafeName(g, eNuM.GoIdent) - log.Printf("%s\n", copysafeName) - g.P("type ", copysafeName, " int32") - g.P("const (") - for _, enumValue := range eNuM.Values { - enumValueName := getEnumValueName(g, msg, enumValue) - actualValue := enumValue.Desc.Number() + genEnumTypeWithValues(g, msg, eNuM) + genEnumValueMaps(g, eNuM) + genEnumStringFunc(g, eNuM) + } +} - g.P(enumValueName, " ", copysafeName, "=", actualValue) - } - g.P(")") - g.P("// Enum value maps for ", copysafeName) - g.P("var (") - g.P(copysafeName, "_name = map[int32]string{") - for _, enumValue := range eNuM.Values { - enumValueName := enumValue.Desc.Name() - actualValue := enumValue.Desc.Number() - - g.P(actualValue, `: "`, enumValueName, `",`) - } - g.P("}") - g.P(copysafeName, "_value = map[string]int32{") - for _, enumValue := range eNuM.Values { - enumValueName := enumValue.Desc.Name() - actualValue := enumValue.Desc.Number() +func genEnumTypeWithValues(g *protogen.GeneratedFile, msg *protogen.Message, eNuM *protogen.Enum) { + copysafeName, _ := getCopysafeName(g, eNuM.GoIdent) + log.Printf("%s\n", copysafeName) + g.P("type ", copysafeName, " int32") + g.P("const (") + for _, enumValue := range eNuM.Values { + enumValueName := getEnumValueName(g, msg, enumValue) + actualValue := enumValue.Desc.Number() - g.P(`"`, enumValueName, `": `, actualValue, `,`) - } - g.P("}") - g.P(")") - } + g.P(enumValueName, " ", copysafeName, "=", actualValue) + } + g.P(")") +} + +func genEnumValueMaps(g *protogen.GeneratedFile, eNuM *protogen.Enum) { + copysafeName, _ := getCopysafeName(g, eNuM.GoIdent) + g.P("// Enum value maps for ", copysafeName) + g.P("var (") + g.P(copysafeName, "_name = map[int32]string{") + for _, enumValue := range eNuM.Values { + enumValueName := enumValue.Desc.Name() + actualValue := enumValue.Desc.Number() + + g.P(actualValue, `: "`, enumValueName, `",`) + } + g.P("}") + g.P(copysafeName, "_value = map[string]int32{") + for _, enumValue := range eNuM.Values { + enumValueName := enumValue.Desc.Name() + actualValue := enumValue.Desc.Number() + + g.P(`"`, enumValueName, `": `, actualValue, `,`) } + g.P("}") + g.P(")") +} + +func genEnumStringFunc(g *protogen.GeneratedFile, eNuM *protogen.Enum) { + copysafeName, _ := getCopysafeName(g, eNuM.GoIdent) + strconvItoa := protogen.GoIdent{GoName: "Itoa", GoImportPath: "strconv"} + g.P("func (m ", copysafeName, ") String() string {") + g.P("s, ok :=", copysafeName, "_name[int32(m)]") + g.P("if ok {") + g.P("return s") + g.P("}") + g.P("return ", g.QualifiedGoIdent(strconvItoa), "(int(m))") + g.P("}") } func getEnumValueName(g *protogen.GeneratedFile, msg *protogen.Message, enumValue *protogen.EnumValue) string { From fe419f8ba6994a4c450756693808fbb6279fb765 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 21:30:56 +0000 Subject: [PATCH 030/155] Add Equal function for struct generation --- protoc-gen-go-bbs/bbs.go | 79 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index b16c8ad8..a63544b6 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -5,6 +5,7 @@ import ( "log" "slices" "strings" + "text/template" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" @@ -18,6 +19,7 @@ type bbsGenerateHelperInterface interface { genProtoMapMethod(g *protogen.GeneratedFile, msg *protogen.Message) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) genAccessors(g *protogen.GeneratedFile, msg *protogen.Message) + genEqual(g *protogen.GeneratedFile, msg *protogen.Message) } type bbsGenerateHelper struct{} @@ -48,10 +50,86 @@ func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *proto } g.P("}") + helper.genEqual(g, msg) helper.genAccessors(g, msg) } } +type EqualFunc struct { + CopysafeName string +} + +type EqualField struct { + FieldName string +} + +func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Message) { + if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + if copysafeName == "Routes" { + log.Printf("FOUNDROUTES: %+v\n", msg) + } + + equalBuilder := new(strings.Builder) + equal, err := template.New("equal").Parse( + ` + if that == nil { + return this == nil + } + + that1, ok := that.(*{{.CopysafeName}}) + if !ok { + that2, ok := that.({{.CopysafeName}}) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + `) + if err != nil { + panic(err) + } + equal.Execute(equalBuilder, EqualFunc{CopysafeName: copysafeName}) + + g.P("func (this *", copysafeName, ") Equal(that interface{}) bool {") + g.P(equalBuilder.String()) + g.P() + for _, field := range msg.Fields { + if field.Desc.Cardinality() == protoreflect.Repeated { + g.P("if len(this.", field.GoName, ") != len(that1.", field.GoName, ") {") + g.P("return false") + g.P("}") + g.P("for i := range this.", field.GoName, " {") + if field.Message != nil && !field.Desc.IsMap() { + g.P("if !this.", field.GoName, "[i].Equal(that1.", field.GoName, "[i]) {") + } else if field.Desc.IsMap() && field.Desc.MapValue().Kind() == protoreflect.BytesKind { + bytesEqual := protogen.GoIdent{GoName: "Equal", GoImportPath: "bytes"} + g.P("if !", g.QualifiedGoIdent(bytesEqual), "(this.", field.GoName, "[i], that1.", field.GoName, "[i]) {") + } else { + g.P("if this.", field.GoName, "[i] != that1.", field.GoName, "[i] {") + } + g.P("return false") + g.P("}") + } else if field.Message != nil { + g.P("if !this.", field.GoName, ".Equal(that1.", field.GoName, ") {") + g.P("return false") + } else { + g.P("if this.", field.GoName, " != that1.", field.GoName, " {") + g.P("return false") + } + g.P("}") + } + g.P("return true") + g.P("}") + } +} + func (bbsGenerateHelper) genAccessors(g *protogen.GeneratedFile, msg *protogen.Message) { if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { for _, field := range msg.Fields { @@ -324,7 +402,6 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { if slices.Contains(ignoredMessages, getUnsafeName(g, msg.GoIdent)) { log.Printf("Ignoring message %s", msg.GoIdent) - continue } helper.genFriendlyEnums(g, msg) helper.genCopysafeStruct(g, msg) From 6a0adf2b9d39e235cd7252cdb4e7e7920179d217 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 1 May 2024 21:39:48 +0000 Subject: [PATCH 031/155] No longer ignoring ProtoRoutes Regen protos --- models/actions_bbs.pb.go | 436 +++++++++++++++++++ models/actual_lrp_bbs.pb.go | 273 ++++++++++++ models/actual_lrp_requests_bbs.pb.go | 461 ++++++++++++++++++++ models/cached_dependency_bbs.pb.go | 45 ++ models/cells_bbs.pb.go | 166 +++++++ models/certificate_properties_bbs.pb.go | 32 ++ models/check_definition_bbs.pb.go | 142 ++++++ models/desired_lrp_bbs.pb.go | 555 ++++++++++++++++++++++++ models/desired_lrp_requests_bbs.pb.go | 303 +++++++++++++ models/domain_bbs.pb.go | 92 ++++ models/environment_variables_bbs.pb.go | 30 ++ models/error_bbs.pb.go | 30 ++ models/errors.go | 18 +- models/evacuation_bbs.pb.go | 235 ++++++++++ models/events_bbs.pb.go | 480 ++++++++++++++++++++ models/image_layer_bbs.pb.go | 45 ++ models/log_rate_limit_bbs.pb.go | 27 ++ models/metric_tags_bbs.pb.go | 30 ++ models/modification_tag_bbs.pb.go | 30 ++ models/network_bbs.pb.go | 32 ++ models/ping_bbs.pb.go | 27 ++ models/routes.go | 122 +++--- models/security_group_bbs.pb.go | 120 +++++ models/sidecar_bbs.pb.go | 33 ++ models/task_bbs.pb.go | 203 +++++++++ models/task_requests_bbs.pb.go | 410 +++++++++++++++++ models/volume_mount_bbs.pb.go | 98 +++++ protoc-gen-go-bbs/bbs.go | 3 +- 28 files changed, 4407 insertions(+), 71 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 1b3d85bc..ba28e433 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -19,6 +19,57 @@ type Action struct { CodependentAction *CodependentAction } +func (this *Action) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Action) + if !ok { + that2, ok := that.(Action) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.DownloadAction.Equal(that1.DownloadAction) { + return false + } + if !this.UploadAction.Equal(that1.UploadAction) { + return false + } + if !this.RunAction.Equal(that1.RunAction) { + return false + } + if !this.TimeoutAction.Equal(that1.TimeoutAction) { + return false + } + if !this.EmitProgressAction.Equal(that1.EmitProgressAction) { + return false + } + if !this.TryAction.Equal(that1.TryAction) { + return false + } + if !this.ParallelAction.Equal(that1.ParallelAction) { + return false + } + if !this.SerialAction.Equal(that1.SerialAction) { + return false + } + if !this.CodependentAction.Equal(that1.CodependentAction) { + return false + } + return true +} func (m *Action) GetDownloadAction() *DownloadAction { if m != nil { return m.DownloadAction @@ -153,6 +204,54 @@ type DownloadAction struct { ChecksumValue string } +func (this *DownloadAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DownloadAction) + if !ok { + that2, ok := that.(DownloadAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Artifact != that1.Artifact { + return false + } + if this.From != that1.From { + return false + } + if this.To != that1.To { + return false + } + if this.CacheKey != that1.CacheKey { + return false + } + if this.LogSource != that1.LogSource { + return false + } + if this.User != that1.User { + return false + } + if this.ChecksumAlgorithm != that1.ChecksumAlgorithm { + return false + } + if this.ChecksumValue != that1.ChecksumValue { + return false + } + return true +} func (m *DownloadAction) GetArtifact() string { if m != nil { return m.Artifact @@ -272,6 +371,45 @@ type UploadAction struct { User string } +func (this *UploadAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*UploadAction) + if !ok { + that2, ok := that.(UploadAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Artifact != that1.Artifact { + return false + } + if this.From != that1.From { + return false + } + if this.To != that1.To { + return false + } + if this.LogSource != that1.LogSource { + return false + } + if this.User != that1.User { + return false + } + return true +} func (m *UploadAction) GetArtifact() string { if m != nil { return m.Artifact @@ -358,6 +496,64 @@ type RunAction struct { SuppressLogOutput bool } +func (this *RunAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*RunAction) + if !ok { + that2, ok := that.(RunAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Path != that1.Path { + return false + } + if len(this.Args) != len(that1.Args) { + return false + } + for i := range this.Args { + if this.Args[i] != that1.Args[i] { + return false + } + } + if this.Dir != that1.Dir { + return false + } + if len(this.Env) != len(that1.Env) { + return false + } + for i := range this.Env { + if !this.Env[i].Equal(that1.Env[i]) { + return false + } + } + if !this.ResourceLimits.Equal(that1.ResourceLimits) { + return false + } + if this.User != that1.User { + return false + } + if this.LogSource != that1.LogSource { + return false + } + if this.SuppressLogOutput != that1.SuppressLogOutput { + return false + } + return true +} func (m *RunAction) GetPath() string { if m != nil { return m.Path @@ -476,6 +672,42 @@ type TimeoutAction struct { TimeoutMs int64 } +func (this *TimeoutAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TimeoutAction) + if !ok { + that2, ok := that.(TimeoutAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Action.Equal(that1.Action) { + return false + } + if this.DeprecatedTimeoutNs != that1.DeprecatedTimeoutNs { + return false + } + if this.LogSource != that1.LogSource { + return false + } + if this.TimeoutMs != that1.TimeoutMs { + return false + } + return true +} func (m *TimeoutAction) GetAction() *Action { if m != nil { return m.Action @@ -549,6 +781,45 @@ type EmitProgressAction struct { LogSource string } +func (this *EmitProgressAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EmitProgressAction) + if !ok { + that2, ok := that.(EmitProgressAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Action.Equal(that1.Action) { + return false + } + if this.StartMessage != that1.StartMessage { + return false + } + if this.SuccessMessage != that1.SuccessMessage { + return false + } + if this.FailureMessagePrefix != that1.FailureMessagePrefix { + return false + } + if this.LogSource != that1.LogSource { + return false + } + return true +} func (m *EmitProgressAction) GetAction() *Action { if m != nil { return m.Action @@ -629,6 +900,36 @@ type TryAction struct { LogSource string } +func (this *TryAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TryAction) + if !ok { + that2, ok := that.(TryAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Action.Equal(that1.Action) { + return false + } + if this.LogSource != that1.LogSource { + return false + } + return true +} func (m *TryAction) GetAction() *Action { if m != nil { return m.Action @@ -673,6 +974,41 @@ type ParallelAction struct { LogSource string } +func (this *ParallelAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ParallelAction) + if !ok { + that2, ok := that.(ParallelAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.Actions) != len(that1.Actions) { + return false + } + for i := range this.Actions { + if !this.Actions[i].Equal(that1.Actions[i]) { + return false + } + } + if this.LogSource != that1.LogSource { + return false + } + return true +} func (m *ParallelAction) GetActions() []*Action { if m != nil { return m.Actions @@ -717,6 +1053,41 @@ type SerialAction struct { LogSource string } +func (this *SerialAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*SerialAction) + if !ok { + that2, ok := that.(SerialAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.Actions) != len(that1.Actions) { + return false + } + for i := range this.Actions { + if !this.Actions[i].Equal(that1.Actions[i]) { + return false + } + } + if this.LogSource != that1.LogSource { + return false + } + return true +} func (m *SerialAction) GetActions() []*Action { if m != nil { return m.Actions @@ -761,6 +1132,41 @@ type CodependentAction struct { LogSource string } +func (this *CodependentAction) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CodependentAction) + if !ok { + that2, ok := that.(CodependentAction) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.Actions) != len(that1.Actions) { + return false + } + for i := range this.Actions { + if !this.Actions[i].Equal(that1.Actions[i]) { + return false + } + } + if this.LogSource != that1.LogSource { + return false + } + return true +} func (m *CodependentAction) GetActions() []*Action { if m != nil { return m.Actions @@ -805,6 +1211,36 @@ type ResourceLimits struct { Nproc uint64 } +func (this *ResourceLimits) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ResourceLimits) + if !ok { + that2, ok := that.(ResourceLimits) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Nofile != that1.Nofile { + return false + } + if this.Nproc != that1.Nproc { + return false + } + return true +} func (m *ResourceLimits) GetNofile() uint64 { if m != nil { return m.Nofile diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 3f811733..9243bd16 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -16,6 +16,36 @@ type ActualLRPGroup struct { Evacuating *ActualLRP } +func (this *ActualLRPGroup) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPGroup) + if !ok { + that2, ok := that.(ActualLRPGroup) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Instance.Equal(that1.Instance) { + return false + } + if !this.Evacuating.Equal(that1.Evacuating) { + return false + } + return true +} func (m *ActualLRPGroup) GetInstance() *ActualLRP { if m != nil { return m.Instance @@ -62,6 +92,42 @@ type PortMapping struct { HostTlsProxyPort uint32 } +func (this *PortMapping) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*PortMapping) + if !ok { + that2, ok := that.(PortMapping) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ContainerPort != that1.ContainerPort { + return false + } + if this.HostPort != that1.HostPort { + return false + } + if this.ContainerTlsProxyPort != that1.ContainerTlsProxyPort { + return false + } + if this.HostTlsProxyPort != that1.HostTlsProxyPort { + return false + } + return true +} func (m *PortMapping) GetContainerPort() uint32 { if m != nil { return m.ContainerPort @@ -131,6 +197,39 @@ type ActualLRPKey struct { Domain string } +func (this *ActualLRPKey) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPKey) + if !ok { + that2, ok := that.(ActualLRPKey) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if this.Index != that1.Index { + return false + } + if this.Domain != that1.Domain { + return false + } + return true +} func (m *ActualLRPKey) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -187,6 +286,36 @@ type ActualLRPInstanceKey struct { CellId string } +func (this *ActualLRPInstanceKey) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPInstanceKey) + if !ok { + that2, ok := that.(ActualLRPInstanceKey) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.InstanceGuid != that1.InstanceGuid { + return false + } + if this.CellId != that1.CellId { + return false + } + return true +} func (m *ActualLRPInstanceKey) GetInstanceGuid() string { if m != nil { return m.InstanceGuid @@ -263,6 +392,47 @@ type ActualLRPNetInfo struct { PreferredAddress ActualLRPNetInfo_PreferredAddress } +func (this *ActualLRPNetInfo) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPNetInfo) + if !ok { + that2, ok := that.(ActualLRPNetInfo) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Address != that1.Address { + return false + } + if len(this.Ports) != len(that1.Ports) { + return false + } + for i := range this.Ports { + if !this.Ports[i].Equal(that1.Ports[i]) { + return false + } + } + if this.InstanceAddress != that1.InstanceAddress { + return false + } + if this.PreferredAddress != that1.PreferredAddress { + return false + } + return true +} func (m *ActualLRPNetInfo) GetAddress() string { if m != nil { return m.Address @@ -330,6 +500,33 @@ type ActualLRPInternalRoute struct { Hostname string } +func (this *ActualLRPInternalRoute) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPInternalRoute) + if !ok { + that2, ok := that.(ActualLRPInternalRoute) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Hostname != that1.Hostname { + return false + } + return true +} func (m *ActualLRPInternalRoute) GetHostname() string { if m != nil { return m.Hostname @@ -404,6 +601,82 @@ type ActualLRP struct { AvailabilityZone string } +func (this *ActualLRP) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRP) + if !ok { + that2, ok := that.(ActualLRP) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + return false + } + if this.CrashCount != that1.CrashCount { + return false + } + if this.CrashReason != that1.CrashReason { + return false + } + if this.State != that1.State { + return false + } + if this.PlacementError != that1.PlacementError { + return false + } + if this.Since != that1.Since { + return false + } + if !this.ModificationTag.Equal(that1.ModificationTag) { + return false + } + if this.Presence != that1.Presence { + return false + } + if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + return false + } + for i := range this.ActualLrpInternalRoutes { + if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { + return false + } + } + if len(this.MetricTags) != len(that1.MetricTags) { + return false + } + for i := range this.MetricTags { + if this.MetricTags[i] != that1.MetricTags[i] { + return false + } + } + if this.Routable != that1.Routable { + return false + } + if this.AvailabilityZone != that1.AvailabilityZone { + return false + } + return true +} func (m *ActualLRP) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 0ecadca8..07704b07 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -11,6 +11,33 @@ type ActualLRPLifecycleResponse struct { Error *Error } +func (this *ActualLRPLifecycleResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPLifecycleResponse) + if !ok { + that2, ok := that.(ActualLRPLifecycleResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + return true +} func (m *ActualLRPLifecycleResponse) GetError() *Error { if m != nil { return m.Error @@ -43,6 +70,41 @@ type ActualLRPGroupsResponse struct { ActualLrpGroups []*ActualLRPGroup } +func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPGroupsResponse) + if !ok { + that2, ok := that.(ActualLRPGroupsResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if len(this.ActualLrpGroups) != len(that1.ActualLrpGroups) { + return false + } + for i := range this.ActualLrpGroups { + if !this.ActualLrpGroups[i].Equal(that1.ActualLrpGroups[i]) { + return false + } + } + return true +} func (m *ActualLRPGroupsResponse) GetError() *Error { if m != nil { return m.Error @@ -87,6 +149,36 @@ type ActualLRPGroupResponse struct { ActualLrpGroup *ActualLRPGroup } +func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPGroupResponse) + if !ok { + that2, ok := that.(ActualLRPGroupResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + return false + } + return true +} func (m *ActualLRPGroupResponse) GetError() *Error { if m != nil { return m.Error @@ -131,6 +223,36 @@ type ActualLRPGroupsRequest struct { CellId string } +func (this *ActualLRPGroupsRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPGroupsRequest) + if !ok { + that2, ok := that.(ActualLRPGroupsRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Domain != that1.Domain { + return false + } + if this.CellId != that1.CellId { + return false + } + return true +} func (m *ActualLRPGroupsRequest) GetDomain() string { if m != nil { return m.Domain @@ -174,6 +296,33 @@ type ActualLRPGroupsByProcessGuidRequest struct { ProcessGuid string } +func (this *ActualLRPGroupsByProcessGuidRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPGroupsByProcessGuidRequest) + if !ok { + that2, ok := that.(ActualLRPGroupsByProcessGuidRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + return true +} func (m *ActualLRPGroupsByProcessGuidRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -206,6 +355,36 @@ type ActualLRPGroupByProcessGuidAndIndexRequest struct { Index int32 } +func (this *ActualLRPGroupByProcessGuidAndIndexRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPGroupByProcessGuidAndIndexRequest) + if !ok { + that2, ok := that.(ActualLRPGroupByProcessGuidAndIndexRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if this.Index != that1.Index { + return false + } + return true +} func (m *ActualLRPGroupByProcessGuidAndIndexRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -251,6 +430,39 @@ type ClaimActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ClaimActualLRPRequest) + if !ok { + that2, ok := that.(ClaimActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if this.Index != that1.Index { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + return true +} func (m *ClaimActualLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -312,6 +524,61 @@ type StartActualLRPRequest struct { AvailabilityZone string } +func (this *StartActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*StartActualLRPRequest) + if !ok { + that2, ok := that.(StartActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + return false + } + if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + return false + } + for i := range this.ActualLrpInternalRoutes { + if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { + return false + } + } + if len(this.MetricTags) != len(that1.MetricTags) { + return false + } + for i := range this.MetricTags { + if this.MetricTags[i] != that1.MetricTags[i] { + return false + } + } + if this.Routable != that1.Routable { + return false + } + if this.AvailabilityZone != that1.AvailabilityZone { + return false + } + return true +} func (m *StartActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -417,6 +684,39 @@ type CrashActualLRPRequest struct { ErrorMessage string } +func (this *CrashActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CrashActualLRPRequest) + if !ok { + that2, ok := that.(CrashActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + if this.ErrorMessage != that1.ErrorMessage { + return false + } + return true +} func (m *CrashActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -473,6 +773,36 @@ type FailActualLRPRequest struct { ErrorMessage string } +func (this *FailActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*FailActualLRPRequest) + if !ok { + that2, ok := that.(FailActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if this.ErrorMessage != that1.ErrorMessage { + return false + } + return true +} func (m *FailActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -516,6 +846,33 @@ type RetireActualLRPRequest struct { ActualLrpKey *ActualLRPKey } +func (this *RetireActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*RetireActualLRPRequest) + if !ok { + that2, ok := that.(RetireActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + return true +} func (m *RetireActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -549,6 +906,39 @@ type RemoveActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*RemoveActualLRPRequest) + if !ok { + that2, ok := that.(RemoveActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if this.Index != that1.Index { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + return true +} func (m *RemoveActualLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -605,6 +995,41 @@ type ActualLRPsResponse struct { ActualLrps []*ActualLRP } +func (this *ActualLRPsResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPsResponse) + if !ok { + that2, ok := that.(ActualLRPsResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if len(this.ActualLrps) != len(that1.ActualLrps) { + return false + } + for i := range this.ActualLrps { + if !this.ActualLrps[i].Equal(that1.ActualLrps[i]) { + return false + } + } + return true +} func (m *ActualLRPsResponse) GetError() *Error { if m != nil { return m.Error @@ -651,6 +1076,42 @@ type ActualLRPsRequest struct { Index int32 } +func (this *ActualLRPsRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPsRequest) + if !ok { + that2, ok := that.(ActualLRPsRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Domain != that1.Domain { + return false + } + if this.CellId != that1.CellId { + return false + } + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if this.Index != that1.Index { + return false + } + return true +} func (m *ActualLRPsRequest) GetDomain() string { if m != nil { return m.Domain diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 487a248b..38cec67b 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -17,6 +17,51 @@ type CachedDependency struct { ChecksumValue string } +func (this *CachedDependency) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CachedDependency) + if !ok { + that2, ok := that.(CachedDependency) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Name != that1.Name { + return false + } + if this.From != that1.From { + return false + } + if this.To != that1.To { + return false + } + if this.CacheKey != that1.CacheKey { + return false + } + if this.LogSource != that1.LogSource { + return false + } + if this.ChecksumAlgorithm != that1.ChecksumAlgorithm { + return false + } + if this.ChecksumValue != that1.ChecksumValue { + return false + } + return true +} func (m *CachedDependency) GetName() string { if m != nil { return m.Name diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 02f61d47..52e4038a 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -13,6 +13,39 @@ type CellCapacity struct { Containers int32 } +func (this *CellCapacity) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CellCapacity) + if !ok { + that2, ok := that.(CellCapacity) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.MemoryMb != that1.MemoryMb { + return false + } + if this.DiskMb != that1.DiskMb { + return false + } + if this.Containers != that1.Containers { + return false + } + return true +} func (m *CellCapacity) GetMemoryMb() int32 { if m != nil { return m.MemoryMb @@ -75,6 +108,69 @@ type CellPresence struct { RepUrl string } +func (this *CellPresence) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CellPresence) + if !ok { + that2, ok := that.(CellPresence) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.CellId != that1.CellId { + return false + } + if this.RepAddress != that1.RepAddress { + return false + } + if this.Zone != that1.Zone { + return false + } + if !this.Capacity.Equal(that1.Capacity) { + return false + } + if len(this.RootfsProviders) != len(that1.RootfsProviders) { + return false + } + for i := range this.RootfsProviders { + if !this.RootfsProviders[i].Equal(that1.RootfsProviders[i]) { + return false + } + } + if len(this.PlacementTags) != len(that1.PlacementTags) { + return false + } + for i := range this.PlacementTags { + if this.PlacementTags[i] != that1.PlacementTags[i] { + return false + } + } + if len(this.OptionalPlacementTags) != len(that1.OptionalPlacementTags) { + return false + } + for i := range this.OptionalPlacementTags { + if this.OptionalPlacementTags[i] != that1.OptionalPlacementTags[i] { + return false + } + } + if this.RepUrl != that1.RepUrl { + return false + } + return true +} func (m *CellPresence) GetCellId() string { if m != nil { return m.CellId @@ -191,6 +287,41 @@ type Provider struct { Properties []string } +func (this *Provider) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Provider) + if !ok { + that2, ok := that.(Provider) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Name != that1.Name { + return false + } + if len(this.Properties) != len(that1.Properties) { + return false + } + for i := range this.Properties { + if this.Properties[i] != that1.Properties[i] { + return false + } + } + return true +} func (m *Provider) GetName() string { if m != nil { return m.Name @@ -235,6 +366,41 @@ type CellsResponse struct { Cells []*CellPresence } +func (this *CellsResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CellsResponse) + if !ok { + that2, ok := that.(CellsResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if len(this.Cells) != len(that1.Cells) { + return false + } + for i := range this.Cells { + if !this.Cells[i].Equal(that1.Cells[i]) { + return false + } + } + return true +} func (m *CellsResponse) GetError() *Error { if m != nil { return m.Error diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 87f58b39..a79ef661 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -11,6 +11,38 @@ type CertificateProperties struct { OrganizationalUnit []string } +func (this *CertificateProperties) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CertificateProperties) + if !ok { + that2, ok := that.(CertificateProperties) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.OrganizationalUnit) != len(that1.OrganizationalUnit) { + return false + } + for i := range this.OrganizationalUnit { + if this.OrganizationalUnit[i] != that1.OrganizationalUnit[i] { + return false + } + } + return true +} func (m *CertificateProperties) GetOrganizationalUnit() []string { if m != nil { return m.OrganizationalUnit diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index b871d882..60b971a7 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -13,6 +13,49 @@ type CheckDefinition struct { ReadinessChecks []*Check } +func (this *CheckDefinition) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CheckDefinition) + if !ok { + that2, ok := that.(CheckDefinition) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.Checks) != len(that1.Checks) { + return false + } + for i := range this.Checks { + if !this.Checks[i].Equal(that1.Checks[i]) { + return false + } + } + if this.LogSource != that1.LogSource { + return false + } + if len(this.ReadinessChecks) != len(that1.ReadinessChecks) { + return false + } + for i := range this.ReadinessChecks { + if !this.ReadinessChecks[i].Equal(that1.ReadinessChecks[i]) { + return false + } + } + return true +} func (m *CheckDefinition) GetChecks() []*Check { if m != nil { return m.Checks @@ -69,6 +112,36 @@ type Check struct { HttpCheck *HTTPCheck } +func (this *Check) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Check) + if !ok { + that2, ok := that.(Check) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.TcpCheck.Equal(that1.TcpCheck) { + return false + } + if !this.HttpCheck.Equal(that1.HttpCheck) { + return false + } + return true +} func (m *Check) GetTcpCheck() *TCPCheck { if m != nil { return m.TcpCheck @@ -114,6 +187,39 @@ type TCPCheck struct { IntervalMs uint64 } +func (this *TCPCheck) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TCPCheck) + if !ok { + that2, ok := that.(TCPCheck) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Port != that1.Port { + return false + } + if this.ConnectTimeoutMs != that1.ConnectTimeoutMs { + return false + } + if this.IntervalMs != that1.IntervalMs { + return false + } + return true +} func (m *TCPCheck) GetPort() uint32 { if m != nil { return m.Port @@ -172,6 +278,42 @@ type HTTPCheck struct { IntervalMs uint64 } +func (this *HTTPCheck) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*HTTPCheck) + if !ok { + that2, ok := that.(HTTPCheck) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Port != that1.Port { + return false + } + if this.RequestTimeoutMs != that1.RequestTimeoutMs { + return false + } + if this.Path != that1.Path { + return false + } + if this.IntervalMs != that1.IntervalMs { + return false + } + return true +} func (m *HTTPCheck) GetPort() uint32 { if m != nil { return m.Port diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 061fc703..f42b9a46 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -6,6 +6,10 @@ package models +import ( + bytes "bytes" +) + // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly type DesiredLRPSchedulingInfo struct { DesiredLrpKey *DesiredLRPKey @@ -18,6 +22,59 @@ type DesiredLRPSchedulingInfo struct { ProtoPlacementTags []string } +func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPSchedulingInfo) + if !ok { + that2, ok := that.(DesiredLRPSchedulingInfo) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { + return false + } + if this.Annotation != that1.Annotation { + return false + } + if this.Instances != that1.Instances { + return false + } + if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { + return false + } + if !this.Routes.Equal(that1.Routes) { + return false + } + if !this.ModificationTag.Equal(that1.ModificationTag) { + return false + } + if !this.VolumePlacement.Equal(that1.VolumePlacement) { + return false + } + if len(this.ProtoPlacementTags) != len(that1.ProtoPlacementTags) { + return false + } + for i := range this.ProtoPlacementTags { + if this.ProtoPlacementTags[i] != that1.ProtoPlacementTags[i] { + return false + } + } + return true +} func (m *DesiredLRPSchedulingInfo) GetDesiredLrpKey() *DesiredLRPKey { if m != nil { return m.DesiredLrpKey @@ -159,6 +216,151 @@ type DesiredLRPRunInfo struct { LogRateLimit *LogRateLimit } +func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPRunInfo) + if !ok { + that2, ok := that.(DesiredLRPRunInfo) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { + return false + } + if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { + return false + } + for i := range this.EnvironmentVariables { + if !this.EnvironmentVariables[i].Equal(that1.EnvironmentVariables[i]) { + return false + } + } + if !this.Setup.Equal(that1.Setup) { + return false + } + if !this.Action.Equal(that1.Action) { + return false + } + if !this.Monitor.Equal(that1.Monitor) { + return false + } + if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { + return false + } + if this.Privileged != that1.Privileged { + return false + } + if this.CpuWeight != that1.CpuWeight { + return false + } + if len(this.Ports) != len(that1.Ports) { + return false + } + for i := range this.Ports { + if this.Ports[i] != that1.Ports[i] { + return false + } + } + if len(this.EgressRules) != len(that1.EgressRules) { + return false + } + for i := range this.EgressRules { + if !this.EgressRules[i].Equal(that1.EgressRules[i]) { + return false + } + } + if this.LogSource != that1.LogSource { + return false + } + if this.MetricsGuid != that1.MetricsGuid { + return false + } + if this.CreatedAt != that1.CreatedAt { + return false + } + if len(this.CachedDependencies) != len(that1.CachedDependencies) { + return false + } + for i := range this.CachedDependencies { + if !this.CachedDependencies[i].Equal(that1.CachedDependencies[i]) { + return false + } + } + if this.LegacyDownloadUser != that1.LegacyDownloadUser { + return false + } + if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { + return false + } + if len(this.VolumeMounts) != len(that1.VolumeMounts) { + return false + } + for i := range this.VolumeMounts { + if !this.VolumeMounts[i].Equal(that1.VolumeMounts[i]) { + return false + } + } + if !this.Network.Equal(that1.Network) { + return false + } + if this.StartTimeoutMs != that1.StartTimeoutMs { + return false + } + if !this.CertificateProperties.Equal(that1.CertificateProperties) { + return false + } + if this.ImageUsername != that1.ImageUsername { + return false + } + if this.ImagePassword != that1.ImagePassword { + return false + } + if !this.CheckDefinition.Equal(that1.CheckDefinition) { + return false + } + if len(this.ImageLayers) != len(that1.ImageLayers) { + return false + } + for i := range this.ImageLayers { + if !this.ImageLayers[i].Equal(that1.ImageLayers[i]) { + return false + } + } + if len(this.MetricTags) != len(that1.MetricTags) { + return false + } + for i := range this.MetricTags { + if this.MetricTags[i] != that1.MetricTags[i] { + return false + } + } + if len(this.Sidecars) != len(that1.Sidecars) { + return false + } + for i := range this.Sidecars { + if !this.Sidecars[i].Equal(that1.Sidecars[i]) { + return false + } + } + if !this.LogRateLimit.Equal(that1.LogRateLimit) { + return false + } + return true +} func (m *DesiredLRPRunInfo) GetDesiredLrpKey() *DesiredLRPKey { if m != nil { return m.DesiredLrpKey @@ -503,6 +705,69 @@ func DesiredLRPRunInfoProtoMap(values []*DesiredLRPRunInfo) []*ProtoDesiredLRPRu return result } +// Prevent copylock errors when using ProtoRoutes directly +type Routes struct { + Routes map[string][]byte +} + +func (this *Routes) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Routes) + if !ok { + that2, ok := that.(Routes) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.Routes) != len(that1.Routes) { + return false + } + for i := range this.Routes { + if !bytes.Equal(this.Routes[i], that1.Routes[i]) { + return false + } + } + return true +} +func (m *Routes) GetRoutes() map[string][]byte { + if m != nil { + return m.Routes + } + return nil +} +func (m *Routes) SetRoutes(value map[string][]byte) { + if m != nil { + m.Routes = value + } +} +func (x *Routes) ToProto() *ProtoRoutes { + proto := &ProtoRoutes{ + Routes: x.Routes, + } + return proto +} + +func RoutesProtoMap(values []*Routes) []*ProtoRoutes { + result := make([]*ProtoRoutes, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPUpdate directly type DesiredLRPUpdate struct { Instances int32 @@ -511,6 +776,47 @@ type DesiredLRPUpdate struct { MetricTags map[string]*ProtoMetricTagValue } +func (this *DesiredLRPUpdate) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPUpdate) + if !ok { + that2, ok := that.(DesiredLRPUpdate) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Instances != that1.Instances { + return false + } + if !this.Routes.Equal(that1.Routes) { + return false + } + if this.Annotation != that1.Annotation { + return false + } + if len(this.MetricTags) != len(that1.MetricTags) { + return false + } + for i := range this.MetricTags { + if this.MetricTags[i] != that1.MetricTags[i] { + return false + } + } + return true +} func (m *DesiredLRPUpdate) GetInstances() int32 { if m != nil { return m.Instances @@ -580,6 +886,39 @@ type DesiredLRPKey struct { LogGuid string } +func (this *DesiredLRPKey) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPKey) + if !ok { + that2, ok := that.(DesiredLRPKey) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if this.Domain != that1.Domain { + return false + } + if this.LogGuid != that1.LogGuid { + return false + } + return true +} func (m *DesiredLRPKey) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -638,6 +977,42 @@ type DesiredLRPResource struct { MaxPids int32 } +func (this *DesiredLRPResource) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPResource) + if !ok { + that2, ok := that.(DesiredLRPResource) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.MemoryMb != that1.MemoryMb { + return false + } + if this.DiskMb != that1.DiskMb { + return false + } + if this.RootFs != that1.RootFs { + return false + } + if this.MaxPids != that1.MaxPids { + return false + } + return true +} func (m *DesiredLRPResource) GetMemoryMb() int32 { if m != nil { return m.MemoryMb @@ -741,6 +1116,186 @@ type DesiredLRP struct { LogRateLimit *LogRateLimit } +func (this *DesiredLRP) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRP) + if !ok { + that2, ok := that.(DesiredLRP) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if this.Domain != that1.Domain { + return false + } + if this.RootFs != that1.RootFs { + return false + } + if this.Instances != that1.Instances { + return false + } + if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { + return false + } + for i := range this.EnvironmentVariables { + if !this.EnvironmentVariables[i].Equal(that1.EnvironmentVariables[i]) { + return false + } + } + if !this.Setup.Equal(that1.Setup) { + return false + } + if !this.Action.Equal(that1.Action) { + return false + } + if this.StartTimeoutMs != that1.StartTimeoutMs { + return false + } + if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { + return false + } + if !this.Monitor.Equal(that1.Monitor) { + return false + } + if this.DiskMb != that1.DiskMb { + return false + } + if this.MemoryMb != that1.MemoryMb { + return false + } + if this.CpuWeight != that1.CpuWeight { + return false + } + if this.Privileged != that1.Privileged { + return false + } + if len(this.Ports) != len(that1.Ports) { + return false + } + for i := range this.Ports { + if this.Ports[i] != that1.Ports[i] { + return false + } + } + if !this.Routes.Equal(that1.Routes) { + return false + } + if this.LogSource != that1.LogSource { + return false + } + if this.LogGuid != that1.LogGuid { + return false + } + if this.MetricsGuid != that1.MetricsGuid { + return false + } + if this.Annotation != that1.Annotation { + return false + } + if len(this.EgressRules) != len(that1.EgressRules) { + return false + } + for i := range this.EgressRules { + if !this.EgressRules[i].Equal(that1.EgressRules[i]) { + return false + } + } + if !this.ModificationTag.Equal(that1.ModificationTag) { + return false + } + if len(this.CachedDependencies) != len(that1.CachedDependencies) { + return false + } + for i := range this.CachedDependencies { + if !this.CachedDependencies[i].Equal(that1.CachedDependencies[i]) { + return false + } + } + if this.LegacyDownloadUser != that1.LegacyDownloadUser { + return false + } + if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { + return false + } + if len(this.VolumeMounts) != len(that1.VolumeMounts) { + return false + } + for i := range this.VolumeMounts { + if !this.VolumeMounts[i].Equal(that1.VolumeMounts[i]) { + return false + } + } + if !this.Network.Equal(that1.Network) { + return false + } + if len(this.ProtoPlacementTags) != len(that1.ProtoPlacementTags) { + return false + } + for i := range this.ProtoPlacementTags { + if this.ProtoPlacementTags[i] != that1.ProtoPlacementTags[i] { + return false + } + } + if this.MaxPids != that1.MaxPids { + return false + } + if !this.CertificateProperties.Equal(that1.CertificateProperties) { + return false + } + if this.ImageUsername != that1.ImageUsername { + return false + } + if this.ImagePassword != that1.ImagePassword { + return false + } + if !this.CheckDefinition.Equal(that1.CheckDefinition) { + return false + } + if len(this.ImageLayers) != len(that1.ImageLayers) { + return false + } + for i := range this.ImageLayers { + if !this.ImageLayers[i].Equal(that1.ImageLayers[i]) { + return false + } + } + if len(this.MetricTags) != len(that1.MetricTags) { + return false + } + for i := range this.MetricTags { + if this.MetricTags[i] != that1.MetricTags[i] { + return false + } + } + if len(this.Sidecars) != len(that1.Sidecars) { + return false + } + for i := range this.Sidecars { + if !this.Sidecars[i].Equal(that1.Sidecars[i]) { + return false + } + } + if !this.LogRateLimit.Equal(that1.LogRateLimit) { + return false + } + return true +} func (m *DesiredLRP) GetProcessGuid() string { if m != nil { return m.ProcessGuid diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index b7117284..f6724e2b 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -11,6 +11,33 @@ type DesiredLRPLifecycleResponse struct { Error *Error } +func (this *DesiredLRPLifecycleResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPLifecycleResponse) + if !ok { + that2, ok := that.(DesiredLRPLifecycleResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + return true +} func (m *DesiredLRPLifecycleResponse) GetError() *Error { if m != nil { return m.Error @@ -43,6 +70,41 @@ type DesiredLRPsResponse struct { DesiredLrps []*DesiredLRP } +func (this *DesiredLRPsResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPsResponse) + if !ok { + that2, ok := that.(DesiredLRPsResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if len(this.DesiredLrps) != len(that1.DesiredLrps) { + return false + } + for i := range this.DesiredLrps { + if !this.DesiredLrps[i].Equal(that1.DesiredLrps[i]) { + return false + } + } + return true +} func (m *DesiredLRPsResponse) GetError() *Error { if m != nil { return m.Error @@ -87,6 +149,41 @@ type DesiredLRPsRequest struct { ProcessGuids []string } +func (this *DesiredLRPsRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPsRequest) + if !ok { + that2, ok := that.(DesiredLRPsRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Domain != that1.Domain { + return false + } + if len(this.ProcessGuids) != len(that1.ProcessGuids) { + return false + } + for i := range this.ProcessGuids { + if this.ProcessGuids[i] != that1.ProcessGuids[i] { + return false + } + } + return true +} func (m *DesiredLRPsRequest) GetDomain() string { if m != nil { return m.Domain @@ -131,6 +228,36 @@ type DesiredLRPResponse struct { DesiredLrp *DesiredLRP } +func (this *DesiredLRPResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPResponse) + if !ok { + that2, ok := that.(DesiredLRPResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if !this.DesiredLrp.Equal(that1.DesiredLrp) { + return false + } + return true +} func (m *DesiredLRPResponse) GetError() *Error { if m != nil { return m.Error @@ -175,6 +302,41 @@ type DesiredLRPSchedulingInfosResponse struct { DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo } +func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPSchedulingInfosResponse) + if !ok { + that2, ok := that.(DesiredLRPSchedulingInfosResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if len(this.DesiredLrpSchedulingInfos) != len(that1.DesiredLrpSchedulingInfos) { + return false + } + for i := range this.DesiredLrpSchedulingInfos { + if !this.DesiredLrpSchedulingInfos[i].Equal(that1.DesiredLrpSchedulingInfos[i]) { + return false + } + } + return true +} func (m *DesiredLRPSchedulingInfosResponse) GetError() *Error { if m != nil { return m.Error @@ -219,6 +381,36 @@ type DesiredLRPSchedulingInfoByProcessGuidResponse struct { DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo } +func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPSchedulingInfoByProcessGuidResponse) + if !ok { + that2, ok := that.(DesiredLRPSchedulingInfoByProcessGuidResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if !this.DesiredLrpSchedulingInfo.Equal(that1.DesiredLrpSchedulingInfo) { + return false + } + return true +} func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetError() *Error { if m != nil { return m.Error @@ -262,6 +454,33 @@ type DesiredLRPByProcessGuidRequest struct { ProcessGuid string } +func (this *DesiredLRPByProcessGuidRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPByProcessGuidRequest) + if !ok { + that2, ok := that.(DesiredLRPByProcessGuidRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + return true +} func (m *DesiredLRPByProcessGuidRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -293,6 +512,33 @@ type DesireLRPRequest struct { DesiredLrp *DesiredLRP } +func (this *DesireLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesireLRPRequest) + if !ok { + that2, ok := that.(DesireLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.DesiredLrp.Equal(that1.DesiredLrp) { + return false + } + return true +} func (m *DesireLRPRequest) GetDesiredLrp() *DesiredLRP { if m != nil { return m.DesiredLrp @@ -325,6 +571,36 @@ type UpdateDesiredLRPRequest struct { Update *DesiredLRPUpdate } +func (this *UpdateDesiredLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*UpdateDesiredLRPRequest) + if !ok { + that2, ok := that.(UpdateDesiredLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + if !this.Update.Equal(that1.Update) { + return false + } + return true +} func (m *UpdateDesiredLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid @@ -368,6 +644,33 @@ type RemoveDesiredLRPRequest struct { ProcessGuid string } +func (this *RemoveDesiredLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*RemoveDesiredLRPRequest) + if !ok { + that2, ok := that.(RemoveDesiredLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.ProcessGuid != that1.ProcessGuid { + return false + } + return true +} func (m *RemoveDesiredLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 45e5a577..003fd4b3 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -12,6 +12,41 @@ type DomainsResponse struct { Domains []string } +func (this *DomainsResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DomainsResponse) + if !ok { + that2, ok := that.(DomainsResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if len(this.Domains) != len(that1.Domains) { + return false + } + for i := range this.Domains { + if this.Domains[i] != that1.Domains[i] { + return false + } + } + return true +} func (m *DomainsResponse) GetError() *Error { if m != nil { return m.Error @@ -55,6 +90,33 @@ type UpsertDomainResponse struct { Error *Error } +func (this *UpsertDomainResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*UpsertDomainResponse) + if !ok { + that2, ok := that.(UpsertDomainResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + return true +} func (m *UpsertDomainResponse) GetError() *Error { if m != nil { return m.Error @@ -87,6 +149,36 @@ type UpsertDomainRequest struct { Ttl uint32 } +func (this *UpsertDomainRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*UpsertDomainRequest) + if !ok { + that2, ok := that.(UpsertDomainRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Domain != that1.Domain { + return false + } + if this.Ttl != that1.Ttl { + return false + } + return true +} func (m *UpsertDomainRequest) GetDomain() string { if m != nil { return m.Domain diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 740c946d..14e18bed 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -12,6 +12,36 @@ type EnvironmentVariable struct { Value string } +func (this *EnvironmentVariable) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EnvironmentVariable) + if !ok { + that2, ok := that.(EnvironmentVariable) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Name != that1.Name { + return false + } + if this.Value != that1.Value { + return false + } + return true +} func (m *EnvironmentVariable) GetName() string { if m != nil { return m.Name diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 452a8c6f..6abb2865 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -112,6 +112,36 @@ type Error struct { Message string } +func (this *Error) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Error) + if !ok { + that2, ok := that.(Error) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Type != that1.Type { + return false + } + if this.Message != that1.Message { + return false + } + return true +} func (m *Error) GetType() Error_Type { if m != nil { return m.Type diff --git a/models/errors.go b/models/errors.go index fec8e3f7..895da423 100644 --- a/models/errors.go +++ b/models/errors.go @@ -32,15 +32,15 @@ func (err *Error) ToError() error { return err } -func (err *Error) Equal(other error) bool { - if e, ok := other.(*Error); ok { - if err == nil && e != nil { - return false - } - return e.GetType() == err.GetType() - } - return false -} +// func (err *Error) Equal(other error) bool { +// if e, ok := other.(*Error); ok { +// if err == nil && e != nil { +// return false +// } +// return e.GetType() == err.GetType() +// } +// return false +// } func (err *Error) Error() string { return err.GetMessage() diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 70a7a7dc..03172d34 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -12,6 +12,36 @@ type EvacuationResponse struct { KeepContainer bool } +func (this *EvacuationResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EvacuationResponse) + if !ok { + that2, ok := that.(EvacuationResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if this.KeepContainer != that1.KeepContainer { + return false + } + return true +} func (m *EvacuationResponse) GetError() *Error { if m != nil { return m.Error @@ -56,6 +86,36 @@ type EvacuateClaimedActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EvacuateClaimedActualLRPRequest) + if !ok { + that2, ok := that.(EvacuateClaimedActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + return true +} func (m *EvacuateClaimedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -105,6 +165,61 @@ type EvacuateRunningActualLRPRequest struct { AvailabilityZone string } +func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EvacuateRunningActualLRPRequest) + if !ok { + that2, ok := that.(EvacuateRunningActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + return false + } + if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + return false + } + for i := range this.ActualLrpInternalRoutes { + if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { + return false + } + } + if len(this.MetricTags) != len(that1.MetricTags) { + return false + } + for i := range this.MetricTags { + if this.MetricTags[i] != that1.MetricTags[i] { + return false + } + } + if this.ProtoRoutable != that1.ProtoRoutable { + return false + } + if this.AvailabilityZone != that1.AvailabilityZone { + return false + } + return true +} func (m *EvacuateRunningActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -209,6 +324,36 @@ type EvacuateStoppedActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EvacuateStoppedActualLRPRequest) + if !ok { + that2, ok := that.(EvacuateStoppedActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + return true +} func (m *EvacuateStoppedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -254,6 +399,39 @@ type EvacuateCrashedActualLRPRequest struct { ErrorMessage string } +func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EvacuateCrashedActualLRPRequest) + if !ok { + that2, ok := that.(EvacuateCrashedActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + if this.ErrorMessage != that1.ErrorMessage { + return false + } + return true +} func (m *EvacuateCrashedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -310,6 +488,36 @@ type RemoveEvacuatingActualLRPRequest struct { ActualLrpInstanceKey *ActualLRPInstanceKey } +func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*RemoveEvacuatingActualLRPRequest) + if !ok { + that2, ok := that.(RemoveEvacuatingActualLRPRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + return true +} func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -353,6 +561,33 @@ type RemoveEvacuatingActualLRPResponse struct { Error *Error } +func (this *RemoveEvacuatingActualLRPResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*RemoveEvacuatingActualLRPResponse) + if !ok { + that2, ok := that.(RemoveEvacuatingActualLRPResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + return true +} func (m *RemoveEvacuatingActualLRPResponse) GetError() *Error { if m != nil { return m.Error diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index b2ab5fa5..35ac764c 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -11,6 +11,33 @@ type ActualLRPCreatedEvent struct { ActualLrpGroup *ActualLRPGroup } +func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPCreatedEvent) + if !ok { + that2, ok := that.(ActualLRPCreatedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + return false + } + return true +} func (m *ActualLRPCreatedEvent) GetActualLrpGroup() *ActualLRPGroup { if m != nil { return m.ActualLrpGroup @@ -43,6 +70,36 @@ type ActualLRPChangedEvent struct { After *ActualLRPGroup } +func (this *ActualLRPChangedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPChangedEvent) + if !ok { + that2, ok := that.(ActualLRPChangedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Before.Equal(that1.Before) { + return false + } + if !this.After.Equal(that1.After) { + return false + } + return true +} func (m *ActualLRPChangedEvent) GetBefore() *ActualLRPGroup { if m != nil { return m.Before @@ -86,6 +143,33 @@ type ActualLRPRemovedEvent struct { ActualLrpGroup *ActualLRPGroup } +func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPRemovedEvent) + if !ok { + that2, ok := that.(ActualLRPRemovedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + return false + } + return true +} func (m *ActualLRPRemovedEvent) GetActualLrpGroup() *ActualLRPGroup { if m != nil { return m.ActualLrpGroup @@ -118,6 +202,36 @@ type ActualLRPInstanceCreatedEvent struct { TraceId string } +func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPInstanceCreatedEvent) + if !ok { + that2, ok := that.(ActualLRPInstanceCreatedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrp.Equal(that1.ActualLrp) { + return false + } + if this.TraceId != that1.TraceId { + return false + } + return true +} func (m *ActualLRPInstanceCreatedEvent) GetActualLrp() *ActualLRP { if m != nil { return m.ActualLrp @@ -170,6 +284,60 @@ type ActualLRPInfo struct { AvailabilityZone string } +func (this *ActualLRPInfo) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPInfo) + if !ok { + that2, ok := that.(ActualLRPInfo) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + return false + } + if this.CrashCount != that1.CrashCount { + return false + } + if this.CrashReason != that1.CrashReason { + return false + } + if this.State != that1.State { + return false + } + if this.PlacementError != that1.PlacementError { + return false + } + if this.Since != that1.Since { + return false + } + if !this.ModificationTag.Equal(that1.ModificationTag) { + return false + } + if this.Presence != that1.Presence { + return false + } + if this.ProtoRoutable != that1.ProtoRoutable { + return false + } + if this.AvailabilityZone != that1.AvailabilityZone { + return false + } + return true +} func (m *ActualLRPInfo) GetActualLrpNetInfo() *ActualLRPNetInfo { if m != nil { return m.ActualLrpNetInfo @@ -313,6 +481,45 @@ type ActualLRPInstanceChangedEvent struct { TraceId string } +func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPInstanceChangedEvent) + if !ok { + that2, ok := that.(ActualLRPInstanceChangedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + if !this.Before.Equal(that1.Before) { + return false + } + if !this.After.Equal(that1.After) { + return false + } + if this.TraceId != that1.TraceId { + return false + } + return true +} func (m *ActualLRPInstanceChangedEvent) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -393,6 +600,36 @@ type ActualLRPInstanceRemovedEvent struct { TraceId string } +func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPInstanceRemovedEvent) + if !ok { + that2, ok := that.(ActualLRPInstanceRemovedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrp.Equal(that1.ActualLrp) { + return false + } + if this.TraceId != that1.TraceId { + return false + } + return true +} func (m *ActualLRPInstanceRemovedEvent) GetActualLrp() *ActualLRP { if m != nil { return m.ActualLrp @@ -437,6 +674,36 @@ type DesiredLRPCreatedEvent struct { TraceId string } +func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPCreatedEvent) + if !ok { + that2, ok := that.(DesiredLRPCreatedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.DesiredLrp.Equal(that1.DesiredLrp) { + return false + } + if this.TraceId != that1.TraceId { + return false + } + return true +} func (m *DesiredLRPCreatedEvent) GetDesiredLrp() *DesiredLRP { if m != nil { return m.DesiredLrp @@ -482,6 +749,39 @@ type DesiredLRPChangedEvent struct { TraceId string } +func (this *DesiredLRPChangedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPChangedEvent) + if !ok { + that2, ok := that.(DesiredLRPChangedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Before.Equal(that1.Before) { + return false + } + if !this.After.Equal(that1.After) { + return false + } + if this.TraceId != that1.TraceId { + return false + } + return true +} func (m *DesiredLRPChangedEvent) GetBefore() *DesiredLRP { if m != nil { return m.Before @@ -538,6 +838,36 @@ type DesiredLRPRemovedEvent struct { TraceId string } +func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesiredLRPRemovedEvent) + if !ok { + that2, ok := that.(DesiredLRPRemovedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.DesiredLrp.Equal(that1.DesiredLrp) { + return false + } + if this.TraceId != that1.TraceId { + return false + } + return true +} func (m *DesiredLRPRemovedEvent) GetDesiredLrp() *DesiredLRP { if m != nil { return m.DesiredLrp @@ -585,6 +915,45 @@ type ActualLRPCrashedEvent struct { Since int64 } +func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ActualLRPCrashedEvent) + if !ok { + that2, ok := that.(ActualLRPCrashedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + return false + } + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + return false + } + if this.CrashCount != that1.CrashCount { + return false + } + if this.CrashReason != that1.CrashReason { + return false + } + if this.Since != that1.Since { + return false + } + return true +} func (m *ActualLRPCrashedEvent) GetActualLrpKey() *ActualLRPKey { if m != nil { return m.ActualLrpKey @@ -664,6 +1033,33 @@ type EventsByCellId struct { CellId string } +func (this *EventsByCellId) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*EventsByCellId) + if !ok { + that2, ok := that.(EventsByCellId) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.CellId != that1.CellId { + return false + } + return true +} func (m *EventsByCellId) GetCellId() string { if m != nil { return m.CellId @@ -695,6 +1091,33 @@ type TaskCreatedEvent struct { Task *Task } +func (this *TaskCreatedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskCreatedEvent) + if !ok { + that2, ok := that.(TaskCreatedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Task.Equal(that1.Task) { + return false + } + return true +} func (m *TaskCreatedEvent) GetTask() *Task { if m != nil { return m.Task @@ -727,6 +1150,36 @@ type TaskChangedEvent struct { After *Task } +func (this *TaskChangedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskChangedEvent) + if !ok { + that2, ok := that.(TaskChangedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Before.Equal(that1.Before) { + return false + } + if !this.After.Equal(that1.After) { + return false + } + return true +} func (m *TaskChangedEvent) GetBefore() *Task { if m != nil { return m.Before @@ -770,6 +1223,33 @@ type TaskRemovedEvent struct { Task *Task } +func (this *TaskRemovedEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskRemovedEvent) + if !ok { + that2, ok := that.(TaskRemovedEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Task.Equal(that1.Task) { + return false + } + return true +} func (m *TaskRemovedEvent) GetTask() *Task { if m != nil { return m.Task diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index fadf4a62..ebd46964 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -114,6 +114,51 @@ type ImageLayer struct { DigestValue string } +func (this *ImageLayer) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ImageLayer) + if !ok { + that2, ok := that.(ImageLayer) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Name != that1.Name { + return false + } + if this.Url != that1.Url { + return false + } + if this.DestinationPath != that1.DestinationPath { + return false + } + if this.LayerType != that1.LayerType { + return false + } + if this.MediaType != that1.MediaType { + return false + } + if this.DigestAlgorithm != that1.DigestAlgorithm { + return false + } + if this.DigestValue != that1.DigestValue { + return false + } + return true +} func (m *ImageLayer) GetName() string { if m != nil { return m.Name diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index dec11284..f4787309 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -11,6 +11,33 @@ type LogRateLimit struct { BytesPerSecond int64 } +func (this *LogRateLimit) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*LogRateLimit) + if !ok { + that2, ok := that.(LogRateLimit) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.BytesPerSecond != that1.BytesPerSecond { + return false + } + return true +} func (m *LogRateLimit) GetBytesPerSecond() int64 { if m != nil { return m.BytesPerSecond diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 75605fb2..9102c691 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -46,6 +46,36 @@ type MetricTagValue struct { Dynamic MetricTagValue_DynamicValue } +func (this *MetricTagValue) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*MetricTagValue) + if !ok { + that2, ok := that.(MetricTagValue) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Static != that1.Static { + return false + } + if this.Dynamic != that1.Dynamic { + return false + } + return true +} func (m *MetricTagValue) GetStatic() string { if m != nil { return m.Static diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 223e23c7..a70c137c 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -12,6 +12,36 @@ type ModificationTag struct { Index uint32 } +func (this *ModificationTag) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ModificationTag) + if !ok { + that2, ok := that.(ModificationTag) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Epoch != that1.Epoch { + return false + } + if this.Index != that1.Index { + return false + } + return true +} func (m *ModificationTag) GetEpoch() string { if m != nil { return m.Epoch diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index d972799a..b1a6fdda 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -11,6 +11,38 @@ type Network struct { Properties map[string]string } +func (this *Network) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Network) + if !ok { + that2, ok := that.(Network) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.Properties) != len(that1.Properties) { + return false + } + for i := range this.Properties { + if this.Properties[i] != that1.Properties[i] { + return false + } + } + return true +} func (m *Network) GetProperties() map[string]string { if m != nil { return m.Properties diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index bebc7e0e..488addd8 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -11,6 +11,33 @@ type PingResponse struct { Available bool } +func (this *PingResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*PingResponse) + if !ok { + that2, ok := that.(PingResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Available != that1.Available { + return false + } + return true +} func (m *PingResponse) GetAvailable() bool { if m != nil { return m.Available diff --git a/models/routes.go b/models/routes.go index 6097fe12..89e2658c 100644 --- a/models/routes.go +++ b/models/routes.go @@ -1,77 +1,77 @@ package models -import ( - "bytes" - "encoding/json" -) +// import ( +// "bytes" +// "encoding/json" +// ) -type Routes map[string]*json.RawMessage +// type Routes map[string]*json.RawMessage -func (r *Routes) protoRoutes() *ProtoRoutes { - pr := &ProtoRoutes{ - Routes: map[string][]byte{}, - } +// func (r *Routes) protoRoutes() *ProtoRoutes { +// pr := &ProtoRoutes{ +// Routes: map[string][]byte{}, +// } - for k, v := range *r { - pr.Routes[k] = *v - } +// for k, v := range *r { +// pr.Routes[k] = *v +// } - return pr -} +// return pr +// } -func (r *Routes) Marshal() ([]byte, error) { - return r.protoRoutes().Marshal() -} +// func (r *Routes) Marshal() ([]byte, error) { +// return r.protoRoutes().Marshal() +// } -func (r *Routes) MarshalTo(data []byte) (n int, err error) { - return r.protoRoutes().MarshalTo(data) -} +// func (r *Routes) MarshalTo(data []byte) (n int, err error) { +// return r.protoRoutes().MarshalTo(data) +// } -func (r *Routes) Unmarshal(data []byte) error { - pr := &ProtoRoutes{} - err := pr.Unmarshal(data) - if err != nil { - return err - } +// func (r *Routes) Unmarshal(data []byte) error { +// pr := &ProtoRoutes{} +// err := pr.Unmarshal(data) +// if err != nil { +// return err +// } - if pr.Routes == nil { - return nil - } +// if pr.Routes == nil { +// return nil +// } - routes := map[string]*json.RawMessage{} - for k, v := range pr.Routes { - raw := json.RawMessage(v) - routes[k] = &raw - } - *r = routes +// routes := map[string]*json.RawMessage{} +// for k, v := range pr.Routes { +// raw := json.RawMessage(v) +// routes[k] = &raw +// } +// *r = routes - return nil -} +// return nil +// } -func (r *Routes) Size() int { - if r == nil { - return 0 - } +// func (r *Routes) Size() int { +// if r == nil { +// return 0 +// } - return r.protoRoutes().Size() -} +// return r.protoRoutes().Size() +// } -func (r *Routes) Equal(other Routes) bool { - for k, v := range *r { - if !bytes.Equal(*v, *other[k]) { - return false - } - } - return true -} +// func (r *Routes) Equal(other Routes) bool { +// for k, v := range *r { +// if !bytes.Equal(*v, *other[k]) { +// return false +// } +// } +// return true +// } -func (r Routes) Validate() error { - totalRoutesLength := 0 - for _, value := range r { - totalRoutesLength += len(*value) - if totalRoutesLength > maximumRouteLength { - return ErrInvalidField{"routes"} - } - } - return nil -} +// func (r Routes) Validate() error { +// totalRoutesLength := 0 +// for _, value := range r { +// totalRoutesLength += len(*value) +// if totalRoutesLength > maximumRouteLength { +// return ErrInvalidField{"routes"} +// } +// } +// return nil +// } diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index a06b38da..d41bf848 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -12,6 +12,36 @@ type PortRange struct { End uint32 } +func (this *PortRange) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*PortRange) + if !ok { + that2, ok := that.(PortRange) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Start != that1.Start { + return false + } + if this.End != that1.End { + return false + } + return true +} func (m *PortRange) GetStart() uint32 { if m != nil { return m.Start @@ -56,6 +86,36 @@ type ICMPInfo struct { Code int32 } +func (this *ICMPInfo) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*ICMPInfo) + if !ok { + that2, ok := that.(ICMPInfo) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Type != that1.Type { + return false + } + if this.Code != that1.Code { + return false + } + return true +} func (m *ICMPInfo) GetType() int32 { if m != nil { return m.Type @@ -105,6 +165,66 @@ type SecurityGroupRule struct { Annotations []string } +func (this *SecurityGroupRule) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*SecurityGroupRule) + if !ok { + that2, ok := that.(SecurityGroupRule) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Protocol != that1.Protocol { + return false + } + if len(this.Destinations) != len(that1.Destinations) { + return false + } + for i := range this.Destinations { + if this.Destinations[i] != that1.Destinations[i] { + return false + } + } + if len(this.Ports) != len(that1.Ports) { + return false + } + for i := range this.Ports { + if this.Ports[i] != that1.Ports[i] { + return false + } + } + if !this.PortRange.Equal(that1.PortRange) { + return false + } + if !this.IcmpInfo.Equal(that1.IcmpInfo) { + return false + } + if this.Log != that1.Log { + return false + } + if len(this.Annotations) != len(that1.Annotations) { + return false + } + for i := range this.Annotations { + if this.Annotations[i] != that1.Annotations[i] { + return false + } + } + return true +} func (m *SecurityGroupRule) GetProtocol() string { if m != nil { return m.Protocol diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 06a22af1..f04b4fba 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -13,6 +13,39 @@ type Sidecar struct { MemoryMb int32 } +func (this *Sidecar) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Sidecar) + if !ok { + that2, ok := that.(Sidecar) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Action.Equal(that1.Action) { + return false + } + if this.DiskMb != that1.DiskMb { + return false + } + if this.MemoryMb != that1.MemoryMb { + return false + } + return true +} func (m *Sidecar) GetAction() *Action { if m != nil { return m.Action diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index bfc53806..0cc80975 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -41,6 +41,146 @@ type TaskDefinition struct { MetricTags map[string]*ProtoMetricTagValue } +func (this *TaskDefinition) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskDefinition) + if !ok { + that2, ok := that.(TaskDefinition) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.RootFs != that1.RootFs { + return false + } + if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { + return false + } + for i := range this.EnvironmentVariables { + if !this.EnvironmentVariables[i].Equal(that1.EnvironmentVariables[i]) { + return false + } + } + if !this.Action.Equal(that1.Action) { + return false + } + if this.DiskMb != that1.DiskMb { + return false + } + if this.MemoryMb != that1.MemoryMb { + return false + } + if this.CpuWeight != that1.CpuWeight { + return false + } + if this.Privileged != that1.Privileged { + return false + } + if this.LogSource != that1.LogSource { + return false + } + if this.LogGuid != that1.LogGuid { + return false + } + if this.MetricsGuid != that1.MetricsGuid { + return false + } + if this.ResultFile != that1.ResultFile { + return false + } + if this.CompletionCallbackUrl != that1.CompletionCallbackUrl { + return false + } + if this.Annotation != that1.Annotation { + return false + } + if len(this.EgressRules) != len(that1.EgressRules) { + return false + } + for i := range this.EgressRules { + if !this.EgressRules[i].Equal(that1.EgressRules[i]) { + return false + } + } + if len(this.CachedDependencies) != len(that1.CachedDependencies) { + return false + } + for i := range this.CachedDependencies { + if !this.CachedDependencies[i].Equal(that1.CachedDependencies[i]) { + return false + } + } + if this.LegacyDownloadUser != that1.LegacyDownloadUser { + return false + } + if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { + return false + } + if len(this.VolumeMounts) != len(that1.VolumeMounts) { + return false + } + for i := range this.VolumeMounts { + if !this.VolumeMounts[i].Equal(that1.VolumeMounts[i]) { + return false + } + } + if !this.Network.Equal(that1.Network) { + return false + } + if len(this.PlacementTags) != len(that1.PlacementTags) { + return false + } + for i := range this.PlacementTags { + if this.PlacementTags[i] != that1.PlacementTags[i] { + return false + } + } + if this.MaxPids != that1.MaxPids { + return false + } + if !this.CertificateProperties.Equal(that1.CertificateProperties) { + return false + } + if this.ImageUsername != that1.ImageUsername { + return false + } + if this.ImagePassword != that1.ImagePassword { + return false + } + if len(this.ImageLayers) != len(that1.ImageLayers) { + return false + } + for i := range this.ImageLayers { + if !this.ImageLayers[i].Equal(that1.ImageLayers[i]) { + return false + } + } + if !this.LogRateLimit.Equal(that1.LogRateLimit) { + return false + } + if len(this.MetricTags) != len(that1.MetricTags) { + return false + } + for i := range this.MetricTags { + if this.MetricTags[i] != that1.MetricTags[i] { + return false + } + } + return true +} func (m *TaskDefinition) GetRootFs() string { if m != nil { return m.RootFs @@ -434,6 +574,69 @@ type Task struct { RejectionReason string } +func (this *Task) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*Task) + if !ok { + that2, ok := that.(Task) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.TaskDefinition.Equal(that1.TaskDefinition) { + return false + } + if this.TaskGuid != that1.TaskGuid { + return false + } + if this.Domain != that1.Domain { + return false + } + if this.CreatedAt != that1.CreatedAt { + return false + } + if this.UpdatedAt != that1.UpdatedAt { + return false + } + if this.FirstCompletedAt != that1.FirstCompletedAt { + return false + } + if this.State != that1.State { + return false + } + if this.CellId != that1.CellId { + return false + } + if this.Result != that1.Result { + return false + } + if this.Failed != that1.Failed { + return false + } + if this.FailureReason != that1.FailureReason { + return false + } + if this.RejectionCount != that1.RejectionCount { + return false + } + if this.RejectionReason != that1.RejectionReason { + return false + } + return true +} func (m *Task) GetTaskDefinition() *TaskDefinition { if m != nil { return m.TaskDefinition diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 71f34c84..93f72722 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -11,6 +11,33 @@ type TaskLifecycleResponse struct { Error *Error } +func (this *TaskLifecycleResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskLifecycleResponse) + if !ok { + that2, ok := that.(TaskLifecycleResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + return true +} func (m *TaskLifecycleResponse) GetError() *Error { if m != nil { return m.Error @@ -44,6 +71,39 @@ type DesireTaskRequest struct { Domain string } +func (this *DesireTaskRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*DesireTaskRequest) + if !ok { + that2, ok := that.(DesireTaskRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.TaskDefinition.Equal(that1.TaskDefinition) { + return false + } + if this.TaskGuid != that1.TaskGuid { + return false + } + if this.Domain != that1.Domain { + return false + } + return true +} func (m *DesireTaskRequest) GetTaskDefinition() *TaskDefinition { if m != nil { return m.TaskDefinition @@ -100,6 +160,36 @@ type StartTaskRequest struct { CellId string } +func (this *StartTaskRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*StartTaskRequest) + if !ok { + that2, ok := that.(StartTaskRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.TaskGuid != that1.TaskGuid { + return false + } + if this.CellId != that1.CellId { + return false + } + return true +} func (m *StartTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid @@ -144,6 +234,36 @@ type StartTaskResponse struct { ShouldStart bool } +func (this *StartTaskResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*StartTaskResponse) + if !ok { + that2, ok := that.(StartTaskResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if this.ShouldStart != that1.ShouldStart { + return false + } + return true +} func (m *StartTaskResponse) GetError() *Error { if m != nil { return m.Error @@ -188,6 +308,36 @@ type FailTaskRequest struct { FailureReason string } +func (this *FailTaskRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*FailTaskRequest) + if !ok { + that2, ok := that.(FailTaskRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.TaskGuid != that1.TaskGuid { + return false + } + if this.FailureReason != that1.FailureReason { + return false + } + return true +} func (m *FailTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid @@ -232,6 +382,36 @@ type RejectTaskRequest struct { RejectionReason string } +func (this *RejectTaskRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*RejectTaskRequest) + if !ok { + that2, ok := that.(RejectTaskRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.TaskGuid != that1.TaskGuid { + return false + } + if this.RejectionReason != that1.RejectionReason { + return false + } + return true +} func (m *RejectTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid @@ -275,6 +455,33 @@ type TaskGuidRequest struct { TaskGuid string } +func (this *TaskGuidRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskGuidRequest) + if !ok { + that2, ok := that.(TaskGuidRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.TaskGuid != that1.TaskGuid { + return false + } + return true +} func (m *TaskGuidRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid @@ -310,6 +517,45 @@ type CompleteTaskRequest struct { Result string } +func (this *CompleteTaskRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*CompleteTaskRequest) + if !ok { + that2, ok := that.(CompleteTaskRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.TaskGuid != that1.TaskGuid { + return false + } + if this.CellId != that1.CellId { + return false + } + if this.Failed != that1.Failed { + return false + } + if this.FailureReason != that1.FailureReason { + return false + } + if this.Result != that1.Result { + return false + } + return true +} func (m *CompleteTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid @@ -394,6 +640,48 @@ type TaskCallbackResponse struct { CreatedAt int64 } +func (this *TaskCallbackResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskCallbackResponse) + if !ok { + that2, ok := that.(TaskCallbackResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.TaskGuid != that1.TaskGuid { + return false + } + if this.Failed != that1.Failed { + return false + } + if this.FailureReason != that1.FailureReason { + return false + } + if this.Result != that1.Result { + return false + } + if this.Annotation != that1.Annotation { + return false + } + if this.CreatedAt != that1.CreatedAt { + return false + } + return true +} func (m *TaskCallbackResponse) GetTaskGuid() string { if m != nil { return m.TaskGuid @@ -486,6 +774,36 @@ type TasksRequest struct { CellId string } +func (this *TasksRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TasksRequest) + if !ok { + that2, ok := that.(TasksRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Domain != that1.Domain { + return false + } + if this.CellId != that1.CellId { + return false + } + return true +} func (m *TasksRequest) GetDomain() string { if m != nil { return m.Domain @@ -530,6 +848,41 @@ type TasksResponse struct { Tasks []*Task } +func (this *TasksResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TasksResponse) + if !ok { + that2, ok := that.(TasksResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if len(this.Tasks) != len(that1.Tasks) { + return false + } + for i := range this.Tasks { + if !this.Tasks[i].Equal(that1.Tasks[i]) { + return false + } + } + return true +} func (m *TasksResponse) GetError() *Error { if m != nil { return m.Error @@ -573,6 +926,33 @@ type TaskByGuidRequest struct { TaskGuid string } +func (this *TaskByGuidRequest) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskByGuidRequest) + if !ok { + that2, ok := that.(TaskByGuidRequest) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.TaskGuid != that1.TaskGuid { + return false + } + return true +} func (m *TaskByGuidRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid @@ -605,6 +985,36 @@ type TaskResponse struct { Task *Task } +func (this *TaskResponse) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*TaskResponse) + if !ok { + that2, ok := that.(TaskResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if !this.Error.Equal(that1.Error) { + return false + } + if !this.Task.Equal(that1.Task) { + return false + } + return true +} func (m *TaskResponse) GetError() *Error { if m != nil { return m.Error diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index b98d7e55..40d55874 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -12,6 +12,36 @@ type SharedDevice struct { MountConfig string } +func (this *SharedDevice) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*SharedDevice) + if !ok { + that2, ok := that.(SharedDevice) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.VolumeId != that1.VolumeId { + return false + } + if this.MountConfig != that1.MountConfig { + return false + } + return true +} func (m *SharedDevice) GetVolumeId() string { if m != nil { return m.VolumeId @@ -58,6 +88,42 @@ type VolumeMount struct { Shared *SharedDevice } +func (this *VolumeMount) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*VolumeMount) + if !ok { + that2, ok := that.(VolumeMount) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Driver != that1.Driver { + return false + } + if this.ContainerDir != that1.ContainerDir { + return false + } + if this.Mode != that1.Mode { + return false + } + if !this.Shared.Equal(that1.Shared) { + return false + } + return true +} func (m *VolumeMount) GetDriver() string { if m != nil { return m.Driver @@ -125,6 +191,38 @@ type VolumePlacement struct { DriverNames []string } +func (this *VolumePlacement) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*VolumePlacement) + if !ok { + that2, ok := that.(VolumePlacement) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if len(this.DriverNames) != len(that1.DriverNames) { + return false + } + for i := range this.DriverNames { + if this.DriverNames[i] != that1.DriverNames[i] { + return false + } + } + return true +} func (m *VolumePlacement) GetDriverNames() []string { if m != nil { return m.DriverNames diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index a63544b6..9ad8226a 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -392,7 +392,7 @@ func protocVersion(plugin *protogen.Plugin) string { return fmt.Sprintf("v%d.%d.%d%s", v.GetMajor(), v.GetMinor(), v.GetPatch(), suffix) } -var ignoredMessages []string = []string{"ProtoRoutes"} +var ignoredMessages []string = []string{} func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { for _, msg := range file.Messages { @@ -402,6 +402,7 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { if slices.Contains(ignoredMessages, getUnsafeName(g, msg.GoIdent)) { log.Printf("Ignoring message %s", msg.GoIdent) + continue } helper.genFriendlyEnums(g, msg) helper.genCopysafeStruct(g, msg) From e3623176e2c13271ad730178df43840916f1a3f3 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 15:14:03 +0000 Subject: [PATCH 032/155] Add getFieldName func: For adding additional logic to generated field name (e.g. ActualLrp => ActualLRP) Regen protos --- models/actual_lrp_bbs.pb.go | 64 ++++----- models/actual_lrp_requests_bbs.pb.go | 194 +++++++++++++------------- models/cells_bbs.pb.go | 2 +- models/check_definition_bbs.pb.go | 4 +- models/desired_lrp_bbs.pb.go | 50 +++---- models/desired_lrp_requests_bbs.pb.go | 80 +++++------ models/evacuation_bbs.pb.go | 172 +++++++++++------------ models/events_bbs.pb.go | 170 +++++++++++----------- models/security_group_bbs.pb.go | 2 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.go | 44 +++--- 11 files changed, 398 insertions(+), 386 deletions(-) diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 9243bd16..f6f6ce8c 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -70,8 +70,8 @@ func (m *ActualLRPGroup) SetEvacuating(value *ActualLRP) { } func (x *ActualLRPGroup) ToProto() *ProtoActualLRPGroup { proto := &ProtoActualLRPGroup{ - Instance: x.Instance.ToProto(), - Evacuating: x.Evacuating.ToProto(), + Instance: x.ActualLRP.ToProto(), + Evacuating: x.ActualLRP.ToProto(), } return proto } @@ -585,9 +585,9 @@ func (m ActualLRP_Presence) String() string { // Prevent copylock errors when using ProtoActualLRP directly type ActualLRP struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ActualLrpNetInfo *ActualLRPNetInfo + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLRPNetInfo *ActualLRPNetInfo CrashCount int32 CrashReason string State string @@ -595,7 +595,7 @@ type ActualLRP struct { Since int64 ModificationTag *ModificationTag Presence ActualLRP_Presence - ActualLrpInternalRoutes []*ActualLRPInternalRoute + ActualLRPInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string Routable bool AvailabilityZone string @@ -623,13 +623,13 @@ func (this *ActualLRP) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -653,11 +653,11 @@ func (this *ActualLRP) Equal(that interface{}) bool { if this.Presence != that1.Presence { return false } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + if len(this.ActualLRPInternalRoutes) != len(that1.ActualLRPInternalRoutes) { return false } - for i := range this.ActualLrpInternalRoutes { - if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { + for i := range this.ActualLRPInternalRoutes { + if !this.ActualLRPInternalRoutes[i].Equal(that1.ActualLRPInternalRoutes[i]) { return false } } @@ -677,37 +677,37 @@ func (this *ActualLRP) Equal(that interface{}) bool { } return true } -func (m *ActualLRP) GetActualLrpKey() *ActualLRPKey { +func (m *ActualLRP) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *ActualLRP) SetActualLrpKey(value *ActualLRPKey) { +func (m *ActualLRP) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *ActualLRP) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *ActualLRP) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *ActualLRP) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRP) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } -func (m *ActualLRP) GetActualLrpNetInfo() *ActualLRPNetInfo { +func (m *ActualLRP) GetActualLRPNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLrpNetInfo + return m.ActualLRPNetInfo } return nil } -func (m *ActualLRP) SetActualLrpNetInfo(value *ActualLRPNetInfo) { +func (m *ActualLRP) SetActualLRPNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLrpNetInfo = value + m.ActualLRPNetInfo = value } } func (m *ActualLRP) GetCrashCount() int32 { @@ -787,15 +787,15 @@ func (m *ActualLRP) SetPresence(value ActualLRP_Presence) { m.Presence = value } } -func (m *ActualLRP) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { +func (m *ActualLRP) GetActualLRPInternalRoutes() []*ActualLRPInternalRoute { if m != nil { - return m.ActualLrpInternalRoutes + return m.ActualLRPInternalRoutes } return nil } -func (m *ActualLRP) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { +func (m *ActualLRP) SetActualLRPInternalRoutes(value []*ActualLRPInternalRoute) { if m != nil { - m.ActualLrpInternalRoutes = value + m.ActualLRPInternalRoutes = value } } func (m *ActualLRP) GetMetricTags() map[string]string { @@ -833,9 +833,9 @@ func (m *ActualLRP) SetAvailabilityZone(value string) { } func (x *ActualLRP) ToProto() *ProtoActualLRP { proto := &ProtoActualLRP{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), - ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, State: x.State, @@ -843,7 +843,7 @@ func (x *ActualLRP) ToProto() *ProtoActualLRP { Since: x.Since, ModificationTag: x.ModificationTag.ToProto(), Presence: ProtoActualLRP_Presence(x.Presence), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), MetricTags: x.MetricTags, Routable: &x.Routable, AvailabilityZone: x.AvailabilityZone, diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 07704b07..3d34abb0 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -67,7 +67,7 @@ func ActualLRPLifecycleResponseProtoMap(values []*ActualLRPLifecycleResponse) [] // Prevent copylock errors when using ProtoActualLRPGroupsResponse directly type ActualLRPGroupsResponse struct { Error *Error - ActualLrpGroups []*ActualLRPGroup + ActualLRPGroups []*ActualLRPGroup } func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { @@ -95,11 +95,11 @@ func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.ActualLrpGroups) != len(that1.ActualLrpGroups) { + if len(this.ActualLRPGroups) != len(that1.ActualLRPGroups) { return false } - for i := range this.ActualLrpGroups { - if !this.ActualLrpGroups[i].Equal(that1.ActualLrpGroups[i]) { + for i := range this.ActualLRPGroups { + if !this.ActualLRPGroups[i].Equal(that1.ActualLRPGroups[i]) { return false } } @@ -116,21 +116,21 @@ func (m *ActualLRPGroupsResponse) SetError(value *Error) { m.Error = value } } -func (m *ActualLRPGroupsResponse) GetActualLrpGroups() []*ActualLRPGroup { +func (m *ActualLRPGroupsResponse) GetActualLRPGroups() []*ActualLRPGroup { if m != nil { - return m.ActualLrpGroups + return m.ActualLRPGroups } return nil } -func (m *ActualLRPGroupsResponse) SetActualLrpGroups(value []*ActualLRPGroup) { +func (m *ActualLRPGroupsResponse) SetActualLRPGroups(value []*ActualLRPGroup) { if m != nil { - m.ActualLrpGroups = value + m.ActualLRPGroups = value } } func (x *ActualLRPGroupsResponse) ToProto() *ProtoActualLRPGroupsResponse { proto := &ProtoActualLRPGroupsResponse{ Error: x.Error.ToProto(), - ActualLrpGroups: ActualLRPGroupProtoMap(x.ActualLrpGroups), + ActualLrpGroups: ActualLRPGroupProtoMap(x.ActualLRPGroups), } return proto } @@ -146,7 +146,7 @@ func ActualLRPGroupsResponseProtoMap(values []*ActualLRPGroupsResponse) []*Proto // Prevent copylock errors when using ProtoActualLRPGroupResponse directly type ActualLRPGroupResponse struct { Error *Error - ActualLrpGroup *ActualLRPGroup + ActualLRPGroup *ActualLRPGroup } func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { @@ -174,7 +174,7 @@ func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + if !this.ActualLRPGroup.Equal(that1.ActualLRPGroup) { return false } return true @@ -190,21 +190,21 @@ func (m *ActualLRPGroupResponse) SetError(value *Error) { m.Error = value } } -func (m *ActualLRPGroupResponse) GetActualLrpGroup() *ActualLRPGroup { +func (m *ActualLRPGroupResponse) GetActualLRPGroup() *ActualLRPGroup { if m != nil { - return m.ActualLrpGroup + return m.ActualLRPGroup } return nil } -func (m *ActualLRPGroupResponse) SetActualLrpGroup(value *ActualLRPGroup) { +func (m *ActualLRPGroupResponse) SetActualLRPGroup(value *ActualLRPGroup) { if m != nil { - m.ActualLrpGroup = value + m.ActualLRPGroup = value } } func (x *ActualLRPGroupResponse) ToProto() *ProtoActualLRPGroupResponse { proto := &ProtoActualLRPGroupResponse{ Error: x.Error.ToProto(), - ActualLrpGroup: x.ActualLrpGroup.ToProto(), + ActualLrpGroup: x.ActualLRPGroup.ToProto(), } return proto } @@ -427,7 +427,7 @@ func ActualLRPGroupByProcessGuidAndIndexRequestProtoMap(values []*ActualLRPGroup type ClaimActualLRPRequest struct { ProcessGuid string Index int32 - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPInstanceKey *ActualLRPInstanceKey } func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { @@ -458,7 +458,7 @@ func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } return true @@ -485,22 +485,22 @@ func (m *ClaimActualLRPRequest) SetIndex(value int32) { m.Index = value } } -func (m *ClaimActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *ClaimActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *ClaimActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *ClaimActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (x *ClaimActualLRPRequest) ToProto() *ProtoClaimActualLRPRequest { proto := &ProtoClaimActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), } return proto } @@ -515,10 +515,10 @@ func ClaimActualLRPRequestProtoMap(values []*ClaimActualLRPRequest) []*ProtoClai // Prevent copylock errors when using ProtoStartActualLRPRequest directly type StartActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ActualLrpNetInfo *ActualLRPNetInfo - ActualLrpInternalRoutes []*ActualLRPInternalRoute + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLRPNetInfo *ActualLRPNetInfo + ActualLRPInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string Routable bool AvailabilityZone string @@ -546,20 +546,20 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { return false } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + if len(this.ActualLRPInternalRoutes) != len(that1.ActualLRPInternalRoutes) { return false } - for i := range this.ActualLrpInternalRoutes { - if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { + for i := range this.ActualLRPInternalRoutes { + if !this.ActualLRPInternalRoutes[i].Equal(that1.ActualLRPInternalRoutes[i]) { return false } } @@ -579,48 +579,48 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *StartActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *StartActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *StartActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *StartActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *StartActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *StartActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *StartActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *StartActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } -func (m *StartActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { +func (m *StartActualLRPRequest) GetActualLRPNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLrpNetInfo + return m.ActualLRPNetInfo } return nil } -func (m *StartActualLRPRequest) SetActualLrpNetInfo(value *ActualLRPNetInfo) { +func (m *StartActualLRPRequest) SetActualLRPNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLrpNetInfo = value + m.ActualLRPNetInfo = value } } -func (m *StartActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { +func (m *StartActualLRPRequest) GetActualLRPInternalRoutes() []*ActualLRPInternalRoute { if m != nil { - return m.ActualLrpInternalRoutes + return m.ActualLRPInternalRoutes } return nil } -func (m *StartActualLRPRequest) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { +func (m *StartActualLRPRequest) SetActualLRPInternalRoutes(value []*ActualLRPInternalRoute) { if m != nil { - m.ActualLrpInternalRoutes = value + m.ActualLRPInternalRoutes = value } } func (m *StartActualLRPRequest) GetMetricTags() map[string]string { @@ -658,10 +658,10 @@ func (m *StartActualLRPRequest) SetAvailabilityZone(value string) { } func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { proto := &ProtoStartActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), - ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), MetricTags: x.MetricTags, Routable: &x.Routable, AvailabilityZone: x.AvailabilityZone, @@ -679,8 +679,8 @@ func StartActualLRPRequestProtoMap(values []*StartActualLRPRequest) []*ProtoStar // Prevent copylock errors when using ProtoCrashActualLRPRequest directly type CrashActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey ErrorMessage string } @@ -706,10 +706,10 @@ func (this *CrashActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -717,26 +717,26 @@ func (this *CrashActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *CrashActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *CrashActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *CrashActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *CrashActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *CrashActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *CrashActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *CrashActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *CrashActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (m *CrashActualLRPRequest) GetErrorMessage() string { @@ -752,8 +752,8 @@ func (m *CrashActualLRPRequest) SetErrorMessage(value string) { } func (x *CrashActualLRPRequest) ToProto() *ProtoCrashActualLRPRequest { proto := &ProtoCrashActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), ErrorMessage: x.ErrorMessage, } return proto @@ -769,7 +769,7 @@ func CrashActualLRPRequestProtoMap(values []*CrashActualLRPRequest) []*ProtoCras // Prevent copylock errors when using ProtoFailActualLRPRequest directly type FailActualLRPRequest struct { - ActualLrpKey *ActualLRPKey + ActualLRPKey *ActualLRPKey ErrorMessage string } @@ -795,7 +795,7 @@ func (this *FailActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -803,15 +803,15 @@ func (this *FailActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *FailActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *FailActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *FailActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *FailActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } func (m *FailActualLRPRequest) GetErrorMessage() string { @@ -827,7 +827,7 @@ func (m *FailActualLRPRequest) SetErrorMessage(value string) { } func (x *FailActualLRPRequest) ToProto() *ProtoFailActualLRPRequest { proto := &ProtoFailActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), ErrorMessage: x.ErrorMessage, } return proto @@ -843,7 +843,7 @@ func FailActualLRPRequestProtoMap(values []*FailActualLRPRequest) []*ProtoFailAc // Prevent copylock errors when using ProtoRetireActualLRPRequest directly type RetireActualLRPRequest struct { - ActualLrpKey *ActualLRPKey + ActualLRPKey *ActualLRPKey } func (this *RetireActualLRPRequest) Equal(that interface{}) bool { @@ -868,25 +868,25 @@ func (this *RetireActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } return true } -func (m *RetireActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *RetireActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *RetireActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *RetireActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } func (x *RetireActualLRPRequest) ToProto() *ProtoRetireActualLRPRequest { proto := &ProtoRetireActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), } return proto } @@ -903,7 +903,7 @@ func RetireActualLRPRequestProtoMap(values []*RetireActualLRPRequest) []*ProtoRe type RemoveActualLRPRequest struct { ProcessGuid string Index int32 - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPInstanceKey *ActualLRPInstanceKey } func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { @@ -934,7 +934,7 @@ func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } return true @@ -961,22 +961,22 @@ func (m *RemoveActualLRPRequest) SetIndex(value int32) { m.Index = value } } -func (m *RemoveActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *RemoveActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *RemoveActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *RemoveActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (x *RemoveActualLRPRequest) ToProto() *ProtoRemoveActualLRPRequest { proto := &ProtoRemoveActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), } return proto } @@ -992,7 +992,7 @@ func RemoveActualLRPRequestProtoMap(values []*RemoveActualLRPRequest) []*ProtoRe // Prevent copylock errors when using ProtoActualLRPsResponse directly type ActualLRPsResponse struct { Error *Error - ActualLrps []*ActualLRP + ActualLRPs []*ActualLRP } func (this *ActualLRPsResponse) Equal(that interface{}) bool { @@ -1020,11 +1020,11 @@ func (this *ActualLRPsResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.ActualLrps) != len(that1.ActualLrps) { + if len(this.ActualLRPs) != len(that1.ActualLRPs) { return false } - for i := range this.ActualLrps { - if !this.ActualLrps[i].Equal(that1.ActualLrps[i]) { + for i := range this.ActualLRPs { + if !this.ActualLRPs[i].Equal(that1.ActualLRPs[i]) { return false } } @@ -1041,21 +1041,21 @@ func (m *ActualLRPsResponse) SetError(value *Error) { m.Error = value } } -func (m *ActualLRPsResponse) GetActualLrps() []*ActualLRP { +func (m *ActualLRPsResponse) GetActualLRPs() []*ActualLRP { if m != nil { - return m.ActualLrps + return m.ActualLRPs } return nil } -func (m *ActualLRPsResponse) SetActualLrps(value []*ActualLRP) { +func (m *ActualLRPsResponse) SetActualLRPs(value []*ActualLRP) { if m != nil { - m.ActualLrps = value + m.ActualLRPs = value } } func (x *ActualLRPsResponse) ToProto() *ProtoActualLRPsResponse { proto := &ProtoActualLRPsResponse{ Error: x.Error.ToProto(), - ActualLrps: ActualLRPProtoMap(x.ActualLrps), + ActualLrps: ActualLRPProtoMap(x.ActualLRPs), } return proto } diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 52e4038a..9587a7c1 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -264,7 +264,7 @@ func (x *CellPresence) ToProto() *ProtoCellPresence { CellId: x.CellId, RepAddress: x.RepAddress, Zone: x.Zone, - Capacity: x.Capacity.ToProto(), + Capacity: x.CellCapacity.ToProto(), RootfsProviders: ProviderProtoMap(x.RootfsProviders), PlacementTags: x.PlacementTags, OptionalPlacementTags: x.OptionalPlacementTags, diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 60b971a7..a8c91769 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -166,8 +166,8 @@ func (m *Check) SetHttpCheck(value *HTTPCheck) { } func (x *Check) ToProto() *ProtoCheck { proto := &ProtoCheck{ - TcpCheck: x.TcpCheck.ToProto(), - HttpCheck: x.HttpCheck.ToProto(), + TcpCheck: x.TCPCheck.ToProto(), + HttpCheck: x.HTTPCheck.ToProto(), } return proto } diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index f42b9a46..14c51b3f 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -12,10 +12,10 @@ import ( // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly type DesiredLRPSchedulingInfo struct { - DesiredLrpKey *DesiredLRPKey + DesiredLRPKey *DesiredLRPKey Annotation string Instances int32 - DesiredLrpResource *DesiredLRPResource + DesiredLRPResource *DesiredLRPResource Routes *Routes ModificationTag *ModificationTag VolumePlacement *VolumePlacement @@ -44,7 +44,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { + if !this.DesiredLRPKey.Equal(that1.DesiredLRPKey) { return false } if this.Annotation != that1.Annotation { @@ -53,7 +53,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if this.Instances != that1.Instances { return false } - if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { + if !this.DesiredLRPResource.Equal(that1.DesiredLRPResource) { return false } if !this.Routes.Equal(that1.Routes) { @@ -75,15 +75,15 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPSchedulingInfo) GetDesiredLrpKey() *DesiredLRPKey { +func (m *DesiredLRPSchedulingInfo) GetDesiredLRPKey() *DesiredLRPKey { if m != nil { - return m.DesiredLrpKey + return m.DesiredLRPKey } return nil } -func (m *DesiredLRPSchedulingInfo) SetDesiredLrpKey(value *DesiredLRPKey) { +func (m *DesiredLRPSchedulingInfo) SetDesiredLRPKey(value *DesiredLRPKey) { if m != nil { - m.DesiredLrpKey = value + m.DesiredLRPKey = value } } func (m *DesiredLRPSchedulingInfo) GetAnnotation() string { @@ -108,15 +108,15 @@ func (m *DesiredLRPSchedulingInfo) SetInstances(value int32) { m.Instances = value } } -func (m *DesiredLRPSchedulingInfo) GetDesiredLrpResource() *DesiredLRPResource { +func (m *DesiredLRPSchedulingInfo) GetDesiredLRPResource() *DesiredLRPResource { if m != nil { - return m.DesiredLrpResource + return m.DesiredLRPResource } return nil } -func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value *DesiredLRPResource) { +func (m *DesiredLRPSchedulingInfo) SetDesiredLRPResource(value *DesiredLRPResource) { if m != nil { - m.DesiredLrpResource = value + m.DesiredLRPResource = value } } func (m *DesiredLRPSchedulingInfo) GetRoutes() *Routes { @@ -165,10 +165,10 @@ func (m *DesiredLRPSchedulingInfo) SetProtoPlacementTags(value []string) { } func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { proto := &ProtoDesiredLRPSchedulingInfo{ - DesiredLrpKey: x.DesiredLrpKey.ToProto(), + DesiredLrpKey: x.DesiredLRPKey.ToProto(), Annotation: x.Annotation, Instances: x.Instances, - DesiredLrpResource: x.DesiredLrpResource.ToProto(), + DesiredLrpResource: x.DesiredLRPResource.ToProto(), Routes: x.Routes.ToProto(), ModificationTag: x.ModificationTag.ToProto(), VolumePlacement: x.VolumePlacement.ToProto(), @@ -187,7 +187,7 @@ func DesiredLRPSchedulingInfoProtoMap(values []*DesiredLRPSchedulingInfo) []*Pro // Prevent copylock errors when using ProtoDesiredLRPRunInfo directly type DesiredLRPRunInfo struct { - DesiredLrpKey *DesiredLRPKey + DesiredLRPKey *DesiredLRPKey EnvironmentVariables []*EnvironmentVariable Setup *Action Action *Action @@ -238,7 +238,7 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { + if !this.DesiredLRPKey.Equal(that1.DesiredLRPKey) { return false } if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { @@ -361,15 +361,15 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPRunInfo) GetDesiredLrpKey() *DesiredLRPKey { +func (m *DesiredLRPRunInfo) GetDesiredLRPKey() *DesiredLRPKey { if m != nil { - return m.DesiredLrpKey + return m.DesiredLRPKey } return nil } -func (m *DesiredLRPRunInfo) SetDesiredLrpKey(value *DesiredLRPKey) { +func (m *DesiredLRPRunInfo) SetDesiredLRPKey(value *DesiredLRPKey) { if m != nil { - m.DesiredLrpKey = value + m.DesiredLRPKey = value } } func (m *DesiredLRPRunInfo) GetEnvironmentVariables() []*EnvironmentVariable { @@ -666,11 +666,11 @@ func (m *DesiredLRPRunInfo) SetLogRateLimit(value *LogRateLimit) { } func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { proto := &ProtoDesiredLRPRunInfo{ - DesiredLrpKey: x.DesiredLrpKey.ToProto(), + DesiredLrpKey: x.DesiredLRPKey.ToProto(), EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), - Setup: x.Setup.ToProto(), + Setup: x.Action.ToProto(), Action: x.Action.ToProto(), - Monitor: x.Monitor.ToProto(), + Monitor: x.Action.ToProto(), DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, Privileged: x.Privileged, CpuWeight: x.CpuWeight, @@ -1716,11 +1716,11 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { RootFs: x.RootFs, Instances: x.Instances, EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), - Setup: x.Setup.ToProto(), + Setup: x.Action.ToProto(), Action: x.Action.ToProto(), StartTimeoutMs: x.StartTimeoutMs, DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, - Monitor: x.Monitor.ToProto(), + Monitor: x.Action.ToProto(), DiskMb: x.DiskMb, MemoryMb: x.MemoryMb, CpuWeight: x.CpuWeight, diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index f6724e2b..d72e7379 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -67,7 +67,7 @@ func DesiredLRPLifecycleResponseProtoMap(values []*DesiredLRPLifecycleResponse) // Prevent copylock errors when using ProtoDesiredLRPsResponse directly type DesiredLRPsResponse struct { Error *Error - DesiredLrps []*DesiredLRP + DesiredLRPs []*DesiredLRP } func (this *DesiredLRPsResponse) Equal(that interface{}) bool { @@ -95,11 +95,11 @@ func (this *DesiredLRPsResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.DesiredLrps) != len(that1.DesiredLrps) { + if len(this.DesiredLRPs) != len(that1.DesiredLRPs) { return false } - for i := range this.DesiredLrps { - if !this.DesiredLrps[i].Equal(that1.DesiredLrps[i]) { + for i := range this.DesiredLRPs { + if !this.DesiredLRPs[i].Equal(that1.DesiredLRPs[i]) { return false } } @@ -116,21 +116,21 @@ func (m *DesiredLRPsResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPsResponse) GetDesiredLrps() []*DesiredLRP { +func (m *DesiredLRPsResponse) GetDesiredLRPs() []*DesiredLRP { if m != nil { - return m.DesiredLrps + return m.DesiredLRPs } return nil } -func (m *DesiredLRPsResponse) SetDesiredLrps(value []*DesiredLRP) { +func (m *DesiredLRPsResponse) SetDesiredLRPs(value []*DesiredLRP) { if m != nil { - m.DesiredLrps = value + m.DesiredLRPs = value } } func (x *DesiredLRPsResponse) ToProto() *ProtoDesiredLRPsResponse { proto := &ProtoDesiredLRPsResponse{ Error: x.Error.ToProto(), - DesiredLrps: DesiredLRPProtoMap(x.DesiredLrps), + DesiredLrps: DesiredLRPProtoMap(x.DesiredLRPs), } return proto } @@ -225,7 +225,7 @@ func DesiredLRPsRequestProtoMap(values []*DesiredLRPsRequest) []*ProtoDesiredLRP // Prevent copylock errors when using ProtoDesiredLRPResponse directly type DesiredLRPResponse struct { Error *Error - DesiredLrp *DesiredLRP + DesiredLRP *DesiredLRP } func (this *DesiredLRPResponse) Equal(that interface{}) bool { @@ -253,7 +253,7 @@ func (this *DesiredLRPResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLRP.Equal(that1.DesiredLRP) { return false } return true @@ -269,21 +269,21 @@ func (m *DesiredLRPResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPResponse) GetDesiredLrp() *DesiredLRP { +func (m *DesiredLRPResponse) GetDesiredLRP() *DesiredLRP { if m != nil { - return m.DesiredLrp + return m.DesiredLRP } return nil } -func (m *DesiredLRPResponse) SetDesiredLrp(value *DesiredLRP) { +func (m *DesiredLRPResponse) SetDesiredLRP(value *DesiredLRP) { if m != nil { - m.DesiredLrp = value + m.DesiredLRP = value } } func (x *DesiredLRPResponse) ToProto() *ProtoDesiredLRPResponse { proto := &ProtoDesiredLRPResponse{ Error: x.Error.ToProto(), - DesiredLrp: x.DesiredLrp.ToProto(), + DesiredLrp: x.DesiredLRP.ToProto(), } return proto } @@ -299,7 +299,7 @@ func DesiredLRPResponseProtoMap(values []*DesiredLRPResponse) []*ProtoDesiredLRP // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfosResponse directly type DesiredLRPSchedulingInfosResponse struct { Error *Error - DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo + DesiredLRPSchedulingInfos []*DesiredLRPSchedulingInfo } func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { @@ -327,11 +327,11 @@ func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.DesiredLrpSchedulingInfos) != len(that1.DesiredLrpSchedulingInfos) { + if len(this.DesiredLRPSchedulingInfos) != len(that1.DesiredLRPSchedulingInfos) { return false } - for i := range this.DesiredLrpSchedulingInfos { - if !this.DesiredLrpSchedulingInfos[i].Equal(that1.DesiredLrpSchedulingInfos[i]) { + for i := range this.DesiredLRPSchedulingInfos { + if !this.DesiredLRPSchedulingInfos[i].Equal(that1.DesiredLRPSchedulingInfos[i]) { return false } } @@ -348,21 +348,21 @@ func (m *DesiredLRPSchedulingInfosResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPSchedulingInfosResponse) GetDesiredLrpSchedulingInfos() []*DesiredLRPSchedulingInfo { +func (m *DesiredLRPSchedulingInfosResponse) GetDesiredLRPSchedulingInfos() []*DesiredLRPSchedulingInfo { if m != nil { - return m.DesiredLrpSchedulingInfos + return m.DesiredLRPSchedulingInfos } return nil } -func (m *DesiredLRPSchedulingInfosResponse) SetDesiredLrpSchedulingInfos(value []*DesiredLRPSchedulingInfo) { +func (m *DesiredLRPSchedulingInfosResponse) SetDesiredLRPSchedulingInfos(value []*DesiredLRPSchedulingInfo) { if m != nil { - m.DesiredLrpSchedulingInfos = value + m.DesiredLRPSchedulingInfos = value } } func (x *DesiredLRPSchedulingInfosResponse) ToProto() *ProtoDesiredLRPSchedulingInfosResponse { proto := &ProtoDesiredLRPSchedulingInfosResponse{ Error: x.Error.ToProto(), - DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoProtoMap(x.DesiredLrpSchedulingInfos), + DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoProtoMap(x.DesiredLRPSchedulingInfos), } return proto } @@ -378,7 +378,7 @@ func DesiredLRPSchedulingInfosResponseProtoMap(values []*DesiredLRPSchedulingInf // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfoByProcessGuidResponse directly type DesiredLRPSchedulingInfoByProcessGuidResponse struct { Error *Error - DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo + DesiredLRPSchedulingInfo *DesiredLRPSchedulingInfo } func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{}) bool { @@ -406,7 +406,7 @@ func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{ if !this.Error.Equal(that1.Error) { return false } - if !this.DesiredLrpSchedulingInfo.Equal(that1.DesiredLrpSchedulingInfo) { + if !this.DesiredLRPSchedulingInfo.Equal(that1.DesiredLRPSchedulingInfo) { return false } return true @@ -422,21 +422,21 @@ func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLrpSchedulingInfo() *DesiredLRPSchedulingInfo { +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLRPSchedulingInfo() *DesiredLRPSchedulingInfo { if m != nil { - return m.DesiredLrpSchedulingInfo + return m.DesiredLRPSchedulingInfo } return nil } -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetDesiredLrpSchedulingInfo(value *DesiredLRPSchedulingInfo) { +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetDesiredLRPSchedulingInfo(value *DesiredLRPSchedulingInfo) { if m != nil { - m.DesiredLrpSchedulingInfo = value + m.DesiredLRPSchedulingInfo = value } } func (x *DesiredLRPSchedulingInfoByProcessGuidResponse) ToProto() *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { proto := &ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{ Error: x.Error.ToProto(), - DesiredLrpSchedulingInfo: x.DesiredLrpSchedulingInfo.ToProto(), + DesiredLrpSchedulingInfo: x.DesiredLRPSchedulingInfo.ToProto(), } return proto } @@ -509,7 +509,7 @@ func DesiredLRPByProcessGuidRequestProtoMap(values []*DesiredLRPByProcessGuidReq // Prevent copylock errors when using ProtoDesireLRPRequest directly type DesireLRPRequest struct { - DesiredLrp *DesiredLRP + DesiredLRP *DesiredLRP } func (this *DesireLRPRequest) Equal(that interface{}) bool { @@ -534,25 +534,25 @@ func (this *DesireLRPRequest) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLRP.Equal(that1.DesiredLRP) { return false } return true } -func (m *DesireLRPRequest) GetDesiredLrp() *DesiredLRP { +func (m *DesireLRPRequest) GetDesiredLRP() *DesiredLRP { if m != nil { - return m.DesiredLrp + return m.DesiredLRP } return nil } -func (m *DesireLRPRequest) SetDesiredLrp(value *DesiredLRP) { +func (m *DesireLRPRequest) SetDesiredLRP(value *DesiredLRP) { if m != nil { - m.DesiredLrp = value + m.DesiredLRP = value } } func (x *DesireLRPRequest) ToProto() *ProtoDesireLRPRequest { proto := &ProtoDesireLRPRequest{ - DesiredLrp: x.DesiredLrp.ToProto(), + DesiredLrp: x.DesiredLRP.ToProto(), } return proto } @@ -626,7 +626,7 @@ func (m *UpdateDesiredLRPRequest) SetUpdate(value *DesiredLRPUpdate) { func (x *UpdateDesiredLRPRequest) ToProto() *ProtoUpdateDesiredLRPRequest { proto := &ProtoUpdateDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, - Update: x.Update.ToProto(), + Update: x.DesiredLRPUpdate.ToProto(), } return proto } diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 03172d34..e0c3ed0e 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -82,8 +82,8 @@ func EvacuationResponseProtoMap(values []*EvacuationResponse) []*ProtoEvacuation // Prevent copylock errors when using ProtoEvacuateClaimedActualLRPRequest directly type EvacuateClaimedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey } func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { @@ -108,40 +108,40 @@ func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } return true } -func (m *EvacuateClaimedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *EvacuateClaimedActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *EvacuateClaimedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *EvacuateClaimedActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *EvacuateClaimedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateClaimedActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *EvacuateClaimedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateClaimedActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (x *EvacuateClaimedActualLRPRequest) ToProto() *ProtoEvacuateClaimedActualLRPRequest { proto := &ProtoEvacuateClaimedActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), } return proto } @@ -156,10 +156,10 @@ func EvacuateClaimedActualLRPRequestProtoMap(values []*EvacuateClaimedActualLRPR // Prevent copylock errors when using ProtoEvacuateRunningActualLRPRequest directly type EvacuateRunningActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ActualLrpNetInfo *ActualLRPNetInfo - ActualLrpInternalRoutes []*ActualLRPInternalRoute + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLRPNetInfo *ActualLRPNetInfo + ActualLRPInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string ProtoRoutable bool AvailabilityZone string @@ -187,20 +187,20 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { return false } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + if len(this.ActualLRPInternalRoutes) != len(that1.ActualLRPInternalRoutes) { return false } - for i := range this.ActualLrpInternalRoutes { - if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { + for i := range this.ActualLRPInternalRoutes { + if !this.ActualLRPInternalRoutes[i].Equal(that1.ActualLRPInternalRoutes[i]) { return false } } @@ -220,48 +220,48 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *EvacuateRunningActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *EvacuateRunningActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *EvacuateRunningActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *EvacuateRunningActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateRunningActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateRunningActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } -func (m *EvacuateRunningActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { +func (m *EvacuateRunningActualLRPRequest) GetActualLRPNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLrpNetInfo + return m.ActualLRPNetInfo } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLrpNetInfo(value *ActualLRPNetInfo) { +func (m *EvacuateRunningActualLRPRequest) SetActualLRPNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLrpNetInfo = value + m.ActualLRPNetInfo = value } } -func (m *EvacuateRunningActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { +func (m *EvacuateRunningActualLRPRequest) GetActualLRPInternalRoutes() []*ActualLRPInternalRoute { if m != nil { - return m.ActualLrpInternalRoutes + return m.ActualLRPInternalRoutes } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { +func (m *EvacuateRunningActualLRPRequest) SetActualLRPInternalRoutes(value []*ActualLRPInternalRoute) { if m != nil { - m.ActualLrpInternalRoutes = value + m.ActualLRPInternalRoutes = value } } func (m *EvacuateRunningActualLRPRequest) GetMetricTags() map[string]string { @@ -299,10 +299,10 @@ func (m *EvacuateRunningActualLRPRequest) SetAvailabilityZone(value string) { } func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualLRPRequest { proto := &ProtoEvacuateRunningActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), - ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), MetricTags: x.MetricTags, ProtoRoutable: &x.ProtoRoutable, AvailabilityZone: x.AvailabilityZone, @@ -320,8 +320,8 @@ func EvacuateRunningActualLRPRequestProtoMap(values []*EvacuateRunningActualLRPR // Prevent copylock errors when using ProtoEvacuateStoppedActualLRPRequest directly type EvacuateStoppedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey } func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { @@ -346,40 +346,40 @@ func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } return true } -func (m *EvacuateStoppedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *EvacuateStoppedActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *EvacuateStoppedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *EvacuateStoppedActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *EvacuateStoppedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateStoppedActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *EvacuateStoppedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateStoppedActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (x *EvacuateStoppedActualLRPRequest) ToProto() *ProtoEvacuateStoppedActualLRPRequest { proto := &ProtoEvacuateStoppedActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), } return proto } @@ -394,8 +394,8 @@ func EvacuateStoppedActualLRPRequestProtoMap(values []*EvacuateStoppedActualLRPR // Prevent copylock errors when using ProtoEvacuateCrashedActualLRPRequest directly type EvacuateCrashedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey ErrorMessage string } @@ -421,10 +421,10 @@ func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -432,26 +432,26 @@ func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *EvacuateCrashedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *EvacuateCrashedActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *EvacuateCrashedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *EvacuateCrashedActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *EvacuateCrashedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateCrashedActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *EvacuateCrashedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateCrashedActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (m *EvacuateCrashedActualLRPRequest) GetErrorMessage() string { @@ -467,8 +467,8 @@ func (m *EvacuateCrashedActualLRPRequest) SetErrorMessage(value string) { } func (x *EvacuateCrashedActualLRPRequest) ToProto() *ProtoEvacuateCrashedActualLRPRequest { proto := &ProtoEvacuateCrashedActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), ErrorMessage: x.ErrorMessage, } return proto @@ -484,8 +484,8 @@ func EvacuateCrashedActualLRPRequestProtoMap(values []*EvacuateCrashedActualLRPR // Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPRequest directly type RemoveEvacuatingActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey } func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { @@ -510,40 +510,40 @@ func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } return true } -func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpKey() *ActualLRPKey { +func (m *RemoveEvacuatingActualLRPRequest) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *RemoveEvacuatingActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { +func (m *RemoveEvacuatingActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *RemoveEvacuatingActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *RemoveEvacuatingActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *RemoveEvacuatingActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (x *RemoveEvacuatingActualLRPRequest) ToProto() *ProtoRemoveEvacuatingActualLRPRequest { proto := &ProtoRemoveEvacuatingActualLRPRequest{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), } return proto } diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 35ac764c..e2346806 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -8,7 +8,7 @@ package models // Prevent copylock errors when using ProtoActualLRPCreatedEvent directly type ActualLRPCreatedEvent struct { - ActualLrpGroup *ActualLRPGroup + ActualLRPGroup *ActualLRPGroup } func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { @@ -33,25 +33,25 @@ func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + if !this.ActualLRPGroup.Equal(that1.ActualLRPGroup) { return false } return true } -func (m *ActualLRPCreatedEvent) GetActualLrpGroup() *ActualLRPGroup { +func (m *ActualLRPCreatedEvent) GetActualLRPGroup() *ActualLRPGroup { if m != nil { - return m.ActualLrpGroup + return m.ActualLRPGroup } return nil } -func (m *ActualLRPCreatedEvent) SetActualLrpGroup(value *ActualLRPGroup) { +func (m *ActualLRPCreatedEvent) SetActualLRPGroup(value *ActualLRPGroup) { if m != nil { - m.ActualLrpGroup = value + m.ActualLRPGroup = value } } func (x *ActualLRPCreatedEvent) ToProto() *ProtoActualLRPCreatedEvent { proto := &ProtoActualLRPCreatedEvent{ - ActualLrpGroup: x.ActualLrpGroup.ToProto(), + ActualLrpGroup: x.ActualLRPGroup.ToProto(), } return proto } @@ -124,8 +124,8 @@ func (m *ActualLRPChangedEvent) SetAfter(value *ActualLRPGroup) { } func (x *ActualLRPChangedEvent) ToProto() *ProtoActualLRPChangedEvent { proto := &ProtoActualLRPChangedEvent{ - Before: x.Before.ToProto(), - After: x.After.ToProto(), + Before: x.ActualLRPGroup.ToProto(), + After: x.ActualLRPGroup.ToProto(), } return proto } @@ -140,7 +140,7 @@ func ActualLRPChangedEventProtoMap(values []*ActualLRPChangedEvent) []*ProtoActu // Prevent copylock errors when using ProtoActualLRPRemovedEvent directly type ActualLRPRemovedEvent struct { - ActualLrpGroup *ActualLRPGroup + ActualLRPGroup *ActualLRPGroup } func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { @@ -165,25 +165,25 @@ func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + if !this.ActualLRPGroup.Equal(that1.ActualLRPGroup) { return false } return true } -func (m *ActualLRPRemovedEvent) GetActualLrpGroup() *ActualLRPGroup { +func (m *ActualLRPRemovedEvent) GetActualLRPGroup() *ActualLRPGroup { if m != nil { - return m.ActualLrpGroup + return m.ActualLRPGroup } return nil } -func (m *ActualLRPRemovedEvent) SetActualLrpGroup(value *ActualLRPGroup) { +func (m *ActualLRPRemovedEvent) SetActualLRPGroup(value *ActualLRPGroup) { if m != nil { - m.ActualLrpGroup = value + m.ActualLRPGroup = value } } func (x *ActualLRPRemovedEvent) ToProto() *ProtoActualLRPRemovedEvent { proto := &ProtoActualLRPRemovedEvent{ - ActualLrpGroup: x.ActualLrpGroup.ToProto(), + ActualLrpGroup: x.ActualLRPGroup.ToProto(), } return proto } @@ -198,7 +198,7 @@ func ActualLRPRemovedEventProtoMap(values []*ActualLRPRemovedEvent) []*ProtoActu // Prevent copylock errors when using ProtoActualLRPInstanceCreatedEvent directly type ActualLRPInstanceCreatedEvent struct { - ActualLrp *ActualLRP + ActualLRP *ActualLRP TraceId string } @@ -224,7 +224,7 @@ func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrp.Equal(that1.ActualLrp) { + if !this.ActualLRP.Equal(that1.ActualLRP) { return false } if this.TraceId != that1.TraceId { @@ -232,15 +232,15 @@ func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInstanceCreatedEvent) GetActualLrp() *ActualLRP { +func (m *ActualLRPInstanceCreatedEvent) GetActualLRP() *ActualLRP { if m != nil { - return m.ActualLrp + return m.ActualLRP } return nil } -func (m *ActualLRPInstanceCreatedEvent) SetActualLrp(value *ActualLRP) { +func (m *ActualLRPInstanceCreatedEvent) SetActualLRP(value *ActualLRP) { if m != nil { - m.ActualLrp = value + m.ActualLRP = value } } func (m *ActualLRPInstanceCreatedEvent) GetTraceId() string { @@ -256,7 +256,7 @@ func (m *ActualLRPInstanceCreatedEvent) SetTraceId(value string) { } func (x *ActualLRPInstanceCreatedEvent) ToProto() *ProtoActualLRPInstanceCreatedEvent { proto := &ProtoActualLRPInstanceCreatedEvent{ - ActualLrp: x.ActualLrp.ToProto(), + ActualLrp: x.ActualLRP.ToProto(), TraceId: x.TraceId, } return proto @@ -272,7 +272,7 @@ func ActualLRPInstanceCreatedEventProtoMap(values []*ActualLRPInstanceCreatedEve // Prevent copylock errors when using ProtoActualLRPInfo directly type ActualLRPInfo struct { - ActualLrpNetInfo *ActualLRPNetInfo + ActualLRPNetInfo *ActualLRPNetInfo CrashCount int32 CrashReason string State string @@ -306,7 +306,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -338,15 +338,15 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInfo) GetActualLrpNetInfo() *ActualLRPNetInfo { +func (m *ActualLRPInfo) GetActualLRPNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLrpNetInfo + return m.ActualLRPNetInfo } return nil } -func (m *ActualLRPInfo) SetActualLrpNetInfo(value *ActualLRPNetInfo) { +func (m *ActualLRPInfo) SetActualLRPNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLrpNetInfo = value + m.ActualLRPNetInfo = value } } func (m *ActualLRPInfo) GetCrashCount() int32 { @@ -450,7 +450,7 @@ func (m *ActualLRPInfo) SetAvailabilityZone(value string) { } func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { proto := &ProtoActualLRPInfo{ - ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, State: x.State, @@ -474,8 +474,8 @@ func ActualLRPInfoProtoMap(values []*ActualLRPInfo) []*ProtoActualLRPInfo { // Prevent copylock errors when using ProtoActualLRPInstanceChangedEvent directly type ActualLRPInstanceChangedEvent struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey Before *ActualLRPInfo After *ActualLRPInfo TraceId string @@ -503,10 +503,10 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } if !this.Before.Equal(that1.Before) { @@ -520,26 +520,26 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInstanceChangedEvent) GetActualLrpKey() *ActualLRPKey { +func (m *ActualLRPInstanceChangedEvent) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *ActualLRPInstanceChangedEvent) SetActualLrpKey(value *ActualLRPKey) { +func (m *ActualLRPInstanceChangedEvent) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *ActualLRPInstanceChangedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *ActualLRPInstanceChangedEvent) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *ActualLRPInstanceChangedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRPInstanceChangedEvent) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (m *ActualLRPInstanceChangedEvent) GetBefore() *ActualLRPInfo { @@ -577,10 +577,10 @@ func (m *ActualLRPInstanceChangedEvent) SetTraceId(value string) { } func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChangedEvent { proto := &ProtoActualLRPInstanceChangedEvent{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), - Before: x.Before.ToProto(), - After: x.After.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + Before: x.ActualLRPInfo.ToProto(), + After: x.ActualLRPInfo.ToProto(), TraceId: x.TraceId, } return proto @@ -596,7 +596,7 @@ func ActualLRPInstanceChangedEventProtoMap(values []*ActualLRPInstanceChangedEve // Prevent copylock errors when using ProtoActualLRPInstanceRemovedEvent directly type ActualLRPInstanceRemovedEvent struct { - ActualLrp *ActualLRP + ActualLRP *ActualLRP TraceId string } @@ -622,7 +622,7 @@ func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrp.Equal(that1.ActualLrp) { + if !this.ActualLRP.Equal(that1.ActualLRP) { return false } if this.TraceId != that1.TraceId { @@ -630,15 +630,15 @@ func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInstanceRemovedEvent) GetActualLrp() *ActualLRP { +func (m *ActualLRPInstanceRemovedEvent) GetActualLRP() *ActualLRP { if m != nil { - return m.ActualLrp + return m.ActualLRP } return nil } -func (m *ActualLRPInstanceRemovedEvent) SetActualLrp(value *ActualLRP) { +func (m *ActualLRPInstanceRemovedEvent) SetActualLRP(value *ActualLRP) { if m != nil { - m.ActualLrp = value + m.ActualLRP = value } } func (m *ActualLRPInstanceRemovedEvent) GetTraceId() string { @@ -654,7 +654,7 @@ func (m *ActualLRPInstanceRemovedEvent) SetTraceId(value string) { } func (x *ActualLRPInstanceRemovedEvent) ToProto() *ProtoActualLRPInstanceRemovedEvent { proto := &ProtoActualLRPInstanceRemovedEvent{ - ActualLrp: x.ActualLrp.ToProto(), + ActualLrp: x.ActualLRP.ToProto(), TraceId: x.TraceId, } return proto @@ -670,7 +670,7 @@ func ActualLRPInstanceRemovedEventProtoMap(values []*ActualLRPInstanceRemovedEve // Prevent copylock errors when using ProtoDesiredLRPCreatedEvent directly type DesiredLRPCreatedEvent struct { - DesiredLrp *DesiredLRP + DesiredLRP *DesiredLRP TraceId string } @@ -696,7 +696,7 @@ func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLRP.Equal(that1.DesiredLRP) { return false } if this.TraceId != that1.TraceId { @@ -704,15 +704,15 @@ func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPCreatedEvent) GetDesiredLrp() *DesiredLRP { +func (m *DesiredLRPCreatedEvent) GetDesiredLRP() *DesiredLRP { if m != nil { - return m.DesiredLrp + return m.DesiredLRP } return nil } -func (m *DesiredLRPCreatedEvent) SetDesiredLrp(value *DesiredLRP) { +func (m *DesiredLRPCreatedEvent) SetDesiredLRP(value *DesiredLRP) { if m != nil { - m.DesiredLrp = value + m.DesiredLRP = value } } func (m *DesiredLRPCreatedEvent) GetTraceId() string { @@ -728,7 +728,7 @@ func (m *DesiredLRPCreatedEvent) SetTraceId(value string) { } func (x *DesiredLRPCreatedEvent) ToProto() *ProtoDesiredLRPCreatedEvent { proto := &ProtoDesiredLRPCreatedEvent{ - DesiredLrp: x.DesiredLrp.ToProto(), + DesiredLrp: x.DesiredLRP.ToProto(), TraceId: x.TraceId, } return proto @@ -817,8 +817,8 @@ func (m *DesiredLRPChangedEvent) SetTraceId(value string) { } func (x *DesiredLRPChangedEvent) ToProto() *ProtoDesiredLRPChangedEvent { proto := &ProtoDesiredLRPChangedEvent{ - Before: x.Before.ToProto(), - After: x.After.ToProto(), + Before: x.DesiredLRP.ToProto(), + After: x.DesiredLRP.ToProto(), TraceId: x.TraceId, } return proto @@ -834,7 +834,7 @@ func DesiredLRPChangedEventProtoMap(values []*DesiredLRPChangedEvent) []*ProtoDe // Prevent copylock errors when using ProtoDesiredLRPRemovedEvent directly type DesiredLRPRemovedEvent struct { - DesiredLrp *DesiredLRP + DesiredLRP *DesiredLRP TraceId string } @@ -860,7 +860,7 @@ func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLRP.Equal(that1.DesiredLRP) { return false } if this.TraceId != that1.TraceId { @@ -868,15 +868,15 @@ func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPRemovedEvent) GetDesiredLrp() *DesiredLRP { +func (m *DesiredLRPRemovedEvent) GetDesiredLRP() *DesiredLRP { if m != nil { - return m.DesiredLrp + return m.DesiredLRP } return nil } -func (m *DesiredLRPRemovedEvent) SetDesiredLrp(value *DesiredLRP) { +func (m *DesiredLRPRemovedEvent) SetDesiredLRP(value *DesiredLRP) { if m != nil { - m.DesiredLrp = value + m.DesiredLRP = value } } func (m *DesiredLRPRemovedEvent) GetTraceId() string { @@ -892,7 +892,7 @@ func (m *DesiredLRPRemovedEvent) SetTraceId(value string) { } func (x *DesiredLRPRemovedEvent) ToProto() *ProtoDesiredLRPRemovedEvent { proto := &ProtoDesiredLRPRemovedEvent{ - DesiredLrp: x.DesiredLrp.ToProto(), + DesiredLrp: x.DesiredLRP.ToProto(), TraceId: x.TraceId, } return proto @@ -908,8 +908,8 @@ func DesiredLRPRemovedEventProtoMap(values []*DesiredLRPRemovedEvent) []*ProtoDe // Prevent copylock errors when using ProtoActualLRPCrashedEvent directly type ActualLRPCrashedEvent struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLRPKey *ActualLRPKey + ActualLRPInstanceKey *ActualLRPInstanceKey CrashCount int32 CrashReason string Since int64 @@ -937,10 +937,10 @@ func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { return false } if this.CrashCount != that1.CrashCount { @@ -954,26 +954,26 @@ func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPCrashedEvent) GetActualLrpKey() *ActualLRPKey { +func (m *ActualLRPCrashedEvent) GetActualLRPKey() *ActualLRPKey { if m != nil { - return m.ActualLrpKey + return m.ActualLRPKey } return nil } -func (m *ActualLRPCrashedEvent) SetActualLrpKey(value *ActualLRPKey) { +func (m *ActualLRPCrashedEvent) SetActualLRPKey(value *ActualLRPKey) { if m != nil { - m.ActualLrpKey = value + m.ActualLRPKey = value } } -func (m *ActualLRPCrashedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { +func (m *ActualLRPCrashedEvent) GetActualLRPInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLrpInstanceKey + return m.ActualLRPInstanceKey } return nil } -func (m *ActualLRPCrashedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRPCrashedEvent) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLrpInstanceKey = value + m.ActualLRPInstanceKey = value } } func (m *ActualLRPCrashedEvent) GetCrashCount() int32 { @@ -1011,8 +1011,8 @@ func (m *ActualLRPCrashedEvent) SetSince(value int64) { } func (x *ActualLRPCrashedEvent) ToProto() *ProtoActualLRPCrashedEvent { proto := &ProtoActualLRPCrashedEvent{ - ActualLrpKey: x.ActualLrpKey.ToProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, Since: x.Since, @@ -1204,8 +1204,8 @@ func (m *TaskChangedEvent) SetAfter(value *Task) { } func (x *TaskChangedEvent) ToProto() *ProtoTaskChangedEvent { proto := &ProtoTaskChangedEvent{ - Before: x.Before.ToProto(), - After: x.After.ToProto(), + Before: x.Task.ToProto(), + After: x.Task.ToProto(), } return proto } diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index d41bf848..81e2e432 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -308,7 +308,7 @@ func (x *SecurityGroupRule) ToProto() *ProtoSecurityGroupRule { Destinations: x.Destinations, Ports: x.Ports, PortRange: x.PortRange.ToProto(), - IcmpInfo: x.IcmpInfo.ToProto(), + IcmpInfo: x.ICMPInfo.ToProto(), Log: x.Log, Annotations: x.Annotations, } diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 40d55874..6d963b41 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -173,7 +173,7 @@ func (x *VolumeMount) ToProto() *ProtoVolumeMount { Driver: x.Driver, ContainerDir: x.ContainerDir, Mode: x.Mode, - Shared: x.Shared.ToProto(), + Shared: x.SharedDevice.ToProto(), } return proto } diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 9ad8226a..b4d4480c 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -34,6 +34,14 @@ func getCopysafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) (string, return strings.CutPrefix(unsafeName, *prefix) } +func getFieldName(goName string) string { + result := goName + if strings.Contains(strings.ToLower(result), "lrp") { + result = strings.Replace(goName, "Lrp", "LRP", -1) + } + return result +} + func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *protogen.Message) { if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { g.P("// Prevent copylock errors when using ", msg.GoIdent.GoName, " directly") @@ -45,8 +53,9 @@ func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *proto log.Printf("Field Options: %+v\n\n", options) } + fieldName := getFieldName(field.GoName) fieldType := getActualType(g, field) - g.P(field.GoName, " ", fieldType) + g.P(fieldName, " ", fieldType) } g.P("}") @@ -101,26 +110,27 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa g.P(equalBuilder.String()) g.P() for _, field := range msg.Fields { + fieldName := getFieldName(field.GoName) if field.Desc.Cardinality() == protoreflect.Repeated { - g.P("if len(this.", field.GoName, ") != len(that1.", field.GoName, ") {") + g.P("if len(this.", fieldName, ") != len(that1.", fieldName, ") {") g.P("return false") g.P("}") - g.P("for i := range this.", field.GoName, " {") + g.P("for i := range this.", fieldName, " {") if field.Message != nil && !field.Desc.IsMap() { - g.P("if !this.", field.GoName, "[i].Equal(that1.", field.GoName, "[i]) {") + g.P("if !this.", fieldName, "[i].Equal(that1.", fieldName, "[i]) {") } else if field.Desc.IsMap() && field.Desc.MapValue().Kind() == protoreflect.BytesKind { bytesEqual := protogen.GoIdent{GoName: "Equal", GoImportPath: "bytes"} - g.P("if !", g.QualifiedGoIdent(bytesEqual), "(this.", field.GoName, "[i], that1.", field.GoName, "[i]) {") + g.P("if !", g.QualifiedGoIdent(bytesEqual), "(this.", fieldName, "[i], that1.", fieldName, "[i]) {") } else { - g.P("if this.", field.GoName, "[i] != that1.", field.GoName, "[i] {") + g.P("if this.", fieldName, "[i] != that1.", fieldName, "[i] {") } g.P("return false") g.P("}") } else if field.Message != nil { - g.P("if !this.", field.GoName, ".Equal(that1.", field.GoName, ") {") + g.P("if !this.", fieldName, ".Equal(that1.", fieldName, ") {") g.P("return false") } else { - g.P("if this.", field.GoName, " != that1.", field.GoName, " {") + g.P("if this.", fieldName, " != that1.", fieldName, " {") g.P("return false") } g.P("}") @@ -133,7 +143,7 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa func (bbsGenerateHelper) genAccessors(g *protogen.GeneratedFile, msg *protogen.Message) { if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { for _, field := range msg.Fields { - fieldName := field.GoName + fieldName := getFieldName(field.GoName) fieldType := getActualType(g, field) options := field.Desc.Options().(*descriptorpb.FieldOptions) @@ -316,26 +326,28 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog g.P("func(x *", copysafeName, ") ToProto() *", unsafeName, " {") g.P("proto := &", unsafeName, "{") for _, field := range msg.Fields { + protoFieldName := field.GoName if field.Message != nil { + fieldCopysafeName, _ := getCopysafeName(g, field.Message.GoIdent) + fieldCopysafeName = getFieldName(fieldCopysafeName) if field.Desc.Cardinality() == protoreflect.Repeated { - fieldCopysafeName, _ := getCopysafeName(g, field.Message.GoIdent) if field.Desc.IsList() { - g.P(field.GoName, ": ", fieldCopysafeName, "ProtoMap(x.", field.GoName, "),") + g.P(protoFieldName, ": ", fieldCopysafeName, "ProtoMap(x.", getFieldName(protoFieldName), "),") } else if field.Desc.IsMap() { - g.P(field.GoName, ": ", "x.", field.GoName, ",") + g.P(protoFieldName, ": ", "x.", protoFieldName, ",") } else { panic("Unrecognized Repeated field found") } } else { - g.P(field.GoName, ": x.", field.GoName, ".ToProto(),") + g.P(protoFieldName, ": x.", fieldCopysafeName, ".ToProto(),") } } else if field.Enum != nil { - g.P(field.GoName, ": ", field.GoIdent, "(x.", field.GoName, "),") + g.P(protoFieldName, ": ", field.GoIdent, "(x.", protoFieldName, "),") } else { if field.Oneof != nil { - g.P(field.GoName, ": &x.", field.GoName, ",") + g.P(protoFieldName, ": &x.", protoFieldName, ",") } else { - g.P(field.GoName, ": x.", field.GoName, ",") + g.P(protoFieldName, ": x.", protoFieldName, ",") } } } From fa6d4de8fd08f325bf1249f713f4db4fd2c5deb2 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 16:04:37 +0000 Subject: [PATCH 033/155] CellId exists on ActualLRPInstanceKey. Golang protobuf doesn't support embedded types, so we need to reference this directly. Potential NRE if ActualLRPInstanceKey is null, but this function doesn't look like it's being used. --- models/actual_lrp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/actual_lrp.go b/models/actual_lrp.go index f8f069ad..37249e15 100644 --- a/models/actual_lrp.go +++ b/models/actual_lrp.go @@ -125,7 +125,7 @@ func (actual ActualLRP) CellIsMissing(cellSet CellSet) bool { return false } - return !cellSet.HasCellID(actual.CellId) + return !cellSet.HasCellID(actual.GetActualLRPInstanceKey().CellId) } func (actual ActualLRP) ShouldRestartImmediately(calc RestartCalculator) bool { From 50289b2f49c553a2fb25ae9230780407f0891551 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 16:18:59 +0000 Subject: [PATCH 034/155] These Routables aren't messages, so don't need the 'Proto' prefix Regen protos --- models/evacuation.pb.go | 108 ++++++++++---------- models/evacuation.proto | 2 +- models/evacuation_bbs.pb.go | 14 +-- models/events.pb.go | 191 ++++++++++++++++++------------------ models/events.proto | 2 +- models/events_bbs.pb.go | 14 +-- 6 files changed, 165 insertions(+), 166 deletions(-) diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 3ae602bd..e1f35fce 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -140,7 +140,7 @@ type ProtoEvacuateRunningActualLRPRequest struct { ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,5,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` MetricTags map[string]string `protobuf:"bytes,6,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - ProtoRoutable *bool `protobuf:"varint,7,opt,name=ProtoRoutable,proto3,oneof" json:"ProtoRoutable,omitempty"` + Routable *bool `protobuf:"varint,7,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` AvailabilityZone string `protobuf:"bytes,8,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` } @@ -211,9 +211,9 @@ func (x *ProtoEvacuateRunningActualLRPRequest) GetMetricTags() map[string]string return nil } -func (x *ProtoEvacuateRunningActualLRPRequest) GetProtoRoutable() bool { - if x != nil && x.ProtoRoutable != nil { - return *x.ProtoRoutable +func (x *ProtoEvacuateRunningActualLRPRequest) GetRoutable() bool { + if x != nil && x.Routable != nil { + return *x.Routable } return false } @@ -470,7 +470,7 @@ var file_evacuation_proto_rawDesc = []byte{ 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0x80, 0x05, 0x0a, 0x24, 0x50, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0xf1, 0x04, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, @@ -499,20 +499,46 @@ var file_evacuation_proto_rawDesc = []byte{ 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x29, 0x0a, - 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, - 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, - 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0xc1, 0x01, - 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x53, - 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, + 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, + 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, + 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, + 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, + 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, + 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, + 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0xc1, + 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, + 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, + 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, + 0x65, 0x79, 0x22, 0xe7, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, + 0x75, 0x61, 0x74, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, + 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xc2, 0x01, 0x0a, + 0x25, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, + 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, @@ -523,41 +549,15 @@ var file_evacuation_proto_rawDesc = []byte{ 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, - 0x79, 0x22, 0xe7, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, - 0x61, 0x74, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, - 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xc2, 0x01, 0x0a, 0x25, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, - 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, - 0x22, 0x52, 0x0a, 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, - 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, - 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, - 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x79, 0x22, 0x52, 0x0a, 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, + 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, + 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/models/evacuation.proto b/models/evacuation.proto index c3195f20..8f3eb3ec 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -24,7 +24,7 @@ message ProtoEvacuateRunningActualLRPRequest { ProtoActualLRPNetInfo actual_lrp_net_info = 3; repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 5; map metric_tags = 6; - optional bool ProtoRoutable = 7; + optional bool Routable = 7; string availability_zone = 8 [json_name = "availability_zone"]; } diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index e0c3ed0e..381dacff 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -161,7 +161,7 @@ type EvacuateRunningActualLRPRequest struct { ActualLRPNetInfo *ActualLRPNetInfo ActualLRPInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string - ProtoRoutable bool + Routable bool AvailabilityZone string } @@ -212,7 +212,7 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { return false } } - if this.ProtoRoutable != that1.ProtoRoutable { + if this.Routable != that1.Routable { return false } if this.AvailabilityZone != that1.AvailabilityZone { @@ -275,15 +275,15 @@ func (m *EvacuateRunningActualLRPRequest) SetMetricTags(value map[string]string) m.MetricTags = value } } -func (m *EvacuateRunningActualLRPRequest) GetProtoRoutable() bool { +func (m *EvacuateRunningActualLRPRequest) GetRoutable() bool { if m != nil { - return m.ProtoRoutable + return m.Routable } return false } -func (m *EvacuateRunningActualLRPRequest) SetProtoRoutable(value bool) { +func (m *EvacuateRunningActualLRPRequest) SetRoutable(value bool) { if m != nil { - m.ProtoRoutable = value + m.Routable = value } } func (m *EvacuateRunningActualLRPRequest) GetAvailabilityZone() string { @@ -304,7 +304,7 @@ func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualL ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), MetricTags: x.MetricTags, - ProtoRoutable: &x.ProtoRoutable, + Routable: &x.Routable, AvailabilityZone: x.AvailabilityZone, } return proto diff --git a/models/events.pb.go b/models/events.pb.go index 3589f1bd..ad12214f 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -240,7 +240,7 @@ type ProtoActualLRPInfo struct { Since int64 `protobuf:"varint,8,opt,name=since,proto3" json:"since,omitempty"` ModificationTag *ProtoModificationTag `protobuf:"bytes,9,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` Presence ProtoActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ProtoActualLRP_Presence" json:"presence,omitempty"` - ProtoRoutable *bool `protobuf:"varint,11,opt,name=ProtoRoutable,proto3,oneof" json:"ProtoRoutable,omitempty"` + Routable *bool `protobuf:"varint,11,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` AvailabilityZone string `protobuf:"bytes,12,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` } @@ -332,9 +332,9 @@ func (x *ProtoActualLRPInfo) GetPresence() ProtoActualLRP_Presence { return ProtoActualLRP_ORDINARY } -func (x *ProtoActualLRPInfo) GetProtoRoutable() bool { - if x != nil && x.ProtoRoutable != nil { - return *x.ProtoRoutable +func (x *ProtoActualLRPInfo) GetRoutable() bool { + if x != nil && x.Routable != nil { + return *x.Routable } return false } @@ -966,7 +966,7 @@ var file_events_proto_rawDesc = []byte{ 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0xee, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0xdf, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4c, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, @@ -990,104 +990,103 @@ var file_events_proto_rawDesc = []byte{ 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, - 0x65, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x29, 0x0a, 0x0d, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x08, 0x48, 0x00, 0x52, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, - 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, - 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xc1, 0x02, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, - 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, - 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, - 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, - 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, - 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x30, 0x0a, 0x05, - 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, - 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x77, 0x0a, 0x22, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, - 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, - 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, - 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, - 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, - 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x61, 0x66, 0x74, - 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, - 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, + 0x65, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x52, + 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, + 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, + 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, + 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, + 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xc1, 0x02, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, + 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, + 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, + 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x62, 0x65, 0x66, + 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x30, 0x0a, + 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, + 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x77, 0x0a, 0x22, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, + 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x92, 0x02, 0x0a, 0x1a, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, 0x73, - 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, - 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, - 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x2f, - 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, - 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, - 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, - 0x6b, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, - 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, - 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, + 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, 0x01, 0x0a, 0x1b, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, + 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x65, 0x66, + 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x61, 0x66, + 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, + 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x12, 0x1a, + 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x92, 0x02, 0x0a, 0x1a, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, + 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, + 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, + 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, + 0x61, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, + 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, + 0x2f, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, + 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, + 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, + 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, + 0x22, 0x6b, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, + 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, + 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, + 0x66, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, - 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, - 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, + 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, + 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, + 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/events.proto b/models/events.proto index 2fdec811..a5ffd124 100644 --- a/models/events.proto +++ b/models/events.proto @@ -38,7 +38,7 @@ message ProtoActualLRPInfo { int64 since = 8 [json_name = "since"]; ProtoModificationTag modification_tag = 9 [json_name = "modification_tag"]; ProtoActualLRP.Presence presence = 10 [json_name = "presence"]; - optional bool ProtoRoutable = 11; + optional bool Routable = 11; string availability_zone = 12 [json_name = "availability_zone"]; } diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index e2346806..0f8647ad 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -280,7 +280,7 @@ type ActualLRPInfo struct { Since int64 ModificationTag *ModificationTag Presence ActualLRP_Presence - ProtoRoutable bool + Routable bool AvailabilityZone string } @@ -330,7 +330,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { if this.Presence != that1.Presence { return false } - if this.ProtoRoutable != that1.ProtoRoutable { + if this.Routable != that1.Routable { return false } if this.AvailabilityZone != that1.AvailabilityZone { @@ -426,15 +426,15 @@ func (m *ActualLRPInfo) SetPresence(value ActualLRP_Presence) { m.Presence = value } } -func (m *ActualLRPInfo) GetProtoRoutable() bool { +func (m *ActualLRPInfo) GetRoutable() bool { if m != nil { - return m.ProtoRoutable + return m.Routable } return false } -func (m *ActualLRPInfo) SetProtoRoutable(value bool) { +func (m *ActualLRPInfo) SetRoutable(value bool) { if m != nil { - m.ProtoRoutable = value + m.Routable = value } } func (m *ActualLRPInfo) GetAvailabilityZone() string { @@ -458,7 +458,7 @@ func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { Since: x.Since, ModificationTag: x.ModificationTag.ToProto(), Presence: ProtoActualLRPInfo_Presence(x.Presence), - ProtoRoutable: &x.ProtoRoutable, + Routable: &x.Routable, AvailabilityZone: x.AvailabilityZone, } return proto From 4213dc9d250cb5d5584f268880c376c6c58303a1 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 16:20:34 +0000 Subject: [PATCH 035/155] Remove duplicate methods generated by plugin --- models/evacuation.go | 11 ----------- models/events.go | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/models/evacuation.go b/models/evacuation.go index 82aa828e..2640e7f9 100644 --- a/models/evacuation.go +++ b/models/evacuation.go @@ -1,12 +1 @@ package models - -func (request *EvacuateRunningActualLRPRequest) SetRoutable(routable bool) { - request.OptionalRoutable = &EvacuateRunningActualLRPRequest_Routable{ - Routable: routable, - } -} - -func (request *EvacuateRunningActualLRPRequest) RoutableExists() bool { - _, ok := request.GetOptionalRoutable().(*EvacuateRunningActualLRPRequest_Routable) - return ok -} diff --git a/models/events.go b/models/events.go index d09fa1f0..b12a12eb 100644 --- a/models/events.go +++ b/models/events.go @@ -316,14 +316,3 @@ func (event *TaskRemovedEvent) EventType() string { func (event TaskRemovedEvent) Key() string { return event.Task.GetTaskGuid() } - -func (info *ActualLRPInfo) SetRoutable(routable bool) { - info.OptionalRoutable = &ActualLRPInfo_Routable{ - Routable: routable, - } -} - -func (info *ActualLRPInfo) RoutableExists() bool { - _, ok := info.GetOptionalRoutable().(*ActualLRPInfo_Routable) - return ok -} From 32532d958e5df3fb76afdca3935e9509e9b3b8fe Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 17:16:58 +0000 Subject: [PATCH 036/155] Add support for optional fields Regen protos --- models/actions_bbs.pb.go | 26 ++++++++++------ models/actual_lrp_bbs.pb.go | 13 +++++--- models/actual_lrp_requests_bbs.pb.go | 26 ++++++++++------ models/desired_lrp_bbs.pb.go | 46 +++++++++++++++++++--------- models/evacuation_bbs.pb.go | 13 +++++--- models/events_bbs.pb.go | 13 +++++--- protoc-gen-go-bbs/bbs.go | 33 +++++++++++++++++--- 7 files changed, 116 insertions(+), 54 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index ba28e433..df7dc613 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1207,8 +1207,8 @@ func CodependentActionProtoMap(values []*CodependentAction) []*ProtoCodependentA // Prevent copylock errors when using ProtoResourceLimits directly type ResourceLimits struct { - Nofile uint64 - Nproc uint64 + Nofile *uint64 + Nproc *uint64 } func (this *ResourceLimits) Equal(that interface{}) bool { @@ -1241,26 +1241,32 @@ func (this *ResourceLimits) Equal(that interface{}) bool { } return true } -func (m *ResourceLimits) GetNofile() uint64 { - if m != nil { +func (m *ResourceLimits) NofileExists() bool { + return m != nil && m.Nofile != nil +} +func (m *ResourceLimits) GetNofile() *uint64 { + if m != nil && m.Nofile != nil { return m.Nofile } - return 0 + return nil } -func (m *ResourceLimits) SetNofile(value uint64) { +func (m *ResourceLimits) SetNofile(value *uint64) { if m != nil { m.Nofile = value } } // DEPRECATED: DO NOT USE -func (m *ResourceLimits) GetNproc() uint64 { - if m != nil { +func (m *ResourceLimits) NprocExists() bool { + return m != nil && m.Nproc != nil +} +func (m *ResourceLimits) GetNproc() *uint64 { + if m != nil && m.Nproc != nil { return m.Nproc } - return 0 + return nil } -func (m *ResourceLimits) SetNproc(value uint64) { +func (m *ResourceLimits) SetNproc(value *uint64) { if m != nil { m.Nproc = value } diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index f6f6ce8c..ac226273 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -597,7 +597,7 @@ type ActualLRP struct { Presence ActualLRP_Presence ActualLRPInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string - Routable bool + Routable *bool AvailabilityZone string } @@ -809,13 +809,16 @@ func (m *ActualLRP) SetMetricTags(value map[string]string) { m.MetricTags = value } } -func (m *ActualLRP) GetRoutable() bool { - if m != nil { +func (m *ActualLRP) RoutableExists() bool { + return m != nil && m.Routable != nil +} +func (m *ActualLRP) GetRoutable() *bool { + if m != nil && m.Routable != nil { return m.Routable } - return false + return nil } -func (m *ActualLRP) SetRoutable(value bool) { +func (m *ActualLRP) SetRoutable(value *bool) { if m != nil { m.Routable = value } diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 3d34abb0..52ae7f29 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -520,7 +520,7 @@ type StartActualLRPRequest struct { ActualLRPNetInfo *ActualLRPNetInfo ActualLRPInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string - Routable bool + Routable *bool AvailabilityZone string } @@ -634,13 +634,16 @@ func (m *StartActualLRPRequest) SetMetricTags(value map[string]string) { m.MetricTags = value } } -func (m *StartActualLRPRequest) GetRoutable() bool { - if m != nil { +func (m *StartActualLRPRequest) RoutableExists() bool { + return m != nil && m.Routable != nil +} +func (m *StartActualLRPRequest) GetRoutable() *bool { + if m != nil && m.Routable != nil { return m.Routable } - return false + return nil } -func (m *StartActualLRPRequest) SetRoutable(value bool) { +func (m *StartActualLRPRequest) SetRoutable(value *bool) { if m != nil { m.Routable = value } @@ -1073,7 +1076,7 @@ type ActualLRPsRequest struct { Domain string CellId string ProcessGuid string - Index int32 + Index *int32 } func (this *ActualLRPsRequest) Equal(that interface{}) bool { @@ -1145,13 +1148,16 @@ func (m *ActualLRPsRequest) SetProcessGuid(value string) { m.ProcessGuid = value } } -func (m *ActualLRPsRequest) GetIndex() int32 { - if m != nil { +func (m *ActualLRPsRequest) IndexExists() bool { + return m != nil && m.Index != nil +} +func (m *ActualLRPsRequest) GetIndex() *int32 { + if m != nil && m.Index != nil { return m.Index } - return 0 + return nil } -func (m *ActualLRPsRequest) SetIndex(value int32) { +func (m *ActualLRPsRequest) SetIndex(value *int32) { if m != nil { m.Index = value } diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 14c51b3f..5c0a9056 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -576,8 +576,11 @@ func (m *DesiredLRPRunInfo) SetStartTimeoutMs(value int64) { m.StartTimeoutMs = value } } +func (m *DesiredLRPRunInfo) CertificatePropertiesExists() bool { + return m != nil && m.CertificateProperties != nil +} func (m *DesiredLRPRunInfo) GetCertificateProperties() *CertificateProperties { - if m != nil { + if m != nil && m.CertificateProperties != nil { return m.CertificateProperties } return nil @@ -770,9 +773,9 @@ func RoutesProtoMap(values []*Routes) []*ProtoRoutes { // Prevent copylock errors when using ProtoDesiredLRPUpdate directly type DesiredLRPUpdate struct { - Instances int32 + Instances *int32 Routes *Routes - Annotation string + Annotation *string MetricTags map[string]*ProtoMetricTagValue } @@ -817,19 +820,25 @@ func (this *DesiredLRPUpdate) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPUpdate) GetInstances() int32 { - if m != nil { +func (m *DesiredLRPUpdate) InstancesExists() bool { + return m != nil && m.Instances != nil +} +func (m *DesiredLRPUpdate) GetInstances() *int32 { + if m != nil && m.Instances != nil { return m.Instances } - return 0 + return nil } -func (m *DesiredLRPUpdate) SetInstances(value int32) { +func (m *DesiredLRPUpdate) SetInstances(value *int32) { if m != nil { m.Instances = value } } +func (m *DesiredLRPUpdate) RoutesExists() bool { + return m != nil && m.Routes != nil +} func (m *DesiredLRPUpdate) GetRoutes() *Routes { - if m != nil { + if m != nil && m.Routes != nil { return m.Routes } return nil @@ -839,13 +848,16 @@ func (m *DesiredLRPUpdate) SetRoutes(value *Routes) { m.Routes = value } } -func (m *DesiredLRPUpdate) GetAnnotation() string { - if m != nil { +func (m *DesiredLRPUpdate) AnnotationExists() bool { + return m != nil && m.Annotation != nil +} +func (m *DesiredLRPUpdate) GetAnnotation() *string { + if m != nil && m.Annotation != nil { return m.Annotation } - return "" + return nil } -func (m *DesiredLRPUpdate) SetAnnotation(value string) { +func (m *DesiredLRPUpdate) SetAnnotation(value *string) { if m != nil { m.Annotation = value } @@ -1463,8 +1475,11 @@ func (m *DesiredLRP) SetPorts(value []uint32) { m.Ports = value } } +func (m *DesiredLRP) RoutesExists() bool { + return m != nil && m.Routes != nil +} func (m *DesiredLRP) GetRoutes() *Routes { - if m != nil { + if m != nil && m.Routes != nil { return m.Routes } return nil @@ -1621,8 +1636,11 @@ func (m *DesiredLRP) SetMaxPids(value int32) { m.MaxPids = value } } +func (m *DesiredLRP) CertificatePropertiesExists() bool { + return m != nil && m.CertificateProperties != nil +} func (m *DesiredLRP) GetCertificateProperties() *CertificateProperties { - if m != nil { + if m != nil && m.CertificateProperties != nil { return m.CertificateProperties } return nil diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 381dacff..9bbce7c5 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -161,7 +161,7 @@ type EvacuateRunningActualLRPRequest struct { ActualLRPNetInfo *ActualLRPNetInfo ActualLRPInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string - Routable bool + Routable *bool AvailabilityZone string } @@ -275,13 +275,16 @@ func (m *EvacuateRunningActualLRPRequest) SetMetricTags(value map[string]string) m.MetricTags = value } } -func (m *EvacuateRunningActualLRPRequest) GetRoutable() bool { - if m != nil { +func (m *EvacuateRunningActualLRPRequest) RoutableExists() bool { + return m != nil && m.Routable != nil +} +func (m *EvacuateRunningActualLRPRequest) GetRoutable() *bool { + if m != nil && m.Routable != nil { return m.Routable } - return false + return nil } -func (m *EvacuateRunningActualLRPRequest) SetRoutable(value bool) { +func (m *EvacuateRunningActualLRPRequest) SetRoutable(value *bool) { if m != nil { m.Routable = value } diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 0f8647ad..90b8d2c4 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -280,7 +280,7 @@ type ActualLRPInfo struct { Since int64 ModificationTag *ModificationTag Presence ActualLRP_Presence - Routable bool + Routable *bool AvailabilityZone string } @@ -426,13 +426,16 @@ func (m *ActualLRPInfo) SetPresence(value ActualLRP_Presence) { m.Presence = value } } -func (m *ActualLRPInfo) GetRoutable() bool { - if m != nil { +func (m *ActualLRPInfo) RoutableExists() bool { + return m != nil && m.Routable != nil +} +func (m *ActualLRPInfo) GetRoutable() *bool { + if m != nil && m.Routable != nil { return m.Routable } - return false + return nil } -func (m *ActualLRPInfo) SetRoutable(value bool) { +func (m *ActualLRPInfo) SetRoutable(value *bool) { if m != nil { m.Routable = value } diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index b4d4480c..ddd5540f 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -154,19 +154,38 @@ func (bbsGenerateHelper) genAccessors(g *protogen.GeneratedFile, msg *protogen.M if options.GetDeprecated() { g.P("// DEPRECATED: DO NOT USE") } - defaultValue := getDefaultValueString(field) - genGetter(g, copysafeName, fieldName, fieldType, defaultValue) + genGetter(g, copysafeName, field) //fieldName, fieldType, defaultValue) genSetter(g, copysafeName, fieldName, fieldType) } } } -func genGetter(g *protogen.GeneratedFile, copysafeName string, fieldName string, fieldType string, defaultValue string) { +func genExists(g *protogen.GeneratedFile, copysafeName string, field *protogen.Field) { + if *debug { + log.Print("Exists...") + } + fieldName := getFieldName(field.GoName) + g.P("func (m *", copysafeName, ") ", fieldName, "Exists() bool {") + g.P("return m != nil && m.", fieldName, " != nil") + g.P("}") +} + +func genGetter(g *protogen.GeneratedFile, copysafeName string, field *protogen.Field) { //fieldName string, fieldType string, defaultValue string) { if *debug { log.Print("Getter...") } + fieldName := getFieldName(field.GoName) + fieldType := getActualType(g, field) + defaultValue := getDefaultValueString(field) + isOptional := field.Desc.HasOptionalKeyword() + optionalCheck := "" + if isOptional { + defaultValue = "nil" + optionalCheck = fmt.Sprintf("&& m.%s != nil ", fieldName) //extra space intentional + genExists(g, copysafeName, field) + } g.P("func (m *", copysafeName, ") Get", fieldName, "() ", fieldType, " {") - g.P("if m != nil {") + g.P("if m != nil ", optionalCheck, "{") g.P("return m.", fieldName) g.P("}") g.P("return ", defaultValue) @@ -239,7 +258,11 @@ func getActualType(g *protogen.GeneratedFile, field *protogen.Field) string { enumType, _ := getCopysafeName(g, field.Enum.GoIdent) fieldType += enumType } else { - fieldType += field.Desc.Kind().String() + optional := "" + if field.Desc.HasOptionalKeyword() { + optional = "*" + } + fieldType += optional + field.Desc.Kind().String() } return fieldType From 730860ddb36529ba08f96a9b5f5024aac1b010c0 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 17:27:41 +0000 Subject: [PATCH 037/155] Remove support for oneof since we weren't using it (previous use of oneof was incorrect and essentially a non-use of oneof) Regen protos --- models/actions_bbs.pb.go | 4 ++-- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests_bbs.pb.go | 4 ++-- models/desired_lrp_bbs.pb.go | 4 ++-- models/evacuation_bbs.pb.go | 2 +- models/events_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.go | 11 ++++++----- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index df7dc613..6d729a19 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1273,8 +1273,8 @@ func (m *ResourceLimits) SetNproc(value *uint64) { } func (x *ResourceLimits) ToProto() *ProtoResourceLimits { proto := &ProtoResourceLimits{ - Nofile: &x.Nofile, - Nproc: &x.Nproc, + Nofile: x.Nofile, + Nproc: x.Nproc, } return proto } diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index ac226273..ae603548 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -848,7 +848,7 @@ func (x *ActualLRP) ToProto() *ProtoActualLRP { Presence: ProtoActualLRP_Presence(x.Presence), ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), MetricTags: x.MetricTags, - Routable: &x.Routable, + Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, } return proto diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 52ae7f29..aea7245d 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -666,7 +666,7 @@ func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), MetricTags: x.MetricTags, - Routable: &x.Routable, + Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, } return proto @@ -1167,7 +1167,7 @@ func (x *ActualLRPsRequest) ToProto() *ProtoActualLRPsRequest { Domain: x.Domain, CellId: x.CellId, ProcessGuid: x.ProcessGuid, - Index: &x.Index, + Index: x.Index, } return proto } diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 5c0a9056..f49d15c6 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -875,9 +875,9 @@ func (m *DesiredLRPUpdate) SetMetricTags(value map[string]*ProtoMetricTagValue) } func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { proto := &ProtoDesiredLRPUpdate{ - Instances: &x.Instances, + Instances: x.Instances, Routes: x.Routes.ToProto(), - Annotation: &x.Annotation, + Annotation: x.Annotation, MetricTags: x.MetricTags, } return proto diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 9bbce7c5..934091f4 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -307,7 +307,7 @@ func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualL ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), MetricTags: x.MetricTags, - Routable: &x.Routable, + Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, } return proto diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 90b8d2c4..55c9e8e1 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -461,7 +461,7 @@ func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { Since: x.Since, ModificationTag: x.ModificationTag.ToProto(), Presence: ProtoActualLRPInfo_Presence(x.Presence), - Routable: &x.Routable, + Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, } return proto diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index ddd5540f..4633d4a2 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -367,11 +367,12 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog } else if field.Enum != nil { g.P(protoFieldName, ": ", field.GoIdent, "(x.", protoFieldName, "),") } else { - if field.Oneof != nil { - g.P(protoFieldName, ": &x.", protoFieldName, ",") - } else { - g.P(protoFieldName, ": x.", protoFieldName, ",") - } + // we weren't using oneof correctly, so we're not going to support it + // if field.Oneof != nil { + // g.P(protoFieldName, ": &x.", protoFieldName, ",") + // } else { + g.P(protoFieldName, ": x.", protoFieldName, ",") + // } } } g.P("}") From d1f7a4ac57504ca38af7cbc168dafc1634436933 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 17:36:50 +0000 Subject: [PATCH 038/155] Incorrect field name used when generating ToProto function Regen protos --- models/actual_lrp_bbs.pb.go | 4 ++-- models/cells_bbs.pb.go | 2 +- models/check_definition_bbs.pb.go | 4 ++-- models/desired_lrp_bbs.pb.go | 8 ++++---- models/desired_lrp_requests_bbs.pb.go | 2 +- models/events_bbs.pb.go | 16 ++++++++-------- models/security_group_bbs.pb.go | 2 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.go | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index ae603548..14c21756 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -70,8 +70,8 @@ func (m *ActualLRPGroup) SetEvacuating(value *ActualLRP) { } func (x *ActualLRPGroup) ToProto() *ProtoActualLRPGroup { proto := &ProtoActualLRPGroup{ - Instance: x.ActualLRP.ToProto(), - Evacuating: x.ActualLRP.ToProto(), + Instance: x.Instance.ToProto(), + Evacuating: x.Evacuating.ToProto(), } return proto } diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 9587a7c1..52e4038a 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -264,7 +264,7 @@ func (x *CellPresence) ToProto() *ProtoCellPresence { CellId: x.CellId, RepAddress: x.RepAddress, Zone: x.Zone, - Capacity: x.CellCapacity.ToProto(), + Capacity: x.Capacity.ToProto(), RootfsProviders: ProviderProtoMap(x.RootfsProviders), PlacementTags: x.PlacementTags, OptionalPlacementTags: x.OptionalPlacementTags, diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index a8c91769..60b971a7 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -166,8 +166,8 @@ func (m *Check) SetHttpCheck(value *HTTPCheck) { } func (x *Check) ToProto() *ProtoCheck { proto := &ProtoCheck{ - TcpCheck: x.TCPCheck.ToProto(), - HttpCheck: x.HTTPCheck.ToProto(), + TcpCheck: x.TcpCheck.ToProto(), + HttpCheck: x.HttpCheck.ToProto(), } return proto } diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index f49d15c6..70e64ca2 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -671,9 +671,9 @@ func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { proto := &ProtoDesiredLRPRunInfo{ DesiredLrpKey: x.DesiredLRPKey.ToProto(), EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), - Setup: x.Action.ToProto(), + Setup: x.Setup.ToProto(), Action: x.Action.ToProto(), - Monitor: x.Action.ToProto(), + Monitor: x.Monitor.ToProto(), DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, Privileged: x.Privileged, CpuWeight: x.CpuWeight, @@ -1734,11 +1734,11 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { RootFs: x.RootFs, Instances: x.Instances, EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), - Setup: x.Action.ToProto(), + Setup: x.Setup.ToProto(), Action: x.Action.ToProto(), StartTimeoutMs: x.StartTimeoutMs, DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, - Monitor: x.Action.ToProto(), + Monitor: x.Monitor.ToProto(), DiskMb: x.DiskMb, MemoryMb: x.MemoryMb, CpuWeight: x.CpuWeight, diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index d72e7379..db0d4230 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -626,7 +626,7 @@ func (m *UpdateDesiredLRPRequest) SetUpdate(value *DesiredLRPUpdate) { func (x *UpdateDesiredLRPRequest) ToProto() *ProtoUpdateDesiredLRPRequest { proto := &ProtoUpdateDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, - Update: x.DesiredLRPUpdate.ToProto(), + Update: x.Update.ToProto(), } return proto } diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 55c9e8e1..5f730cc4 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -124,8 +124,8 @@ func (m *ActualLRPChangedEvent) SetAfter(value *ActualLRPGroup) { } func (x *ActualLRPChangedEvent) ToProto() *ProtoActualLRPChangedEvent { proto := &ProtoActualLRPChangedEvent{ - Before: x.ActualLRPGroup.ToProto(), - After: x.ActualLRPGroup.ToProto(), + Before: x.Before.ToProto(), + After: x.After.ToProto(), } return proto } @@ -582,8 +582,8 @@ func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChanged proto := &ProtoActualLRPInstanceChangedEvent{ ActualLrpKey: x.ActualLRPKey.ToProto(), ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), - Before: x.ActualLRPInfo.ToProto(), - After: x.ActualLRPInfo.ToProto(), + Before: x.Before.ToProto(), + After: x.After.ToProto(), TraceId: x.TraceId, } return proto @@ -820,8 +820,8 @@ func (m *DesiredLRPChangedEvent) SetTraceId(value string) { } func (x *DesiredLRPChangedEvent) ToProto() *ProtoDesiredLRPChangedEvent { proto := &ProtoDesiredLRPChangedEvent{ - Before: x.DesiredLRP.ToProto(), - After: x.DesiredLRP.ToProto(), + Before: x.Before.ToProto(), + After: x.After.ToProto(), TraceId: x.TraceId, } return proto @@ -1207,8 +1207,8 @@ func (m *TaskChangedEvent) SetAfter(value *Task) { } func (x *TaskChangedEvent) ToProto() *ProtoTaskChangedEvent { proto := &ProtoTaskChangedEvent{ - Before: x.Task.ToProto(), - After: x.Task.ToProto(), + Before: x.Before.ToProto(), + After: x.After.ToProto(), } return proto } diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 81e2e432..d41bf848 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -308,7 +308,7 @@ func (x *SecurityGroupRule) ToProto() *ProtoSecurityGroupRule { Destinations: x.Destinations, Ports: x.Ports, PortRange: x.PortRange.ToProto(), - IcmpInfo: x.ICMPInfo.ToProto(), + IcmpInfo: x.IcmpInfo.ToProto(), Log: x.Log, Annotations: x.Annotations, } diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 6d963b41..40d55874 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -173,7 +173,7 @@ func (x *VolumeMount) ToProto() *ProtoVolumeMount { Driver: x.Driver, ContainerDir: x.ContainerDir, Mode: x.Mode, - Shared: x.SharedDevice.ToProto(), + Shared: x.Shared.ToProto(), } return proto } diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 4633d4a2..75f9059a 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -362,7 +362,7 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog panic("Unrecognized Repeated field found") } } else { - g.P(protoFieldName, ": x.", fieldCopysafeName, ".ToProto(),") + g.P(protoFieldName, ": x.", getFieldName(protoFieldName), ".ToProto(),") } } else if field.Enum != nil { g.P(protoFieldName, ": ", field.GoIdent, "(x.", protoFieldName, "),") From cb6bd3d9fdd586521b0445c125b81549900e6e62 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 17:42:53 +0000 Subject: [PATCH 039/155] Remove getFieldName overrides for Actual/DesiredLRP. This wasn't consistent so we're going to standardize on the output from basic protoc (ActualLrp instead of ActualLRP) Regen protos --- models/actual_lrp_bbs.pb.go | 60 ++++---- models/actual_lrp_requests_bbs.pb.go | 194 +++++++++++++------------- models/desired_lrp_bbs.pb.go | 42 +++--- models/desired_lrp_requests_bbs.pb.go | 78 +++++------ models/evacuation_bbs.pb.go | 172 +++++++++++------------ models/events_bbs.pb.go | 154 ++++++++++---------- protoc-gen-go-bbs/bbs.go | 6 +- 7 files changed, 353 insertions(+), 353 deletions(-) diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 14c21756..c9de35ea 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -585,9 +585,9 @@ func (m ActualLRP_Presence) String() string { // Prevent copylock errors when using ProtoActualLRP directly type ActualLRP struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey - ActualLRPNetInfo *ActualLRPNetInfo + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpNetInfo *ActualLRPNetInfo CrashCount int32 CrashReason string State string @@ -595,7 +595,7 @@ type ActualLRP struct { Since int64 ModificationTag *ModificationTag Presence ActualLRP_Presence - ActualLRPInternalRoutes []*ActualLRPInternalRoute + ActualLrpInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string Routable *bool AvailabilityZone string @@ -623,13 +623,13 @@ func (this *ActualLRP) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } - if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -653,11 +653,11 @@ func (this *ActualLRP) Equal(that interface{}) bool { if this.Presence != that1.Presence { return false } - if len(this.ActualLRPInternalRoutes) != len(that1.ActualLRPInternalRoutes) { + if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { return false } - for i := range this.ActualLRPInternalRoutes { - if !this.ActualLRPInternalRoutes[i].Equal(that1.ActualLRPInternalRoutes[i]) { + for i := range this.ActualLrpInternalRoutes { + if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { return false } } @@ -677,37 +677,37 @@ func (this *ActualLRP) Equal(that interface{}) bool { } return true } -func (m *ActualLRP) GetActualLRPKey() *ActualLRPKey { +func (m *ActualLRP) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *ActualLRP) SetActualLRPKey(value *ActualLRPKey) { +func (m *ActualLRP) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *ActualLRP) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *ActualLRP) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *ActualLRP) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRP) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } -func (m *ActualLRP) GetActualLRPNetInfo() *ActualLRPNetInfo { +func (m *ActualLRP) GetActualLrpNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLRPNetInfo + return m.ActualLrpNetInfo } return nil } -func (m *ActualLRP) SetActualLRPNetInfo(value *ActualLRPNetInfo) { +func (m *ActualLRP) SetActualLrpNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLRPNetInfo = value + m.ActualLrpNetInfo = value } } func (m *ActualLRP) GetCrashCount() int32 { @@ -787,15 +787,15 @@ func (m *ActualLRP) SetPresence(value ActualLRP_Presence) { m.Presence = value } } -func (m *ActualLRP) GetActualLRPInternalRoutes() []*ActualLRPInternalRoute { +func (m *ActualLRP) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { if m != nil { - return m.ActualLRPInternalRoutes + return m.ActualLrpInternalRoutes } return nil } -func (m *ActualLRP) SetActualLRPInternalRoutes(value []*ActualLRPInternalRoute) { +func (m *ActualLRP) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { if m != nil { - m.ActualLRPInternalRoutes = value + m.ActualLrpInternalRoutes = value } } func (m *ActualLRP) GetMetricTags() map[string]string { @@ -836,9 +836,9 @@ func (m *ActualLRP) SetAvailabilityZone(value string) { } func (x *ActualLRP) ToProto() *ProtoActualLRP { proto := &ProtoActualLRP{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), - ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, State: x.State, @@ -846,7 +846,7 @@ func (x *ActualLRP) ToProto() *ProtoActualLRP { Since: x.Since, ModificationTag: x.ModificationTag.ToProto(), Presence: ProtoActualLRP_Presence(x.Presence), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), MetricTags: x.MetricTags, Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index aea7245d..54a036a8 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -67,7 +67,7 @@ func ActualLRPLifecycleResponseProtoMap(values []*ActualLRPLifecycleResponse) [] // Prevent copylock errors when using ProtoActualLRPGroupsResponse directly type ActualLRPGroupsResponse struct { Error *Error - ActualLRPGroups []*ActualLRPGroup + ActualLrpGroups []*ActualLRPGroup } func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { @@ -95,11 +95,11 @@ func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.ActualLRPGroups) != len(that1.ActualLRPGroups) { + if len(this.ActualLrpGroups) != len(that1.ActualLrpGroups) { return false } - for i := range this.ActualLRPGroups { - if !this.ActualLRPGroups[i].Equal(that1.ActualLRPGroups[i]) { + for i := range this.ActualLrpGroups { + if !this.ActualLrpGroups[i].Equal(that1.ActualLrpGroups[i]) { return false } } @@ -116,21 +116,21 @@ func (m *ActualLRPGroupsResponse) SetError(value *Error) { m.Error = value } } -func (m *ActualLRPGroupsResponse) GetActualLRPGroups() []*ActualLRPGroup { +func (m *ActualLRPGroupsResponse) GetActualLrpGroups() []*ActualLRPGroup { if m != nil { - return m.ActualLRPGroups + return m.ActualLrpGroups } return nil } -func (m *ActualLRPGroupsResponse) SetActualLRPGroups(value []*ActualLRPGroup) { +func (m *ActualLRPGroupsResponse) SetActualLrpGroups(value []*ActualLRPGroup) { if m != nil { - m.ActualLRPGroups = value + m.ActualLrpGroups = value } } func (x *ActualLRPGroupsResponse) ToProto() *ProtoActualLRPGroupsResponse { proto := &ProtoActualLRPGroupsResponse{ Error: x.Error.ToProto(), - ActualLrpGroups: ActualLRPGroupProtoMap(x.ActualLRPGroups), + ActualLrpGroups: ActualLRPGroupProtoMap(x.ActualLrpGroups), } return proto } @@ -146,7 +146,7 @@ func ActualLRPGroupsResponseProtoMap(values []*ActualLRPGroupsResponse) []*Proto // Prevent copylock errors when using ProtoActualLRPGroupResponse directly type ActualLRPGroupResponse struct { Error *Error - ActualLRPGroup *ActualLRPGroup + ActualLrpGroup *ActualLRPGroup } func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { @@ -174,7 +174,7 @@ func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if !this.ActualLRPGroup.Equal(that1.ActualLRPGroup) { + if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { return false } return true @@ -190,21 +190,21 @@ func (m *ActualLRPGroupResponse) SetError(value *Error) { m.Error = value } } -func (m *ActualLRPGroupResponse) GetActualLRPGroup() *ActualLRPGroup { +func (m *ActualLRPGroupResponse) GetActualLrpGroup() *ActualLRPGroup { if m != nil { - return m.ActualLRPGroup + return m.ActualLrpGroup } return nil } -func (m *ActualLRPGroupResponse) SetActualLRPGroup(value *ActualLRPGroup) { +func (m *ActualLRPGroupResponse) SetActualLrpGroup(value *ActualLRPGroup) { if m != nil { - m.ActualLRPGroup = value + m.ActualLrpGroup = value } } func (x *ActualLRPGroupResponse) ToProto() *ProtoActualLRPGroupResponse { proto := &ProtoActualLRPGroupResponse{ Error: x.Error.ToProto(), - ActualLrpGroup: x.ActualLRPGroup.ToProto(), + ActualLrpGroup: x.ActualLrpGroup.ToProto(), } return proto } @@ -427,7 +427,7 @@ func ActualLRPGroupByProcessGuidAndIndexRequestProtoMap(values []*ActualLRPGroup type ClaimActualLRPRequest struct { ProcessGuid string Index int32 - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpInstanceKey *ActualLRPInstanceKey } func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { @@ -458,7 +458,7 @@ func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } return true @@ -485,22 +485,22 @@ func (m *ClaimActualLRPRequest) SetIndex(value int32) { m.Index = value } } -func (m *ClaimActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *ClaimActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *ClaimActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *ClaimActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (x *ClaimActualLRPRequest) ToProto() *ProtoClaimActualLRPRequest { proto := &ProtoClaimActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), } return proto } @@ -515,10 +515,10 @@ func ClaimActualLRPRequestProtoMap(values []*ClaimActualLRPRequest) []*ProtoClai // Prevent copylock errors when using ProtoStartActualLRPRequest directly type StartActualLRPRequest struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey - ActualLRPNetInfo *ActualLRPNetInfo - ActualLRPInternalRoutes []*ActualLRPInternalRoute + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpNetInfo *ActualLRPNetInfo + ActualLrpInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string Routable *bool AvailabilityZone string @@ -546,20 +546,20 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } - if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { return false } - if len(this.ActualLRPInternalRoutes) != len(that1.ActualLRPInternalRoutes) { + if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { return false } - for i := range this.ActualLRPInternalRoutes { - if !this.ActualLRPInternalRoutes[i].Equal(that1.ActualLRPInternalRoutes[i]) { + for i := range this.ActualLrpInternalRoutes { + if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { return false } } @@ -579,48 +579,48 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *StartActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *StartActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *StartActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *StartActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *StartActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *StartActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *StartActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *StartActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } -func (m *StartActualLRPRequest) GetActualLRPNetInfo() *ActualLRPNetInfo { +func (m *StartActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLRPNetInfo + return m.ActualLrpNetInfo } return nil } -func (m *StartActualLRPRequest) SetActualLRPNetInfo(value *ActualLRPNetInfo) { +func (m *StartActualLRPRequest) SetActualLrpNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLRPNetInfo = value + m.ActualLrpNetInfo = value } } -func (m *StartActualLRPRequest) GetActualLRPInternalRoutes() []*ActualLRPInternalRoute { +func (m *StartActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { if m != nil { - return m.ActualLRPInternalRoutes + return m.ActualLrpInternalRoutes } return nil } -func (m *StartActualLRPRequest) SetActualLRPInternalRoutes(value []*ActualLRPInternalRoute) { +func (m *StartActualLRPRequest) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { if m != nil { - m.ActualLRPInternalRoutes = value + m.ActualLrpInternalRoutes = value } } func (m *StartActualLRPRequest) GetMetricTags() map[string]string { @@ -661,10 +661,10 @@ func (m *StartActualLRPRequest) SetAvailabilityZone(value string) { } func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { proto := &ProtoStartActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), - ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), MetricTags: x.MetricTags, Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, @@ -682,8 +682,8 @@ func StartActualLRPRequestProtoMap(values []*StartActualLRPRequest) []*ProtoStar // Prevent copylock errors when using ProtoCrashActualLRPRequest directly type CrashActualLRPRequest struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey ErrorMessage string } @@ -709,10 +709,10 @@ func (this *CrashActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -720,26 +720,26 @@ func (this *CrashActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *CrashActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *CrashActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *CrashActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *CrashActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *CrashActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *CrashActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *CrashActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *CrashActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (m *CrashActualLRPRequest) GetErrorMessage() string { @@ -755,8 +755,8 @@ func (m *CrashActualLRPRequest) SetErrorMessage(value string) { } func (x *CrashActualLRPRequest) ToProto() *ProtoCrashActualLRPRequest { proto := &ProtoCrashActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), ErrorMessage: x.ErrorMessage, } return proto @@ -772,7 +772,7 @@ func CrashActualLRPRequestProtoMap(values []*CrashActualLRPRequest) []*ProtoCras // Prevent copylock errors when using ProtoFailActualLRPRequest directly type FailActualLRPRequest struct { - ActualLRPKey *ActualLRPKey + ActualLrpKey *ActualLRPKey ErrorMessage string } @@ -798,7 +798,7 @@ func (this *FailActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -806,15 +806,15 @@ func (this *FailActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *FailActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *FailActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *FailActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *FailActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } func (m *FailActualLRPRequest) GetErrorMessage() string { @@ -830,7 +830,7 @@ func (m *FailActualLRPRequest) SetErrorMessage(value string) { } func (x *FailActualLRPRequest) ToProto() *ProtoFailActualLRPRequest { proto := &ProtoFailActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), ErrorMessage: x.ErrorMessage, } return proto @@ -846,7 +846,7 @@ func FailActualLRPRequestProtoMap(values []*FailActualLRPRequest) []*ProtoFailAc // Prevent copylock errors when using ProtoRetireActualLRPRequest directly type RetireActualLRPRequest struct { - ActualLRPKey *ActualLRPKey + ActualLrpKey *ActualLRPKey } func (this *RetireActualLRPRequest) Equal(that interface{}) bool { @@ -871,25 +871,25 @@ func (this *RetireActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } return true } -func (m *RetireActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *RetireActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *RetireActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *RetireActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } func (x *RetireActualLRPRequest) ToProto() *ProtoRetireActualLRPRequest { proto := &ProtoRetireActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), } return proto } @@ -906,7 +906,7 @@ func RetireActualLRPRequestProtoMap(values []*RetireActualLRPRequest) []*ProtoRe type RemoveActualLRPRequest struct { ProcessGuid string Index int32 - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpInstanceKey *ActualLRPInstanceKey } func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { @@ -937,7 +937,7 @@ func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } return true @@ -964,22 +964,22 @@ func (m *RemoveActualLRPRequest) SetIndex(value int32) { m.Index = value } } -func (m *RemoveActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *RemoveActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *RemoveActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *RemoveActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (x *RemoveActualLRPRequest) ToProto() *ProtoRemoveActualLRPRequest { proto := &ProtoRemoveActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), } return proto } @@ -995,7 +995,7 @@ func RemoveActualLRPRequestProtoMap(values []*RemoveActualLRPRequest) []*ProtoRe // Prevent copylock errors when using ProtoActualLRPsResponse directly type ActualLRPsResponse struct { Error *Error - ActualLRPs []*ActualLRP + ActualLrps []*ActualLRP } func (this *ActualLRPsResponse) Equal(that interface{}) bool { @@ -1023,11 +1023,11 @@ func (this *ActualLRPsResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.ActualLRPs) != len(that1.ActualLRPs) { + if len(this.ActualLrps) != len(that1.ActualLrps) { return false } - for i := range this.ActualLRPs { - if !this.ActualLRPs[i].Equal(that1.ActualLRPs[i]) { + for i := range this.ActualLrps { + if !this.ActualLrps[i].Equal(that1.ActualLrps[i]) { return false } } @@ -1044,21 +1044,21 @@ func (m *ActualLRPsResponse) SetError(value *Error) { m.Error = value } } -func (m *ActualLRPsResponse) GetActualLRPs() []*ActualLRP { +func (m *ActualLRPsResponse) GetActualLrps() []*ActualLRP { if m != nil { - return m.ActualLRPs + return m.ActualLrps } return nil } -func (m *ActualLRPsResponse) SetActualLRPs(value []*ActualLRP) { +func (m *ActualLRPsResponse) SetActualLrps(value []*ActualLRP) { if m != nil { - m.ActualLRPs = value + m.ActualLrps = value } } func (x *ActualLRPsResponse) ToProto() *ProtoActualLRPsResponse { proto := &ProtoActualLRPsResponse{ Error: x.Error.ToProto(), - ActualLrps: ActualLRPProtoMap(x.ActualLRPs), + ActualLrps: ActualLRPProtoMap(x.ActualLrps), } return proto } diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 70e64ca2..923fda75 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -12,10 +12,10 @@ import ( // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly type DesiredLRPSchedulingInfo struct { - DesiredLRPKey *DesiredLRPKey + DesiredLrpKey *DesiredLRPKey Annotation string Instances int32 - DesiredLRPResource *DesiredLRPResource + DesiredLrpResource *DesiredLRPResource Routes *Routes ModificationTag *ModificationTag VolumePlacement *VolumePlacement @@ -44,7 +44,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLRPKey.Equal(that1.DesiredLRPKey) { + if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { return false } if this.Annotation != that1.Annotation { @@ -53,7 +53,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if this.Instances != that1.Instances { return false } - if !this.DesiredLRPResource.Equal(that1.DesiredLRPResource) { + if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { return false } if !this.Routes.Equal(that1.Routes) { @@ -75,15 +75,15 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPSchedulingInfo) GetDesiredLRPKey() *DesiredLRPKey { +func (m *DesiredLRPSchedulingInfo) GetDesiredLrpKey() *DesiredLRPKey { if m != nil { - return m.DesiredLRPKey + return m.DesiredLrpKey } return nil } -func (m *DesiredLRPSchedulingInfo) SetDesiredLRPKey(value *DesiredLRPKey) { +func (m *DesiredLRPSchedulingInfo) SetDesiredLrpKey(value *DesiredLRPKey) { if m != nil { - m.DesiredLRPKey = value + m.DesiredLrpKey = value } } func (m *DesiredLRPSchedulingInfo) GetAnnotation() string { @@ -108,15 +108,15 @@ func (m *DesiredLRPSchedulingInfo) SetInstances(value int32) { m.Instances = value } } -func (m *DesiredLRPSchedulingInfo) GetDesiredLRPResource() *DesiredLRPResource { +func (m *DesiredLRPSchedulingInfo) GetDesiredLrpResource() *DesiredLRPResource { if m != nil { - return m.DesiredLRPResource + return m.DesiredLrpResource } return nil } -func (m *DesiredLRPSchedulingInfo) SetDesiredLRPResource(value *DesiredLRPResource) { +func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value *DesiredLRPResource) { if m != nil { - m.DesiredLRPResource = value + m.DesiredLrpResource = value } } func (m *DesiredLRPSchedulingInfo) GetRoutes() *Routes { @@ -165,10 +165,10 @@ func (m *DesiredLRPSchedulingInfo) SetProtoPlacementTags(value []string) { } func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { proto := &ProtoDesiredLRPSchedulingInfo{ - DesiredLrpKey: x.DesiredLRPKey.ToProto(), + DesiredLrpKey: x.DesiredLrpKey.ToProto(), Annotation: x.Annotation, Instances: x.Instances, - DesiredLrpResource: x.DesiredLRPResource.ToProto(), + DesiredLrpResource: x.DesiredLrpResource.ToProto(), Routes: x.Routes.ToProto(), ModificationTag: x.ModificationTag.ToProto(), VolumePlacement: x.VolumePlacement.ToProto(), @@ -187,7 +187,7 @@ func DesiredLRPSchedulingInfoProtoMap(values []*DesiredLRPSchedulingInfo) []*Pro // Prevent copylock errors when using ProtoDesiredLRPRunInfo directly type DesiredLRPRunInfo struct { - DesiredLRPKey *DesiredLRPKey + DesiredLrpKey *DesiredLRPKey EnvironmentVariables []*EnvironmentVariable Setup *Action Action *Action @@ -238,7 +238,7 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLRPKey.Equal(that1.DesiredLRPKey) { + if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { return false } if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { @@ -361,15 +361,15 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPRunInfo) GetDesiredLRPKey() *DesiredLRPKey { +func (m *DesiredLRPRunInfo) GetDesiredLrpKey() *DesiredLRPKey { if m != nil { - return m.DesiredLRPKey + return m.DesiredLrpKey } return nil } -func (m *DesiredLRPRunInfo) SetDesiredLRPKey(value *DesiredLRPKey) { +func (m *DesiredLRPRunInfo) SetDesiredLrpKey(value *DesiredLRPKey) { if m != nil { - m.DesiredLRPKey = value + m.DesiredLrpKey = value } } func (m *DesiredLRPRunInfo) GetEnvironmentVariables() []*EnvironmentVariable { @@ -669,7 +669,7 @@ func (m *DesiredLRPRunInfo) SetLogRateLimit(value *LogRateLimit) { } func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { proto := &ProtoDesiredLRPRunInfo{ - DesiredLrpKey: x.DesiredLRPKey.ToProto(), + DesiredLrpKey: x.DesiredLrpKey.ToProto(), EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), Setup: x.Setup.ToProto(), Action: x.Action.ToProto(), diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index db0d4230..f6724e2b 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -67,7 +67,7 @@ func DesiredLRPLifecycleResponseProtoMap(values []*DesiredLRPLifecycleResponse) // Prevent copylock errors when using ProtoDesiredLRPsResponse directly type DesiredLRPsResponse struct { Error *Error - DesiredLRPs []*DesiredLRP + DesiredLrps []*DesiredLRP } func (this *DesiredLRPsResponse) Equal(that interface{}) bool { @@ -95,11 +95,11 @@ func (this *DesiredLRPsResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.DesiredLRPs) != len(that1.DesiredLRPs) { + if len(this.DesiredLrps) != len(that1.DesiredLrps) { return false } - for i := range this.DesiredLRPs { - if !this.DesiredLRPs[i].Equal(that1.DesiredLRPs[i]) { + for i := range this.DesiredLrps { + if !this.DesiredLrps[i].Equal(that1.DesiredLrps[i]) { return false } } @@ -116,21 +116,21 @@ func (m *DesiredLRPsResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPsResponse) GetDesiredLRPs() []*DesiredLRP { +func (m *DesiredLRPsResponse) GetDesiredLrps() []*DesiredLRP { if m != nil { - return m.DesiredLRPs + return m.DesiredLrps } return nil } -func (m *DesiredLRPsResponse) SetDesiredLRPs(value []*DesiredLRP) { +func (m *DesiredLRPsResponse) SetDesiredLrps(value []*DesiredLRP) { if m != nil { - m.DesiredLRPs = value + m.DesiredLrps = value } } func (x *DesiredLRPsResponse) ToProto() *ProtoDesiredLRPsResponse { proto := &ProtoDesiredLRPsResponse{ Error: x.Error.ToProto(), - DesiredLrps: DesiredLRPProtoMap(x.DesiredLRPs), + DesiredLrps: DesiredLRPProtoMap(x.DesiredLrps), } return proto } @@ -225,7 +225,7 @@ func DesiredLRPsRequestProtoMap(values []*DesiredLRPsRequest) []*ProtoDesiredLRP // Prevent copylock errors when using ProtoDesiredLRPResponse directly type DesiredLRPResponse struct { Error *Error - DesiredLRP *DesiredLRP + DesiredLrp *DesiredLRP } func (this *DesiredLRPResponse) Equal(that interface{}) bool { @@ -253,7 +253,7 @@ func (this *DesiredLRPResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if !this.DesiredLRP.Equal(that1.DesiredLRP) { + if !this.DesiredLrp.Equal(that1.DesiredLrp) { return false } return true @@ -269,21 +269,21 @@ func (m *DesiredLRPResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPResponse) GetDesiredLRP() *DesiredLRP { +func (m *DesiredLRPResponse) GetDesiredLrp() *DesiredLRP { if m != nil { - return m.DesiredLRP + return m.DesiredLrp } return nil } -func (m *DesiredLRPResponse) SetDesiredLRP(value *DesiredLRP) { +func (m *DesiredLRPResponse) SetDesiredLrp(value *DesiredLRP) { if m != nil { - m.DesiredLRP = value + m.DesiredLrp = value } } func (x *DesiredLRPResponse) ToProto() *ProtoDesiredLRPResponse { proto := &ProtoDesiredLRPResponse{ Error: x.Error.ToProto(), - DesiredLrp: x.DesiredLRP.ToProto(), + DesiredLrp: x.DesiredLrp.ToProto(), } return proto } @@ -299,7 +299,7 @@ func DesiredLRPResponseProtoMap(values []*DesiredLRPResponse) []*ProtoDesiredLRP // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfosResponse directly type DesiredLRPSchedulingInfosResponse struct { Error *Error - DesiredLRPSchedulingInfos []*DesiredLRPSchedulingInfo + DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo } func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { @@ -327,11 +327,11 @@ func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { if !this.Error.Equal(that1.Error) { return false } - if len(this.DesiredLRPSchedulingInfos) != len(that1.DesiredLRPSchedulingInfos) { + if len(this.DesiredLrpSchedulingInfos) != len(that1.DesiredLrpSchedulingInfos) { return false } - for i := range this.DesiredLRPSchedulingInfos { - if !this.DesiredLRPSchedulingInfos[i].Equal(that1.DesiredLRPSchedulingInfos[i]) { + for i := range this.DesiredLrpSchedulingInfos { + if !this.DesiredLrpSchedulingInfos[i].Equal(that1.DesiredLrpSchedulingInfos[i]) { return false } } @@ -348,21 +348,21 @@ func (m *DesiredLRPSchedulingInfosResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPSchedulingInfosResponse) GetDesiredLRPSchedulingInfos() []*DesiredLRPSchedulingInfo { +func (m *DesiredLRPSchedulingInfosResponse) GetDesiredLrpSchedulingInfos() []*DesiredLRPSchedulingInfo { if m != nil { - return m.DesiredLRPSchedulingInfos + return m.DesiredLrpSchedulingInfos } return nil } -func (m *DesiredLRPSchedulingInfosResponse) SetDesiredLRPSchedulingInfos(value []*DesiredLRPSchedulingInfo) { +func (m *DesiredLRPSchedulingInfosResponse) SetDesiredLrpSchedulingInfos(value []*DesiredLRPSchedulingInfo) { if m != nil { - m.DesiredLRPSchedulingInfos = value + m.DesiredLrpSchedulingInfos = value } } func (x *DesiredLRPSchedulingInfosResponse) ToProto() *ProtoDesiredLRPSchedulingInfosResponse { proto := &ProtoDesiredLRPSchedulingInfosResponse{ Error: x.Error.ToProto(), - DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoProtoMap(x.DesiredLRPSchedulingInfos), + DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoProtoMap(x.DesiredLrpSchedulingInfos), } return proto } @@ -378,7 +378,7 @@ func DesiredLRPSchedulingInfosResponseProtoMap(values []*DesiredLRPSchedulingInf // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfoByProcessGuidResponse directly type DesiredLRPSchedulingInfoByProcessGuidResponse struct { Error *Error - DesiredLRPSchedulingInfo *DesiredLRPSchedulingInfo + DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo } func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{}) bool { @@ -406,7 +406,7 @@ func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{ if !this.Error.Equal(that1.Error) { return false } - if !this.DesiredLRPSchedulingInfo.Equal(that1.DesiredLRPSchedulingInfo) { + if !this.DesiredLrpSchedulingInfo.Equal(that1.DesiredLrpSchedulingInfo) { return false } return true @@ -422,21 +422,21 @@ func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetError(value *Error) { m.Error = value } } -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLRPSchedulingInfo() *DesiredLRPSchedulingInfo { +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLrpSchedulingInfo() *DesiredLRPSchedulingInfo { if m != nil { - return m.DesiredLRPSchedulingInfo + return m.DesiredLrpSchedulingInfo } return nil } -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetDesiredLRPSchedulingInfo(value *DesiredLRPSchedulingInfo) { +func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetDesiredLrpSchedulingInfo(value *DesiredLRPSchedulingInfo) { if m != nil { - m.DesiredLRPSchedulingInfo = value + m.DesiredLrpSchedulingInfo = value } } func (x *DesiredLRPSchedulingInfoByProcessGuidResponse) ToProto() *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { proto := &ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{ Error: x.Error.ToProto(), - DesiredLrpSchedulingInfo: x.DesiredLRPSchedulingInfo.ToProto(), + DesiredLrpSchedulingInfo: x.DesiredLrpSchedulingInfo.ToProto(), } return proto } @@ -509,7 +509,7 @@ func DesiredLRPByProcessGuidRequestProtoMap(values []*DesiredLRPByProcessGuidReq // Prevent copylock errors when using ProtoDesireLRPRequest directly type DesireLRPRequest struct { - DesiredLRP *DesiredLRP + DesiredLrp *DesiredLRP } func (this *DesireLRPRequest) Equal(that interface{}) bool { @@ -534,25 +534,25 @@ func (this *DesireLRPRequest) Equal(that interface{}) bool { return false } - if !this.DesiredLRP.Equal(that1.DesiredLRP) { + if !this.DesiredLrp.Equal(that1.DesiredLrp) { return false } return true } -func (m *DesireLRPRequest) GetDesiredLRP() *DesiredLRP { +func (m *DesireLRPRequest) GetDesiredLrp() *DesiredLRP { if m != nil { - return m.DesiredLRP + return m.DesiredLrp } return nil } -func (m *DesireLRPRequest) SetDesiredLRP(value *DesiredLRP) { +func (m *DesireLRPRequest) SetDesiredLrp(value *DesiredLRP) { if m != nil { - m.DesiredLRP = value + m.DesiredLrp = value } } func (x *DesireLRPRequest) ToProto() *ProtoDesireLRPRequest { proto := &ProtoDesireLRPRequest{ - DesiredLrp: x.DesiredLRP.ToProto(), + DesiredLrp: x.DesiredLrp.ToProto(), } return proto } diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 934091f4..51565e71 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -82,8 +82,8 @@ func EvacuationResponseProtoMap(values []*EvacuationResponse) []*ProtoEvacuation // Prevent copylock errors when using ProtoEvacuateClaimedActualLRPRequest directly type EvacuateClaimedActualLRPRequest struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey } func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { @@ -108,40 +108,40 @@ func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } return true } -func (m *EvacuateClaimedActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *EvacuateClaimedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *EvacuateClaimedActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *EvacuateClaimedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *EvacuateClaimedActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateClaimedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *EvacuateClaimedActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateClaimedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (x *EvacuateClaimedActualLRPRequest) ToProto() *ProtoEvacuateClaimedActualLRPRequest { proto := &ProtoEvacuateClaimedActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), } return proto } @@ -156,10 +156,10 @@ func EvacuateClaimedActualLRPRequestProtoMap(values []*EvacuateClaimedActualLRPR // Prevent copylock errors when using ProtoEvacuateRunningActualLRPRequest directly type EvacuateRunningActualLRPRequest struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey - ActualLRPNetInfo *ActualLRPNetInfo - ActualLRPInternalRoutes []*ActualLRPInternalRoute + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpNetInfo *ActualLRPNetInfo + ActualLrpInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string Routable *bool AvailabilityZone string @@ -187,20 +187,20 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } - if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { return false } - if len(this.ActualLRPInternalRoutes) != len(that1.ActualLRPInternalRoutes) { + if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { return false } - for i := range this.ActualLRPInternalRoutes { - if !this.ActualLRPInternalRoutes[i].Equal(that1.ActualLRPInternalRoutes[i]) { + for i := range this.ActualLrpInternalRoutes { + if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { return false } } @@ -220,48 +220,48 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *EvacuateRunningActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *EvacuateRunningActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *EvacuateRunningActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *EvacuateRunningActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateRunningActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateRunningActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } -func (m *EvacuateRunningActualLRPRequest) GetActualLRPNetInfo() *ActualLRPNetInfo { +func (m *EvacuateRunningActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLRPNetInfo + return m.ActualLrpNetInfo } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLRPNetInfo(value *ActualLRPNetInfo) { +func (m *EvacuateRunningActualLRPRequest) SetActualLrpNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLRPNetInfo = value + m.ActualLrpNetInfo = value } } -func (m *EvacuateRunningActualLRPRequest) GetActualLRPInternalRoutes() []*ActualLRPInternalRoute { +func (m *EvacuateRunningActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { if m != nil { - return m.ActualLRPInternalRoutes + return m.ActualLrpInternalRoutes } return nil } -func (m *EvacuateRunningActualLRPRequest) SetActualLRPInternalRoutes(value []*ActualLRPInternalRoute) { +func (m *EvacuateRunningActualLRPRequest) SetActualLrpInternalRoutes(value []*ActualLRPInternalRoute) { if m != nil { - m.ActualLRPInternalRoutes = value + m.ActualLrpInternalRoutes = value } } func (m *EvacuateRunningActualLRPRequest) GetMetricTags() map[string]string { @@ -302,10 +302,10 @@ func (m *EvacuateRunningActualLRPRequest) SetAvailabilityZone(value string) { } func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualLRPRequest { proto := &ProtoEvacuateRunningActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), - ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLRPInternalRoutes), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), MetricTags: x.MetricTags, Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, @@ -323,8 +323,8 @@ func EvacuateRunningActualLRPRequestProtoMap(values []*EvacuateRunningActualLRPR // Prevent copylock errors when using ProtoEvacuateStoppedActualLRPRequest directly type EvacuateStoppedActualLRPRequest struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey } func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { @@ -349,40 +349,40 @@ func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } return true } -func (m *EvacuateStoppedActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *EvacuateStoppedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *EvacuateStoppedActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *EvacuateStoppedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *EvacuateStoppedActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateStoppedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *EvacuateStoppedActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateStoppedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (x *EvacuateStoppedActualLRPRequest) ToProto() *ProtoEvacuateStoppedActualLRPRequest { proto := &ProtoEvacuateStoppedActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), } return proto } @@ -397,8 +397,8 @@ func EvacuateStoppedActualLRPRequestProtoMap(values []*EvacuateStoppedActualLRPR // Prevent copylock errors when using ProtoEvacuateCrashedActualLRPRequest directly type EvacuateCrashedActualLRPRequest struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey ErrorMessage string } @@ -424,10 +424,10 @@ func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -435,26 +435,26 @@ func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { } return true } -func (m *EvacuateCrashedActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *EvacuateCrashedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *EvacuateCrashedActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *EvacuateCrashedActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *EvacuateCrashedActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *EvacuateCrashedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *EvacuateCrashedActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *EvacuateCrashedActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (m *EvacuateCrashedActualLRPRequest) GetErrorMessage() string { @@ -470,8 +470,8 @@ func (m *EvacuateCrashedActualLRPRequest) SetErrorMessage(value string) { } func (x *EvacuateCrashedActualLRPRequest) ToProto() *ProtoEvacuateCrashedActualLRPRequest { proto := &ProtoEvacuateCrashedActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), ErrorMessage: x.ErrorMessage, } return proto @@ -487,8 +487,8 @@ func EvacuateCrashedActualLRPRequestProtoMap(values []*EvacuateCrashedActualLRPR // Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPRequest directly type RemoveEvacuatingActualLRPRequest struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey } func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { @@ -513,40 +513,40 @@ func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } return true } -func (m *RemoveEvacuatingActualLRPRequest) GetActualLRPKey() *ActualLRPKey { +func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *RemoveEvacuatingActualLRPRequest) SetActualLRPKey(value *ActualLRPKey) { +func (m *RemoveEvacuatingActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *RemoveEvacuatingActualLRPRequest) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *RemoveEvacuatingActualLRPRequest) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *RemoveEvacuatingActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (x *RemoveEvacuatingActualLRPRequest) ToProto() *ProtoRemoveEvacuatingActualLRPRequest { proto := &ProtoRemoveEvacuatingActualLRPRequest{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), } return proto } diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 5f730cc4..2066fcae 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -8,7 +8,7 @@ package models // Prevent copylock errors when using ProtoActualLRPCreatedEvent directly type ActualLRPCreatedEvent struct { - ActualLRPGroup *ActualLRPGroup + ActualLrpGroup *ActualLRPGroup } func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { @@ -33,25 +33,25 @@ func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLRPGroup.Equal(that1.ActualLRPGroup) { + if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { return false } return true } -func (m *ActualLRPCreatedEvent) GetActualLRPGroup() *ActualLRPGroup { +func (m *ActualLRPCreatedEvent) GetActualLrpGroup() *ActualLRPGroup { if m != nil { - return m.ActualLRPGroup + return m.ActualLrpGroup } return nil } -func (m *ActualLRPCreatedEvent) SetActualLRPGroup(value *ActualLRPGroup) { +func (m *ActualLRPCreatedEvent) SetActualLrpGroup(value *ActualLRPGroup) { if m != nil { - m.ActualLRPGroup = value + m.ActualLrpGroup = value } } func (x *ActualLRPCreatedEvent) ToProto() *ProtoActualLRPCreatedEvent { proto := &ProtoActualLRPCreatedEvent{ - ActualLrpGroup: x.ActualLRPGroup.ToProto(), + ActualLrpGroup: x.ActualLrpGroup.ToProto(), } return proto } @@ -140,7 +140,7 @@ func ActualLRPChangedEventProtoMap(values []*ActualLRPChangedEvent) []*ProtoActu // Prevent copylock errors when using ProtoActualLRPRemovedEvent directly type ActualLRPRemovedEvent struct { - ActualLRPGroup *ActualLRPGroup + ActualLrpGroup *ActualLRPGroup } func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { @@ -165,25 +165,25 @@ func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLRPGroup.Equal(that1.ActualLRPGroup) { + if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { return false } return true } -func (m *ActualLRPRemovedEvent) GetActualLRPGroup() *ActualLRPGroup { +func (m *ActualLRPRemovedEvent) GetActualLrpGroup() *ActualLRPGroup { if m != nil { - return m.ActualLRPGroup + return m.ActualLrpGroup } return nil } -func (m *ActualLRPRemovedEvent) SetActualLRPGroup(value *ActualLRPGroup) { +func (m *ActualLRPRemovedEvent) SetActualLrpGroup(value *ActualLRPGroup) { if m != nil { - m.ActualLRPGroup = value + m.ActualLrpGroup = value } } func (x *ActualLRPRemovedEvent) ToProto() *ProtoActualLRPRemovedEvent { proto := &ProtoActualLRPRemovedEvent{ - ActualLrpGroup: x.ActualLRPGroup.ToProto(), + ActualLrpGroup: x.ActualLrpGroup.ToProto(), } return proto } @@ -198,7 +198,7 @@ func ActualLRPRemovedEventProtoMap(values []*ActualLRPRemovedEvent) []*ProtoActu // Prevent copylock errors when using ProtoActualLRPInstanceCreatedEvent directly type ActualLRPInstanceCreatedEvent struct { - ActualLRP *ActualLRP + ActualLrp *ActualLRP TraceId string } @@ -224,7 +224,7 @@ func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLRP.Equal(that1.ActualLRP) { + if !this.ActualLrp.Equal(that1.ActualLrp) { return false } if this.TraceId != that1.TraceId { @@ -232,15 +232,15 @@ func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInstanceCreatedEvent) GetActualLRP() *ActualLRP { +func (m *ActualLRPInstanceCreatedEvent) GetActualLrp() *ActualLRP { if m != nil { - return m.ActualLRP + return m.ActualLrp } return nil } -func (m *ActualLRPInstanceCreatedEvent) SetActualLRP(value *ActualLRP) { +func (m *ActualLRPInstanceCreatedEvent) SetActualLrp(value *ActualLRP) { if m != nil { - m.ActualLRP = value + m.ActualLrp = value } } func (m *ActualLRPInstanceCreatedEvent) GetTraceId() string { @@ -256,7 +256,7 @@ func (m *ActualLRPInstanceCreatedEvent) SetTraceId(value string) { } func (x *ActualLRPInstanceCreatedEvent) ToProto() *ProtoActualLRPInstanceCreatedEvent { proto := &ProtoActualLRPInstanceCreatedEvent{ - ActualLrp: x.ActualLRP.ToProto(), + ActualLrp: x.ActualLrp.ToProto(), TraceId: x.TraceId, } return proto @@ -272,7 +272,7 @@ func ActualLRPInstanceCreatedEventProtoMap(values []*ActualLRPInstanceCreatedEve // Prevent copylock errors when using ProtoActualLRPInfo directly type ActualLRPInfo struct { - ActualLRPNetInfo *ActualLRPNetInfo + ActualLrpNetInfo *ActualLRPNetInfo CrashCount int32 CrashReason string State string @@ -306,7 +306,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { return false } - if !this.ActualLRPNetInfo.Equal(that1.ActualLRPNetInfo) { + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -338,15 +338,15 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInfo) GetActualLRPNetInfo() *ActualLRPNetInfo { +func (m *ActualLRPInfo) GetActualLrpNetInfo() *ActualLRPNetInfo { if m != nil { - return m.ActualLRPNetInfo + return m.ActualLrpNetInfo } return nil } -func (m *ActualLRPInfo) SetActualLRPNetInfo(value *ActualLRPNetInfo) { +func (m *ActualLRPInfo) SetActualLrpNetInfo(value *ActualLRPNetInfo) { if m != nil { - m.ActualLRPNetInfo = value + m.ActualLrpNetInfo = value } } func (m *ActualLRPInfo) GetCrashCount() int32 { @@ -453,7 +453,7 @@ func (m *ActualLRPInfo) SetAvailabilityZone(value string) { } func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { proto := &ProtoActualLRPInfo{ - ActualLrpNetInfo: x.ActualLRPNetInfo.ToProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, State: x.State, @@ -477,8 +477,8 @@ func ActualLRPInfoProtoMap(values []*ActualLRPInfo) []*ProtoActualLRPInfo { // Prevent copylock errors when using ProtoActualLRPInstanceChangedEvent directly type ActualLRPInstanceChangedEvent struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey Before *ActualLRPInfo After *ActualLRPInfo TraceId string @@ -506,10 +506,10 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } if !this.Before.Equal(that1.Before) { @@ -523,26 +523,26 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInstanceChangedEvent) GetActualLRPKey() *ActualLRPKey { +func (m *ActualLRPInstanceChangedEvent) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *ActualLRPInstanceChangedEvent) SetActualLRPKey(value *ActualLRPKey) { +func (m *ActualLRPInstanceChangedEvent) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *ActualLRPInstanceChangedEvent) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *ActualLRPInstanceChangedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *ActualLRPInstanceChangedEvent) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRPInstanceChangedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (m *ActualLRPInstanceChangedEvent) GetBefore() *ActualLRPInfo { @@ -580,8 +580,8 @@ func (m *ActualLRPInstanceChangedEvent) SetTraceId(value string) { } func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChangedEvent { proto := &ProtoActualLRPInstanceChangedEvent{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), Before: x.Before.ToProto(), After: x.After.ToProto(), TraceId: x.TraceId, @@ -599,7 +599,7 @@ func ActualLRPInstanceChangedEventProtoMap(values []*ActualLRPInstanceChangedEve // Prevent copylock errors when using ProtoActualLRPInstanceRemovedEvent directly type ActualLRPInstanceRemovedEvent struct { - ActualLRP *ActualLRP + ActualLrp *ActualLRP TraceId string } @@ -625,7 +625,7 @@ func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLRP.Equal(that1.ActualLRP) { + if !this.ActualLrp.Equal(that1.ActualLrp) { return false } if this.TraceId != that1.TraceId { @@ -633,15 +633,15 @@ func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInstanceRemovedEvent) GetActualLRP() *ActualLRP { +func (m *ActualLRPInstanceRemovedEvent) GetActualLrp() *ActualLRP { if m != nil { - return m.ActualLRP + return m.ActualLrp } return nil } -func (m *ActualLRPInstanceRemovedEvent) SetActualLRP(value *ActualLRP) { +func (m *ActualLRPInstanceRemovedEvent) SetActualLrp(value *ActualLRP) { if m != nil { - m.ActualLRP = value + m.ActualLrp = value } } func (m *ActualLRPInstanceRemovedEvent) GetTraceId() string { @@ -657,7 +657,7 @@ func (m *ActualLRPInstanceRemovedEvent) SetTraceId(value string) { } func (x *ActualLRPInstanceRemovedEvent) ToProto() *ProtoActualLRPInstanceRemovedEvent { proto := &ProtoActualLRPInstanceRemovedEvent{ - ActualLrp: x.ActualLRP.ToProto(), + ActualLrp: x.ActualLrp.ToProto(), TraceId: x.TraceId, } return proto @@ -673,7 +673,7 @@ func ActualLRPInstanceRemovedEventProtoMap(values []*ActualLRPInstanceRemovedEve // Prevent copylock errors when using ProtoDesiredLRPCreatedEvent directly type DesiredLRPCreatedEvent struct { - DesiredLRP *DesiredLRP + DesiredLrp *DesiredLRP TraceId string } @@ -699,7 +699,7 @@ func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLRP.Equal(that1.DesiredLRP) { + if !this.DesiredLrp.Equal(that1.DesiredLrp) { return false } if this.TraceId != that1.TraceId { @@ -707,15 +707,15 @@ func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPCreatedEvent) GetDesiredLRP() *DesiredLRP { +func (m *DesiredLRPCreatedEvent) GetDesiredLrp() *DesiredLRP { if m != nil { - return m.DesiredLRP + return m.DesiredLrp } return nil } -func (m *DesiredLRPCreatedEvent) SetDesiredLRP(value *DesiredLRP) { +func (m *DesiredLRPCreatedEvent) SetDesiredLrp(value *DesiredLRP) { if m != nil { - m.DesiredLRP = value + m.DesiredLrp = value } } func (m *DesiredLRPCreatedEvent) GetTraceId() string { @@ -731,7 +731,7 @@ func (m *DesiredLRPCreatedEvent) SetTraceId(value string) { } func (x *DesiredLRPCreatedEvent) ToProto() *ProtoDesiredLRPCreatedEvent { proto := &ProtoDesiredLRPCreatedEvent{ - DesiredLrp: x.DesiredLRP.ToProto(), + DesiredLrp: x.DesiredLrp.ToProto(), TraceId: x.TraceId, } return proto @@ -837,7 +837,7 @@ func DesiredLRPChangedEventProtoMap(values []*DesiredLRPChangedEvent) []*ProtoDe // Prevent copylock errors when using ProtoDesiredLRPRemovedEvent directly type DesiredLRPRemovedEvent struct { - DesiredLRP *DesiredLRP + DesiredLrp *DesiredLRP TraceId string } @@ -863,7 +863,7 @@ func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLRP.Equal(that1.DesiredLRP) { + if !this.DesiredLrp.Equal(that1.DesiredLrp) { return false } if this.TraceId != that1.TraceId { @@ -871,15 +871,15 @@ func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPRemovedEvent) GetDesiredLRP() *DesiredLRP { +func (m *DesiredLRPRemovedEvent) GetDesiredLrp() *DesiredLRP { if m != nil { - return m.DesiredLRP + return m.DesiredLrp } return nil } -func (m *DesiredLRPRemovedEvent) SetDesiredLRP(value *DesiredLRP) { +func (m *DesiredLRPRemovedEvent) SetDesiredLrp(value *DesiredLRP) { if m != nil { - m.DesiredLRP = value + m.DesiredLrp = value } } func (m *DesiredLRPRemovedEvent) GetTraceId() string { @@ -895,7 +895,7 @@ func (m *DesiredLRPRemovedEvent) SetTraceId(value string) { } func (x *DesiredLRPRemovedEvent) ToProto() *ProtoDesiredLRPRemovedEvent { proto := &ProtoDesiredLRPRemovedEvent{ - DesiredLrp: x.DesiredLRP.ToProto(), + DesiredLrp: x.DesiredLrp.ToProto(), TraceId: x.TraceId, } return proto @@ -911,8 +911,8 @@ func DesiredLRPRemovedEventProtoMap(values []*DesiredLRPRemovedEvent) []*ProtoDe // Prevent copylock errors when using ProtoActualLRPCrashedEvent directly type ActualLRPCrashedEvent struct { - ActualLRPKey *ActualLRPKey - ActualLRPInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey + ActualLrpInstanceKey *ActualLRPInstanceKey CrashCount int32 CrashReason string Since int64 @@ -940,10 +940,10 @@ func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLRPKey.Equal(that1.ActualLRPKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLRPInstanceKey.Equal(that1.ActualLRPInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } if this.CrashCount != that1.CrashCount { @@ -957,26 +957,26 @@ func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPCrashedEvent) GetActualLRPKey() *ActualLRPKey { +func (m *ActualLRPCrashedEvent) GetActualLrpKey() *ActualLRPKey { if m != nil { - return m.ActualLRPKey + return m.ActualLrpKey } return nil } -func (m *ActualLRPCrashedEvent) SetActualLRPKey(value *ActualLRPKey) { +func (m *ActualLRPCrashedEvent) SetActualLrpKey(value *ActualLRPKey) { if m != nil { - m.ActualLRPKey = value + m.ActualLrpKey = value } } -func (m *ActualLRPCrashedEvent) GetActualLRPInstanceKey() *ActualLRPInstanceKey { +func (m *ActualLRPCrashedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { if m != nil { - return m.ActualLRPInstanceKey + return m.ActualLrpInstanceKey } return nil } -func (m *ActualLRPCrashedEvent) SetActualLRPInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRPCrashedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { if m != nil { - m.ActualLRPInstanceKey = value + m.ActualLrpInstanceKey = value } } func (m *ActualLRPCrashedEvent) GetCrashCount() int32 { @@ -1014,8 +1014,8 @@ func (m *ActualLRPCrashedEvent) SetSince(value int64) { } func (x *ActualLRPCrashedEvent) ToProto() *ProtoActualLRPCrashedEvent { proto := &ProtoActualLRPCrashedEvent{ - ActualLrpKey: x.ActualLRPKey.ToProto(), - ActualLrpInstanceKey: x.ActualLRPInstanceKey.ToProto(), + ActualLrpKey: x.ActualLrpKey.ToProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, Since: x.Since, diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 75f9059a..9ea82a97 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -36,9 +36,9 @@ func getCopysafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) (string, func getFieldName(goName string) string { result := goName - if strings.Contains(strings.ToLower(result), "lrp") { - result = strings.Replace(goName, "Lrp", "LRP", -1) - } + // if strings.Contains(strings.ToLower(result), "lrp") { + // result = strings.Replace(goName, "Lrp", "LRP", -1) + // } return result } From debcf87b9618dba2f2a6b191f3033053387b4630 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 17:50:46 +0000 Subject: [PATCH 040/155] Pointer changes due to optional field support --- models/actions.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/models/actions.go b/models/actions.go index c2e36094..22d29247 100644 --- a/models/actions.go +++ b/models/actions.go @@ -538,10 +538,10 @@ func (l *ResourceLimits) UnmarshalJSON(data []byte) error { } if limit.Nofile != nil { - l.SetNofile(*limit.Nofile) + l.SetNofile(limit.Nofile) } if limit.Nproc != nil { - l.SetNproc(*limit.Nproc) + l.SetNproc(limit.Nproc) } return nil @@ -549,9 +549,14 @@ func (l *ResourceLimits) UnmarshalJSON(data []byte) error { func (l ResourceLimits) MarshalJSON() ([]byte, error) { var limit internalResourceLimits - n := l.GetNofile() - limit.Nofile = &n - p := l.GetNproc() - limit.Nproc = &p + if l.NofileExists() { + n := l.GetNofile() + limit.Nofile = n + } + if l.NprocExists() { + + n := l.GetNproc() + limit.Nproc = n + } return json.Marshal(limit) } From e869bc75135761a22794e50f25211c6c01123b24 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 17:52:11 +0000 Subject: [PATCH 041/155] Field name standardization on ActualLrp* --- models/actual_lrp.go | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/models/actual_lrp.go b/models/actual_lrp.go index 37249e15..aa6f15dd 100644 --- a/models/actual_lrp.go +++ b/models/actual_lrp.go @@ -125,7 +125,7 @@ func (actual ActualLRP) CellIsMissing(cellSet CellSet) bool { return false } - return !cellSet.HasCellID(actual.GetActualLRPInstanceKey().CellId) + return !cellSet.HasCellID(actual.GetActualLrpInstanceKey().CellId) } func (actual ActualLRP) ShouldRestartImmediately(calc RestartCalculator) bool { @@ -145,7 +145,7 @@ func (actual ActualLRP) ShouldRestartCrash(now time.Time, calc RestartCalculator } func (before ActualLRP) AllowsTransitionTo(lrpKey *ActualLRPKey, instanceKey *ActualLRPInstanceKey, newState string) bool { - if !before.ActualLRPKey.Equal(lrpKey) { + if !before.ActualLrpKey.Equal(lrpKey) { return false } @@ -157,18 +157,18 @@ func (before ActualLRP) AllowsTransitionTo(lrpKey *ActualLRPKey, instanceKey *Ac newState == ActualLRPStateRunning case ActualLRPStateClaimed: valid = newState == ActualLRPStateUnclaimed && instanceKey.Empty() || - newState == ActualLRPStateClaimed && before.ActualLRPInstanceKey.Equal(instanceKey) || + newState == ActualLRPStateClaimed && before.ActualLrpInstanceKey.Equal(instanceKey) || newState == ActualLRPStateRunning || - newState == ActualLRPStateCrashed && before.ActualLRPInstanceKey.Equal(instanceKey) + newState == ActualLRPStateCrashed && before.ActualLrpInstanceKey.Equal(instanceKey) case ActualLRPStateRunning: valid = newState == ActualLRPStateUnclaimed && instanceKey.Empty() || - newState == ActualLRPStateClaimed && before.ActualLRPInstanceKey.Equal(instanceKey) || - newState == ActualLRPStateRunning && before.ActualLRPInstanceKey.Equal(instanceKey) || - newState == ActualLRPStateCrashed && before.ActualLRPInstanceKey.Equal(instanceKey) + newState == ActualLRPStateClaimed && before.ActualLrpInstanceKey.Equal(instanceKey) || + newState == ActualLRPStateRunning && before.ActualLrpInstanceKey.Equal(instanceKey) || + newState == ActualLRPStateCrashed && before.ActualLrpInstanceKey.Equal(instanceKey) case ActualLRPStateCrashed: valid = newState == ActualLRPStateUnclaimed && instanceKey.Empty() || - newState == ActualLRPStateClaimed && before.ActualLRPInstanceKey.Equal(instanceKey) || - newState == ActualLRPStateRunning && before.ActualLRPInstanceKey.Equal(instanceKey) + newState == ActualLRPStateClaimed && before.ActualLrpInstanceKey.Equal(instanceKey) || + newState == ActualLRPStateRunning && before.ActualLrpInstanceKey.Equal(instanceKey) } return valid @@ -227,7 +227,7 @@ func (group ActualLRPGroup) Resolve() (*ActualLRP, bool, error) { func NewUnclaimedActualLRP(lrpKey ActualLRPKey, since int64) *ActualLRP { return &ActualLRP{ - ActualLRPKey: lrpKey, + ActualLrpKey: &lrpKey, State: ActualLRPStateUnclaimed, Since: since, } @@ -235,8 +235,8 @@ func NewUnclaimedActualLRP(lrpKey ActualLRPKey, since int64) *ActualLRP { func NewClaimedActualLRP(lrpKey ActualLRPKey, instanceKey ActualLRPInstanceKey, since int64) *ActualLRP { return &ActualLRP{ - ActualLRPKey: lrpKey, - ActualLRPInstanceKey: instanceKey, + ActualLrpKey: &lrpKey, + ActualLrpInstanceKey: &instanceKey, State: ActualLRPStateClaimed, Since: since, } @@ -244,9 +244,9 @@ func NewClaimedActualLRP(lrpKey ActualLRPKey, instanceKey ActualLRPInstanceKey, func NewRunningActualLRP(lrpKey ActualLRPKey, instanceKey ActualLRPInstanceKey, netInfo ActualLRPNetInfo, since int64) *ActualLRP { return &ActualLRP{ - ActualLRPKey: lrpKey, - ActualLRPInstanceKey: instanceKey, - ActualLRPNetInfo: netInfo, + ActualLrpKey: &lrpKey, + ActualLrpInstanceKey: &instanceKey, + ActualLrpNetInfo: &netInfo, State: ActualLRPStateRunning, Since: since, } @@ -261,9 +261,9 @@ func (actualLRPInfo *ActualLRPInfo) ToActualLRP(lrpKey ActualLRPKey, lrpInstance return nil } lrp := ActualLRP{ - ActualLRPKey: lrpKey, - ActualLRPInstanceKey: lrpInstanceKey, - ActualLRPNetInfo: actualLRPInfo.ActualLRPNetInfo, + ActualLrpKey: &lrpKey, + ActualLrpInstanceKey: &lrpInstanceKey, + ActualLrpNetInfo: actualLRPInfo.ActualLrpNetInfo, AvailabilityZone: actualLRPInfo.AvailabilityZone, CrashCount: actualLRPInfo.CrashCount, CrashReason: actualLRPInfo.CrashReason, @@ -286,7 +286,7 @@ func (actual *ActualLRP) ToActualLRPInfo() *ActualLRPInfo { return nil } info := ActualLRPInfo{ - ActualLRPNetInfo: actual.ActualLRPNetInfo, + ActualLrpNetInfo: actual.ActualLrpNetInfo, AvailabilityZone: actual.AvailabilityZone, CrashCount: actual.CrashCount, CrashReason: actual.CrashReason, @@ -320,7 +320,7 @@ func (actual *ActualLRP) ToActualLRPGroup() *ActualLRPGroup { func (actual ActualLRP) Validate() error { var validationError ValidationError - err := actual.ActualLRPKey.Validate() + err := actual.ActualLrpKey.Validate() if err != nil { validationError = validationError.Append(err) } @@ -331,10 +331,10 @@ func (actual ActualLRP) Validate() error { switch actual.State { case ActualLRPStateUnclaimed: - if !actual.ActualLRPInstanceKey.Empty() { + if !actual.ActualLrpInstanceKey.Empty() { validationError = validationError.Append(errors.New("instance key cannot be set when state is unclaimed")) } - if !actual.ActualLRPNetInfo.Empty() { + if !actual.ActualLrpNetInfo.Empty() { validationError = validationError.Append(errors.New("net info cannot be set when state is unclaimed")) } if actual.Presence != ActualLRP_Ordinary { @@ -342,10 +342,10 @@ func (actual ActualLRP) Validate() error { } case ActualLRPStateClaimed: - if err := actual.ActualLRPInstanceKey.Validate(); err != nil { + if err := actual.ActualLrpInstanceKey.Validate(); err != nil { validationError = validationError.Append(err) } - if !actual.ActualLRPNetInfo.Empty() { + if !actual.ActualLrpNetInfo.Empty() { validationError = validationError.Append(errors.New("net info cannot be set when state is claimed")) } if strings.TrimSpace(actual.PlacementError) != "" { @@ -353,10 +353,10 @@ func (actual ActualLRP) Validate() error { } case ActualLRPStateRunning: - if err := actual.ActualLRPInstanceKey.Validate(); err != nil { + if err := actual.ActualLrpInstanceKey.Validate(); err != nil { validationError = validationError.Append(err) } - if err := actual.ActualLRPNetInfo.Validate(); err != nil { + if err := actual.ActualLrpNetInfo.Validate(); err != nil { validationError = validationError.Append(err) } if strings.TrimSpace(actual.PlacementError) != "" { @@ -364,10 +364,10 @@ func (actual ActualLRP) Validate() error { } case ActualLRPStateCrashed: - if !actual.ActualLRPInstanceKey.Empty() { + if !actual.ActualLrpInstanceKey.Empty() { validationError = validationError.Append(errors.New("instance key cannot be set when state is crashed")) } - if !actual.ActualLRPNetInfo.Empty() { + if !actual.ActualLrpNetInfo.Empty() { validationError = validationError.Append(errors.New("net info cannot be set when state is crashed")) } if strings.TrimSpace(actual.PlacementError) != "" { @@ -478,14 +478,14 @@ func ResolveActualLRPGroups(lrps []*ActualLRP) []*ActualLRPGroup { // one for the evacuating. When building the list of actual LRP groups (where // a group is the instance and corresponding evacuating), make sure we don't add the same // actual lrp twice. - if mapOfGroups[actualLRP.ActualLRPKey] == nil { - mapOfGroups[actualLRP.ActualLRPKey] = &ActualLRPGroup{} - result = append(result, mapOfGroups[actualLRP.ActualLRPKey]) + if mapOfGroups[*actualLRP.ActualLrpKey] == nil { + mapOfGroups[*actualLRP.ActualLrpKey] = &ActualLRPGroup{} + result = append(result, mapOfGroups[*actualLRP.ActualLrpKey]) } if actualLRP.Presence == ActualLRP_Evacuating { - mapOfGroups[actualLRP.ActualLRPKey].Evacuating = actualLRP - } else if hasHigherPriority(actualLRP, mapOfGroups[actualLRP.ActualLRPKey].Instance) { - mapOfGroups[actualLRP.ActualLRPKey].Instance = actualLRP + mapOfGroups[*actualLRP.ActualLrpKey].Evacuating = actualLRP + } else if hasHigherPriority(actualLRP, mapOfGroups[*actualLRP.ActualLrpKey].Instance) { + mapOfGroups[*actualLRP.ActualLrpKey].Instance = actualLRP } } From 2c6e663d4b2ae81c7ea0900ecdacc73f1996774d Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 2 May 2024 17:54:32 +0000 Subject: [PATCH 042/155] Pointer changes due to optional field support --- models/actual_lrp_requests.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/actual_lrp_requests.go b/models/actual_lrp_requests.go index 974605f1..1b64ac28 100644 --- a/models/actual_lrp_requests.go +++ b/models/actual_lrp_requests.go @@ -23,7 +23,7 @@ func (request *ActualLRPsRequest) UnmarshalJSON(data []byte) error { request.CellId = internalRequest.CellId request.ProcessGuid = internalRequest.ProcessGuid if internalRequest.Index != nil { - request.SetIndex(*internalRequest.Index) + request.SetIndex(internalRequest.Index) } return nil @@ -37,7 +37,7 @@ func (request ActualLRPsRequest) MarshalJSON() ([]byte, error) { } i := request.GetIndex() - internalRequest.Index = &i + internalRequest.Index = i return json.Marshal(internalRequest) } From 4e0311e0d4897f02fb5517029f3851043351aa27 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 16:04:49 +0000 Subject: [PATCH 043/155] Use type name instead of field name when generating an enum cast --- protoc-gen-go-bbs/bbs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 9ea82a97..02d268cb 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -365,7 +365,7 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog g.P(protoFieldName, ": x.", getFieldName(protoFieldName), ".ToProto(),") } } else if field.Enum != nil { - g.P(protoFieldName, ": ", field.GoIdent, "(x.", protoFieldName, "),") + g.P(protoFieldName, ": ", *prefix, getActualType(g, field), "(x.", protoFieldName, "),") } else { // we weren't using oneof correctly, so we're not going to support it // if field.Oneof != nil { From f9a6d84b7e6c7535549186844bad197c51359154 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 16:05:20 +0000 Subject: [PATCH 044/155] Default value for repeated fields (arrays/slices) is nil --- protoc-gen-go-bbs/bbs.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 02d268cb..ad6ce457 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -204,6 +204,10 @@ func genSetter(g *protogen.GeneratedFile, copysafeName string, fieldName string, } func getDefaultValueString(field *protogen.Field) string { + if field.Desc.Cardinality() == protoreflect.Repeated { + return "nil" + } + switch kind := field.Desc.Kind(); kind { case protoreflect.BytesKind, protoreflect.GroupKind, protoreflect.MessageKind: return "nil" From 4383de6f3166802d2e018ab45d7c41dca8db427e Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 16:53:36 +0000 Subject: [PATCH 045/155] Add support for map values with a protogen'd message type Add ProtoMap function for conversion between our map and the default protogen map --- protoc-gen-go-bbs/bbs.go | 45 +++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index ad6ce457..20a894a2 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -239,11 +239,15 @@ func getActualType(g *protogen.GeneratedFile, field *protogen.Field) string { if *debug { log.Printf("Map Field Detected: %+v\n\n", field.Message) } - mapValueType := field.Desc.MapValue().Kind().String() - if mapValueType == protoreflect.BytesKind.String() { + mapValueKind := field.Desc.MapValue().Kind() + mapValueType := mapValueKind.String() + if mapValueKind == protoreflect.BytesKind { mapValueType = "[]byte" - } else if mapValueType == protoreflect.MessageKind.String() { - mapValueType = "*" + string(field.Desc.MapValue().Message().Name()) + } else if mapValueKind == protoreflect.MessageKind { + valueField := field.Desc.MapValue().Message().FullName() + rawGoIdent := strings.Split(string(valueField), ".") + valueFieldType, _ := strings.CutPrefix(rawGoIdent[1], *prefix) + mapValueType = "*" + valueFieldType } fieldType = "map[" + field.Desc.MapKey().Kind().String() + "]" + mapValueType @@ -361,7 +365,12 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog if field.Desc.IsList() { g.P(protoFieldName, ": ", fieldCopysafeName, "ProtoMap(x.", getFieldName(protoFieldName), "),") } else if field.Desc.IsMap() { - g.P(protoFieldName, ": ", "x.", protoFieldName, ",") + mapValueKind := field.Desc.MapValue().Kind() + if mapValueKind == protoreflect.MessageKind { + g.P(protoFieldName, ": ", copysafeName, getFieldName(protoFieldName), "ProtoMap(x.", protoFieldName, "),") + } else { + g.P(protoFieldName, ": ", "x.", protoFieldName, ",") + } } else { panic("Unrecognized Repeated field found") } @@ -397,6 +406,32 @@ func (bbsGenerateHelper) genProtoMapMethod(g *protogen.GeneratedFile, msg *proto g.P("return result") g.P("}") g.P() + + for _, field := range msg.Fields { + if field.Desc.IsMap() { + mapValueKind := field.Desc.MapValue().Kind() + if mapValueKind == protoreflect.MessageKind { + valueField := field.Desc.MapValue().Message().FullName() + rawGoIdent := strings.Split(string(valueField), ".") + protoValueFieldType := rawGoIdent[1] + valueFieldType, _ := strings.CutPrefix(protoValueFieldType, *prefix) + mapValueType := "*" + valueFieldType + mapKeyType := field.Desc.MapKey().Kind().String() + fieldType := "map[" + mapKeyType + "]" + mapValueType + protoMapValueType := "*" + protoValueFieldType + protoFieldType := "map[" + mapKeyType + "]" + protoMapValueType + + g.P("func ", copysafeName, getFieldName(field.GoName), "ProtoMap(values ", fieldType, ") ", protoFieldType, " {") + g.P("result := make(map[", mapKeyType, "]*", protoValueFieldType, ", len(values))") + g.P("for i, val := range values {") + g.P("result[i] = val.ToProto()") + g.P("}") + g.P("return result") + g.P("}") + g.P() + } + } + } } } From aab5a8aaa54e7097317ac46bbe0032b74ebfd160 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 16:55:17 +0000 Subject: [PATCH 046/155] Don't need Proto prefix for string types --- models/desired_lrp.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 50ad3f3d..ed9f031e 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -28,7 +28,7 @@ message ProtoDesiredLRPSchedulingInfo { ProtoRoutes routes = 5; ProtoModificationTag modification_tag = 6; ProtoVolumePlacement volume_placement = 7; - repeated string ProtoPlacementTags = 8 [json_name ="placement_tags"]; + repeated string PlacementTags = 8 [json_name ="placement_tags"]; } message ProtoDesiredLRPRunInfo { @@ -127,7 +127,7 @@ message ProtoDesiredLRP { string trusted_system_certificates_path = 24; repeated ProtoVolumeMount volume_mounts = 25; ProtoNetwork network = 26; - repeated string ProtoPlacementTags = 28 [json_name ="placement_tags"]; + repeated string PlacementTags = 28 [json_name ="placement_tags"]; int32 max_pids = 29 [json_name = "max_pids"]; optional ProtoCertificateProperties certificate_properties = 30; From 45e6e425c35558e82265bc9d750c66f7fb9488b1 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 16:55:40 +0000 Subject: [PATCH 047/155] Fix type on enumvalue_customname Regen protos --- models/desired_lrp.pb.go | 534 ++++++++++++++++---------------- models/desired_lrp_bbs.pb.go | 88 ++++-- models/events_bbs.pb.go | 2 +- models/image_layer_bbs.pb.go | 2 +- models/metric_tags.pb.go | 24 +- models/metric_tags.proto | 4 +- models/metric_tags_bbs.pb.go | 8 +- models/security_group_bbs.pb.go | 2 +- models/task_bbs.pb.go | 16 +- 9 files changed, 356 insertions(+), 324 deletions(-) diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 2bdf9d80..ea08455f 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -32,7 +32,7 @@ type ProtoDesiredLRPSchedulingInfo struct { Routes *ProtoRoutes `protobuf:"bytes,5,opt,name=routes,proto3" json:"routes,omitempty"` ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag,omitempty"` VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,json=volumePlacement,proto3" json:"volume_placement,omitempty"` - ProtoPlacementTags []string `protobuf:"bytes,8,rep,name=ProtoPlacementTags,json=placement_tags,proto3" json:"ProtoPlacementTags,omitempty"` + PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` } func (x *ProtoDesiredLRPSchedulingInfo) Reset() { @@ -116,9 +116,9 @@ func (x *ProtoDesiredLRPSchedulingInfo) GetVolumePlacement() *ProtoVolumePlaceme return nil } -func (x *ProtoDesiredLRPSchedulingInfo) GetProtoPlacementTags() []string { +func (x *ProtoDesiredLRPSchedulingInfo) GetPlacementTags() []string { if x != nil { - return x.ProtoPlacementTags + return x.PlacementTags } return nil } @@ -672,7 +672,7 @@ type ProtoDesiredLRP struct { TrustedSystemCertificatesPath string `protobuf:"bytes,24,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,25,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` Network *ProtoNetwork `protobuf:"bytes,26,opt,name=network,proto3" json:"network,omitempty"` - ProtoPlacementTags []string `protobuf:"bytes,28,rep,name=ProtoPlacementTags,json=placement_tags,proto3" json:"ProtoPlacementTags,omitempty"` + PlacementTags []string `protobuf:"bytes,28,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` MaxPids int32 `protobuf:"varint,29,opt,name=max_pids,proto3" json:"max_pids,omitempty"` CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,30,opt,name=certificate_properties,json=certificateProperties,proto3,oneof" json:"certificate_properties,omitempty"` ImageUsername string `protobuf:"bytes,31,opt,name=image_username,json=imageUsername,proto3" json:"image_username,omitempty"` @@ -908,9 +908,9 @@ func (x *ProtoDesiredLRP) GetNetwork() *ProtoNetwork { return nil } -func (x *ProtoDesiredLRP) GetProtoPlacementTags() []string { +func (x *ProtoDesiredLRP) GetPlacementTags() []string { if x != nil { - return x.ProtoPlacementTags + return x.PlacementTags } return nil } @@ -1000,7 +1000,7 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xdf, 0x03, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x74, 0x6f, 0x22, 0xda, 0x03, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x42, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, @@ -1027,279 +1027,279 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, - 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x22, 0xbd, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x42, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, - 0x4b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, - 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, - 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, - 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, - 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, - 0x12, 0x35, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, - 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, - 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, - 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, - 0x18, 0x09, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, - 0x73, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, - 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, - 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, - 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, - 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, - 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, - 0x75, 0x73, 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, - 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, - 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, - 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, - 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, - 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, + 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x22, + 0xbd, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x42, 0x0a, 0x0f, 0x64, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, + 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x44, + 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, + 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, + 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, + 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, + 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, 0x64, + 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, + 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, + 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, + 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, + 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x41, 0x0a, 0x0c, + 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, + 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, + 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, + 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, + 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, + 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, + 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, + 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, + 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, + 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, + 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, + 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, + 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, + 0x73, 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, + 0x01, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, + 0x47, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, + 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, + 0x79, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, + 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, + 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, + 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, + 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, + 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, + 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0xe5, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, + 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, + 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, + 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x12, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, + 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1a, 0x0a, + 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, 0x01, 0x0a, 0x17, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, + 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, + 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x17, 0x0a, + 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, + 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, + 0x64, 0x73, 0x22, 0x83, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, + 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, + 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, + 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, + 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, + 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, + 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, + 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, 0x70, + 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, + 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, + 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x09, 0x6d, + 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, + 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, + 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, + 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, + 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, + 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, + 0x72, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, + 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, + 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, + 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, + 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, + 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, + 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, + 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, + 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, + 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, + 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, + 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, + 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, + 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, + 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x15, 0x63, 0x65, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, - 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, + 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, - 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, + 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, - 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, + 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, - 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, - 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, - 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, - 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, - 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, - 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe5, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, - 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, - 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, - 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, - 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, - 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, - 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x88, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, - 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, - 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, - 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, - 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, - 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, - 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, - 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, - 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, - 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, - 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, - 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, - 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, - 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, - 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, - 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, - 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x00, 0x52, - 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, - 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, - 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, - 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, - 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, - 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, - 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, - 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, - 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, - 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, - 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, - 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, - 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, - 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, - 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, - 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, - 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, - 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, - 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, - 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, - 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, - 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, - 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, - 0x65, 0x72, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, - 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, - 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, - 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, - 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, - 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, - 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, + 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, + 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, + 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, + 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, + 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 923fda75..86233162 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -19,7 +19,7 @@ type DesiredLRPSchedulingInfo struct { Routes *Routes ModificationTag *ModificationTag VolumePlacement *VolumePlacement - ProtoPlacementTags []string + PlacementTags []string } func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { @@ -65,11 +65,11 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if !this.VolumePlacement.Equal(that1.VolumePlacement) { return false } - if len(this.ProtoPlacementTags) != len(that1.ProtoPlacementTags) { + if len(this.PlacementTags) != len(that1.PlacementTags) { return false } - for i := range this.ProtoPlacementTags { - if this.ProtoPlacementTags[i] != that1.ProtoPlacementTags[i] { + for i := range this.PlacementTags { + if this.PlacementTags[i] != that1.PlacementTags[i] { return false } } @@ -152,15 +152,15 @@ func (m *DesiredLRPSchedulingInfo) SetVolumePlacement(value *VolumePlacement) { m.VolumePlacement = value } } -func (m *DesiredLRPSchedulingInfo) GetProtoPlacementTags() []string { +func (m *DesiredLRPSchedulingInfo) GetPlacementTags() []string { if m != nil { - return m.ProtoPlacementTags + return m.PlacementTags } return nil } -func (m *DesiredLRPSchedulingInfo) SetProtoPlacementTags(value []string) { +func (m *DesiredLRPSchedulingInfo) SetPlacementTags(value []string) { if m != nil { - m.ProtoPlacementTags = value + m.PlacementTags = value } } func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { @@ -172,7 +172,7 @@ func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { Routes: x.Routes.ToProto(), ModificationTag: x.ModificationTag.ToProto(), VolumePlacement: x.VolumePlacement.ToProto(), - ProtoPlacementTags: x.ProtoPlacementTags, + PlacementTags: x.PlacementTags, } return proto } @@ -211,7 +211,7 @@ type DesiredLRPRunInfo struct { ImagePassword string CheckDefinition *CheckDefinition ImageLayers []*ImageLayer - MetricTags map[string]*ProtoMetricTagValue + MetricTags map[string]*MetricTagValue Sidecars []*Sidecar LogRateLimit *LogRateLimit } @@ -455,7 +455,7 @@ func (m *DesiredLRPRunInfo) GetPorts() []uint32 { if m != nil { return m.Ports } - return 0 + return nil } func (m *DesiredLRPRunInfo) SetPorts(value []uint32) { if m != nil { @@ -634,13 +634,13 @@ func (m *DesiredLRPRunInfo) SetImageLayers(value []*ImageLayer) { m.ImageLayers = value } } -func (m *DesiredLRPRunInfo) GetMetricTags() map[string]*ProtoMetricTagValue { +func (m *DesiredLRPRunInfo) GetMetricTags() map[string]*MetricTagValue { if m != nil { return m.MetricTags } return nil } -func (m *DesiredLRPRunInfo) SetMetricTags(value map[string]*ProtoMetricTagValue) { +func (m *DesiredLRPRunInfo) SetMetricTags(value map[string]*MetricTagValue) { if m != nil { m.MetricTags = value } @@ -693,7 +693,7 @@ func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { ImagePassword: x.ImagePassword, CheckDefinition: x.CheckDefinition.ToProto(), ImageLayers: ImageLayerProtoMap(x.ImageLayers), - MetricTags: x.MetricTags, + MetricTags: DesiredLRPRunInfoMetricTagsProtoMap(x.MetricTags), Sidecars: SidecarProtoMap(x.Sidecars), LogRateLimit: x.LogRateLimit.ToProto(), } @@ -708,6 +708,14 @@ func DesiredLRPRunInfoProtoMap(values []*DesiredLRPRunInfo) []*ProtoDesiredLRPRu return result } +func DesiredLRPRunInfoMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + result := make(map[string]*ProtoMetricTagValue, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + // Prevent copylock errors when using ProtoRoutes directly type Routes struct { Routes map[string][]byte @@ -776,7 +784,7 @@ type DesiredLRPUpdate struct { Instances *int32 Routes *Routes Annotation *string - MetricTags map[string]*ProtoMetricTagValue + MetricTags map[string]*MetricTagValue } func (this *DesiredLRPUpdate) Equal(that interface{}) bool { @@ -862,13 +870,13 @@ func (m *DesiredLRPUpdate) SetAnnotation(value *string) { m.Annotation = value } } -func (m *DesiredLRPUpdate) GetMetricTags() map[string]*ProtoMetricTagValue { +func (m *DesiredLRPUpdate) GetMetricTags() map[string]*MetricTagValue { if m != nil { return m.MetricTags } return nil } -func (m *DesiredLRPUpdate) SetMetricTags(value map[string]*ProtoMetricTagValue) { +func (m *DesiredLRPUpdate) SetMetricTags(value map[string]*MetricTagValue) { if m != nil { m.MetricTags = value } @@ -878,7 +886,7 @@ func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { Instances: x.Instances, Routes: x.Routes.ToProto(), Annotation: x.Annotation, - MetricTags: x.MetricTags, + MetricTags: DesiredLRPUpdateMetricTagsProtoMap(x.MetricTags), } return proto } @@ -891,6 +899,14 @@ func DesiredLRPUpdateProtoMap(values []*DesiredLRPUpdate) []*ProtoDesiredLRPUpda return result } +func DesiredLRPUpdateMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + result := make(map[string]*ProtoMetricTagValue, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPKey directly type DesiredLRPKey struct { ProcessGuid string @@ -1116,14 +1132,14 @@ type DesiredLRP struct { TrustedSystemCertificatesPath string VolumeMounts []*VolumeMount Network *Network - ProtoPlacementTags []string + PlacementTags []string MaxPids int32 CertificateProperties *CertificateProperties ImageUsername string ImagePassword string CheckDefinition *CheckDefinition ImageLayers []*ImageLayer - MetricTags map[string]*ProtoMetricTagValue + MetricTags map[string]*MetricTagValue Sidecars []*Sidecar LogRateLimit *LogRateLimit } @@ -1256,11 +1272,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if !this.Network.Equal(that1.Network) { return false } - if len(this.ProtoPlacementTags) != len(that1.ProtoPlacementTags) { + if len(this.PlacementTags) != len(that1.PlacementTags) { return false } - for i := range this.ProtoPlacementTags { - if this.ProtoPlacementTags[i] != that1.ProtoPlacementTags[i] { + for i := range this.PlacementTags { + if this.PlacementTags[i] != that1.PlacementTags[i] { return false } } @@ -1468,7 +1484,7 @@ func (m *DesiredLRP) GetPorts() []uint32 { if m != nil { return m.Ports } - return 0 + return nil } func (m *DesiredLRP) SetPorts(value []uint32) { if m != nil { @@ -1614,15 +1630,15 @@ func (m *DesiredLRP) SetNetwork(value *Network) { m.Network = value } } -func (m *DesiredLRP) GetProtoPlacementTags() []string { +func (m *DesiredLRP) GetPlacementTags() []string { if m != nil { - return m.ProtoPlacementTags + return m.PlacementTags } return nil } -func (m *DesiredLRP) SetProtoPlacementTags(value []string) { +func (m *DesiredLRP) SetPlacementTags(value []string) { if m != nil { - m.ProtoPlacementTags = value + m.PlacementTags = value } } func (m *DesiredLRP) GetMaxPids() int32 { @@ -1694,13 +1710,13 @@ func (m *DesiredLRP) SetImageLayers(value []*ImageLayer) { m.ImageLayers = value } } -func (m *DesiredLRP) GetMetricTags() map[string]*ProtoMetricTagValue { +func (m *DesiredLRP) GetMetricTags() map[string]*MetricTagValue { if m != nil { return m.MetricTags } return nil } -func (m *DesiredLRP) SetMetricTags(value map[string]*ProtoMetricTagValue) { +func (m *DesiredLRP) SetMetricTags(value map[string]*MetricTagValue) { if m != nil { m.MetricTags = value } @@ -1756,14 +1772,14 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, VolumeMounts: VolumeMountProtoMap(x.VolumeMounts), Network: x.Network.ToProto(), - ProtoPlacementTags: x.ProtoPlacementTags, + PlacementTags: x.PlacementTags, MaxPids: x.MaxPids, CertificateProperties: x.CertificateProperties.ToProto(), ImageUsername: x.ImageUsername, ImagePassword: x.ImagePassword, CheckDefinition: x.CheckDefinition.ToProto(), ImageLayers: ImageLayerProtoMap(x.ImageLayers), - MetricTags: x.MetricTags, + MetricTags: DesiredLRPMetricTagsProtoMap(x.MetricTags), Sidecars: SidecarProtoMap(x.Sidecars), LogRateLimit: x.LogRateLimit.ToProto(), } @@ -1777,3 +1793,11 @@ func DesiredLRPProtoMap(values []*DesiredLRP) []*ProtoDesiredLRP { } return result } + +func DesiredLRPMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + result := make(map[string]*ProtoMetricTagValue, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 2066fcae..374fafe3 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -460,7 +460,7 @@ func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { PlacementError: x.PlacementError, Since: x.Since, ModificationTag: x.ModificationTag.ToProto(), - Presence: ProtoActualLRPInfo_Presence(x.Presence), + Presence: ProtoActualLRP_Presence(x.Presence), Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, } diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index ebd46964..5c02de18 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -241,7 +241,7 @@ func (x *ImageLayer) ToProto() *ProtoImageLayer { Name: x.Name, Url: x.Url, DestinationPath: x.DestinationPath, - LayerType: ProtoImageLayer_LayerType(x.LayerType), + LayerType: ProtoImageLayer_Type(x.LayerType), MediaType: ProtoImageLayer_MediaType(x.MediaType), DigestAlgorithm: ProtoImageLayer_DigestAlgorithm(x.DigestAlgorithm), DigestValue: x.DigestValue, diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 38f7ee4d..7adf14f7 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -131,26 +131,26 @@ var File_metric_tags_proto protoreflect.FileDescriptor var file_metric_tags_proto_rawDesc = []byte{ 0x0a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfc, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x12, 0x42, 0x0a, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x52, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x22, 0x88, 0x01, 0x0a, 0x0c, 0x44, + 0x65, 0x52, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x22, 0x8a, 0x01, 0x0a, 0x0c, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, - 0x69, 0x64, 0x10, 0x00, 0x12, 0x27, 0x0a, 0x05, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0x01, 0x1a, - 0x1c, 0x82, 0x7d, 0x19, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x79, 0x6e, 0x61, - 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x36, 0x0a, - 0x0d, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x47, 0x55, 0x49, 0x44, 0x10, 0x02, - 0x1a, 0x23, 0x82, 0x7d, 0x20, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x79, 0x6e, - 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x47, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, - 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x69, 0x64, 0x10, 0x00, 0x12, 0x28, 0x0a, 0x05, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0x01, 0x1a, + 0x1d, 0x82, 0x7d, 0x1a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x44, 0x79, 0x6e, + 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x37, + 0x0a, 0x0d, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x47, 0x55, 0x49, 0x44, 0x10, + 0x02, 0x1a, 0x24, 0x82, 0x7d, 0x21, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x44, + 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x47, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/models/metric_tags.proto b/models/metric_tags.proto index 1e1374b4..0bbfb210 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -8,8 +8,8 @@ import "bbs.proto"; message ProtoMetricTagValue { enum DynamicValue { DynamicValueInvalid = 0; - INDEX = 1 [(bbs.bbs_enumvalue_customname) = "MetricTagynamicValueIndex"]; - INSTANCE_GUID = 2 [(bbs.bbs_enumvalue_customname) = "MetricTagynamicValueInstanceGuid"]; + INDEX = 1 [(bbs.bbs_enumvalue_customname) = "MetricTagDynamicValueIndex"]; + INSTANCE_GUID = 2 [(bbs.bbs_enumvalue_customname) = "MetricTagDynamicValueInstanceGuid"]; } // Note: we only expect one of the following set of fields to be diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 9102c691..801b89fa 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -13,9 +13,9 @@ import ( type MetricTagValue_DynamicValue int32 const ( - MetricTagValue_DynamicValueInvalid MetricTagValue_DynamicValue = 0 - MetricTagValue_MetricTagynamicValueIndex MetricTagValue_DynamicValue = 1 - MetricTagValue_MetricTagynamicValueInstanceGuid MetricTagValue_DynamicValue = 2 + MetricTagValue_DynamicValueInvalid MetricTagValue_DynamicValue = 0 + MetricTagValue_MetricTagDynamicValueIndex MetricTagValue_DynamicValue = 1 + MetricTagValue_MetricTagDynamicValueInstanceGuid MetricTagValue_DynamicValue = 2 ) // Enum value maps for MetricTagValue_DynamicValue @@ -101,7 +101,7 @@ func (m *MetricTagValue) SetDynamic(value MetricTagValue_DynamicValue) { func (x *MetricTagValue) ToProto() *ProtoMetricTagValue { proto := &ProtoMetricTagValue{ Static: x.Static, - Dynamic: ProtoMetricTagValue_Dynamic(x.Dynamic), + Dynamic: ProtoMetricTagValue_DynamicValue(x.Dynamic), } return proto } diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index d41bf848..5f1e5f58 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -251,7 +251,7 @@ func (m *SecurityGroupRule) GetPorts() []uint32 { if m != nil { return m.Ports } - return 0 + return nil } func (m *SecurityGroupRule) SetPorts(value []uint32) { if m != nil { diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 0cc80975..800afe88 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -38,7 +38,7 @@ type TaskDefinition struct { ImagePassword string ImageLayers []*ImageLayer LogRateLimit *LogRateLimit - MetricTags map[string]*ProtoMetricTagValue + MetricTags map[string]*MetricTagValue } func (this *TaskDefinition) Equal(that interface{}) bool { @@ -469,13 +469,13 @@ func (m *TaskDefinition) SetLogRateLimit(value *LogRateLimit) { m.LogRateLimit = value } } -func (m *TaskDefinition) GetMetricTags() map[string]*ProtoMetricTagValue { +func (m *TaskDefinition) GetMetricTags() map[string]*MetricTagValue { if m != nil { return m.MetricTags } return nil } -func (m *TaskDefinition) SetMetricTags(value map[string]*ProtoMetricTagValue) { +func (m *TaskDefinition) SetMetricTags(value map[string]*MetricTagValue) { if m != nil { m.MetricTags = value } @@ -508,7 +508,7 @@ func (x *TaskDefinition) ToProto() *ProtoTaskDefinition { ImagePassword: x.ImagePassword, ImageLayers: ImageLayerProtoMap(x.ImageLayers), LogRateLimit: x.LogRateLimit.ToProto(), - MetricTags: x.MetricTags, + MetricTags: TaskDefinitionMetricTagsProtoMap(x.MetricTags), } return proto } @@ -521,6 +521,14 @@ func TaskDefinitionProtoMap(values []*TaskDefinition) []*ProtoTaskDefinition { return result } +func TaskDefinitionMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + result := make(map[string]*ProtoMetricTagValue, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + type Task_State int32 const ( From 46901951e9e4cbf5045ca0fee34c97a2737ebd2f Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 17:51:32 +0000 Subject: [PATCH 048/155] Pointer changes due to standard protobuf updates --- models/desired_lrp.go | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index d18e0b55..4d15c486 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -35,12 +35,12 @@ func PreloadedRootFS(stack string) string { func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo, metricTags map[string]*MetricTagValue) DesiredLRP { environmentVariables := make([]*EnvironmentVariable, len(runInfo.EnvironmentVariables)) for i := range runInfo.EnvironmentVariables { - environmentVariables[i] = &runInfo.EnvironmentVariables[i] + environmentVariables[i] = runInfo.EnvironmentVariables[i] } egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) for i := range runInfo.EgressRules { - egressRules[i] = &runInfo.EgressRules[i] + egressRules[i] = runInfo.EgressRules[i] } return DesiredLRP{ @@ -86,12 +86,12 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo func (desiredLRP *DesiredLRP) AddRunInfo(runInfo DesiredLRPRunInfo) { environmentVariables := make([]*EnvironmentVariable, len(runInfo.EnvironmentVariables)) for i := range runInfo.EnvironmentVariables { - environmentVariables[i] = &runInfo.EnvironmentVariables[i] + environmentVariables[i] = runInfo.EnvironmentVariables[i] } egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) for i := range runInfo.EgressRules { - egressRules[i] = &runInfo.EgressRules[i] + egressRules[i] = runInfo.EgressRules[i] } desiredLRP.EnvironmentVariables = environmentVariables @@ -261,14 +261,14 @@ func (d *DesiredLRP) DesiredLRPRoutingInfo() DesiredLRP { } func (d *DesiredLRP) DesiredLRPRunInfo(createdAt time.Time) DesiredLRPRunInfo { - environmentVariables := make([]EnvironmentVariable, len(d.EnvironmentVariables)) + environmentVariables := make([]*EnvironmentVariable, len(d.EnvironmentVariables)) for i := range d.EnvironmentVariables { - environmentVariables[i] = *d.EnvironmentVariables[i] + environmentVariables[i] = d.EnvironmentVariables[i] } - egressRules := make([]SecurityGroupRule, len(d.EgressRules)) + egressRules := make([]*SecurityGroupRule, len(d.EgressRules)) for i := range d.EgressRules { - egressRules[i] = *d.EgressRules[i] + egressRules[i] = d.EgressRules[i] } return NewDesiredLRPRunInfo( @@ -379,11 +379,11 @@ func (desired DesiredLRP) Validate() error { func (desired *DesiredLRPUpdate) Validate() error { var validationError ValidationError - if desired.GetInstances() < 0 { + if *desired.GetInstances() < 0 { validationError = validationError.Append(ErrInvalidField{"instances"}) } - if len(desired.GetAnnotation()) > maximumAnnotationLength { + if len(*desired.GetAnnotation()) > maximumAnnotationLength { validationError = validationError.Append(ErrInvalidField{"annotation"}) } @@ -462,11 +462,11 @@ func (desired *DesiredLRPUpdate) UnmarshalJSON(data []byte) error { } if update.Instances != nil { - desired.SetInstances(*update.Instances) + desired.SetInstances(update.Instances) } desired.Routes = update.Routes if update.Annotation != nil { - desired.SetAnnotation(*update.Annotation) + desired.SetAnnotation(update.Annotation) } desired.MetricTags = update.MetricTags @@ -477,12 +477,12 @@ func (desired DesiredLRPUpdate) MarshalJSON() ([]byte, error) { var update internalDesiredLRPUpdate if desired.InstancesExists() { i := desired.GetInstances() - update.Instances = &i + update.Instances = i } update.Routes = desired.Routes if desired.AnnotationExists() { a := desired.GetAnnotation() - update.Annotation = &a + update.Annotation = a } update.MetricTags = desired.MetricTags return json.Marshal(update) @@ -520,12 +520,12 @@ func NewDesiredLRPSchedulingInfo( placementTags []string, ) DesiredLRPSchedulingInfo { return DesiredLRPSchedulingInfo{ - DesiredLRPKey: key, + DesiredLrpKey: &key, Annotation: annotation, Instances: instances, - DesiredLRPResource: resource, - Routes: routes, - ModificationTag: modTag, + DesiredLrpResource: &resource, + Routes: &routes, + ModificationTag: &modTag, VolumePlacement: volumePlacement, PlacementTags: placementTags, } @@ -551,13 +551,13 @@ func NewDesiredLRPRoutingInfo( func (s *DesiredLRPSchedulingInfo) ApplyUpdate(update *DesiredLRPUpdate) { if update.InstancesExists() { - s.Instances = update.GetInstances() + s.Instances = *update.GetInstances() } if update.Routes != nil { - s.Routes = *update.Routes + s.Routes = update.Routes } if update.AnnotationExists() { - s.Annotation = update.GetAnnotation() + s.Annotation = *update.GetAnnotation() } s.ModificationTag.Increment() } @@ -617,7 +617,7 @@ func (resource DesiredLRPResource) Validate() error { func NewDesiredLRPRunInfo( key DesiredLRPKey, createdAt time.Time, - envVars []EnvironmentVariable, + envVars []*EnvironmentVariable, cacheDeps []*CachedDependency, setup, action, @@ -626,7 +626,7 @@ func NewDesiredLRPRunInfo( privileged bool, cpuWeight uint32, ports []uint32, - egressRules []SecurityGroupRule, + egressRules []*SecurityGroupRule, logSource, metricsGuid string, legacyDownloadUser string, @@ -641,7 +641,7 @@ func NewDesiredLRPRunInfo( logRateLimit *LogRateLimit, ) DesiredLRPRunInfo { return DesiredLRPRunInfo{ - DesiredLRPKey: key, + DesiredLrpKey: &key, CreatedAt: createdAt.UnixNano(), EnvironmentVariables: envVars, CachedDependencies: cacheDeps, From 85f2b183e958d9e4f3caf667f7250a3c333d6e03 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 17:54:31 +0000 Subject: [PATCH 049/155] Lack of protobuf embed support requires using the structs directly --- models/desired_lrp.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 4d15c486..81af7213 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -43,18 +43,21 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo egressRules[i] = runInfo.EgressRules[i] } + desiredLrpKey := schedInfo.GetDesiredLrpKey() + desiredLrpResource := schedInfo.GetDesiredLrpResource() + return DesiredLRP{ - ProcessGuid: schedInfo.ProcessGuid, - Domain: schedInfo.Domain, - LogGuid: schedInfo.LogGuid, - MemoryMb: schedInfo.MemoryMb, - DiskMb: schedInfo.DiskMb, - MaxPids: schedInfo.MaxPids, - RootFs: schedInfo.RootFs, + ProcessGuid: desiredLrpKey.ProcessGuid, + Domain: desiredLrpKey.Domain, + LogGuid: desiredLrpKey.LogGuid, + MemoryMb: desiredLrpResource.MemoryMb, + DiskMb: desiredLrpResource.DiskMb, + MaxPids: desiredLrpResource.MaxPids, + RootFs: desiredLrpResource.RootFs, Instances: schedInfo.Instances, Annotation: schedInfo.Annotation, - Routes: &schedInfo.Routes, - ModificationTag: &schedInfo.ModificationTag, + Routes: schedInfo.Routes, + ModificationTag: schedInfo.ModificationTag, EnvironmentVariables: environmentVariables, CachedDependencies: runInfo.CachedDependencies, Setup: runInfo.Setup, From 6c176a3d935808bf74d3e784842b2f47189de676 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 17:55:08 +0000 Subject: [PATCH 050/155] Standardization of DesiredLRP=>DesiredLrp --- models/desired_lrp.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 81af7213..3ef4464f 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -572,7 +572,7 @@ func (*DesiredLRPSchedulingInfo) Version() format.Version { func (s DesiredLRPSchedulingInfo) Validate() error { var validationError ValidationError - validationError = validationError.Check(s.DesiredLRPKey, s.DesiredLRPResource, s.Routes) + validationError = validationError.Check(s.DesiredLrpKey, s.DesiredLrpResource, s.Routes) if s.GetInstances() < 0 { validationError = validationError.Append(ErrInvalidField{"instances"}) @@ -675,7 +675,7 @@ func NewDesiredLRPRunInfo( func (runInfo DesiredLRPRunInfo) Validate() error { var validationError ValidationError - validationError = validationError.Check(runInfo.DesiredLRPKey) + validationError = validationError.Check(runInfo.DesiredLrpKey) if runInfo.Setup != nil { if err := runInfo.Setup.Validate(); err != nil { From 1b7d7bbbaa4900051f6e2d242c725bb733cb2522 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 17:55:44 +0000 Subject: [PATCH 051/155] Remove gogoproto proto.Message --- models/events.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/models/events.go b/models/events.go index b12a12eb..cf8c3049 100644 --- a/models/events.go +++ b/models/events.go @@ -2,13 +2,11 @@ package models import ( "code.cloudfoundry.org/bbs/format" - "github.com/gogo/protobuf/proto" ) type Event interface { EventType() string Key() string - proto.Message } const ( From 3b3ea0dfadfac92fc92f4fc2fe47f157f0100668 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 19:38:00 +0000 Subject: [PATCH 052/155] Standardization of ActualLRP=>ActualLrp --- models/events.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/models/events.go b/models/events.go index cf8c3049..0a19101e 100644 --- a/models/events.go +++ b/models/events.go @@ -119,23 +119,23 @@ func NewActualLRPInstanceChangedEvent(before, after *ActualLRP, traceId string) actualLRPInstanceKey ActualLRPInstanceKey ) - if (before != nil && before.ActualLRPKey != ActualLRPKey{}) { - actualLRPKey = before.ActualLRPKey + if (before != nil && before.ActualLrpKey != ActualLRPKey{}) { + actualLRPKey = before.ActualLrpKey } - if (after != nil && after.ActualLRPKey != ActualLRPKey{}) { - actualLRPKey = after.ActualLRPKey + if (after != nil && after.ActualLrpKey != ActualLRPKey{}) { + actualLRPKey = after.ActualLrpKey } - if (before != nil && before.ActualLRPInstanceKey != ActualLRPInstanceKey{}) { - actualLRPInstanceKey = before.ActualLRPInstanceKey + if (before != nil && before.ActualLrpInstanceKey != ActualLRPInstanceKey{}) { + actualLRPInstanceKey = before.ActualLrpInstanceKey } - if (after != nil && after.ActualLRPInstanceKey != ActualLRPInstanceKey{}) { - actualLRPInstanceKey = after.ActualLRPInstanceKey + if (after != nil && after.ActualLrpInstanceKey != ActualLRPInstanceKey{}) { + actualLRPInstanceKey = after.ActualLrpInstanceKey } return &ActualLRPInstanceChangedEvent{ - ActualLRPKey: actualLRPKey, - ActualLRPInstanceKey: actualLRPInstanceKey, + ActualLrpKey: actualLRPKey, + ActualLrpInstanceKey: actualLRPInstanceKey, Before: before.ToActualLRPInfo(), After: after.ToActualLRPInfo(), TraceId: traceId, @@ -174,8 +174,8 @@ func (event *ActualLRPChangedEvent) Key() string { func NewActualLRPCrashedEvent(before, after *ActualLRP) *ActualLRPCrashedEvent { return &ActualLRPCrashedEvent{ - ActualLRPKey: after.ActualLRPKey, - ActualLRPInstanceKey: before.ActualLRPInstanceKey, + ActualLrpKey: after.ActualLrpKey, + ActualLrpInstanceKey: before.ActualLrpInstanceKey, CrashCount: after.CrashCount, CrashReason: after.CrashReason, Since: after.Since, @@ -187,7 +187,7 @@ func (event *ActualLRPCrashedEvent) EventType() string { } func (event *ActualLRPCrashedEvent) Key() string { - return event.ActualLRPInstanceKey.InstanceGuid + return event.ActualLrpInstanceKey.InstanceGuid } // Deprecated: use the ActualLRPInstance versions of this instead From d72525943f3905678339476b1048a0df9cdf6135 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 19:38:59 +0000 Subject: [PATCH 053/155] Pointer changes due to standard protobuf updates --- models/events.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/models/events.go b/models/events.go index 0a19101e..9b08cf78 100644 --- a/models/events.go +++ b/models/events.go @@ -115,21 +115,21 @@ func (event DesiredLRPRemovedEvent) Key() string { // FIXME: change the signature func NewActualLRPInstanceChangedEvent(before, after *ActualLRP, traceId string) *ActualLRPInstanceChangedEvent { var ( - actualLRPKey ActualLRPKey - actualLRPInstanceKey ActualLRPInstanceKey + actualLRPKey *ActualLRPKey + actualLRPInstanceKey *ActualLRPInstanceKey ) - if (before != nil && before.ActualLrpKey != ActualLRPKey{}) { + if (before != nil && before.ActualLrpKey != &ActualLRPKey{}) { actualLRPKey = before.ActualLrpKey } - if (after != nil && after.ActualLrpKey != ActualLRPKey{}) { + if (after != nil && after.ActualLrpKey != &ActualLRPKey{}) { actualLRPKey = after.ActualLrpKey } - if (before != nil && before.ActualLrpInstanceKey != ActualLRPInstanceKey{}) { + if (before != nil && before.ActualLrpInstanceKey != &ActualLRPInstanceKey{}) { actualLRPInstanceKey = before.ActualLrpInstanceKey } - if (after != nil && after.ActualLrpInstanceKey != ActualLRPInstanceKey{}) { + if (after != nil && after.ActualLrpInstanceKey != &ActualLRPInstanceKey{}) { actualLRPInstanceKey = after.ActualLrpInstanceKey } From 33849aa01a51f98a5c8bb6e0c8eb0089a854457c Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 19:41:51 +0000 Subject: [PATCH 054/155] Lack of protobuf embed support requires using the structs directly --- models/events.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/models/events.go b/models/events.go index 9b08cf78..ba6f53bc 100644 --- a/models/events.go +++ b/models/events.go @@ -147,7 +147,7 @@ func (event *ActualLRPInstanceChangedEvent) EventType() string { } func (event *ActualLRPInstanceChangedEvent) Key() string { - return event.GetInstanceGuid() + return event.GetActualLrpInstanceKey().GetInstanceGuid() } // Deprecated: use the ActualLRPInstance versions of this instead @@ -169,7 +169,7 @@ func (event *ActualLRPChangedEvent) Key() string { if resolveError != nil { return "" } - return actualLRP.GetInstanceGuid() + return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() } func NewActualLRPCrashedEvent(before, after *ActualLRP) *ActualLRPCrashedEvent { @@ -208,7 +208,7 @@ func (event *ActualLRPRemovedEvent) Key() string { if resolveError != nil { return "" } - return actualLRP.GetInstanceGuid() + return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() } func NewActualLRPInstanceRemovedEvent(actualLrp *ActualLRP, traceId string) *ActualLRPInstanceRemovedEvent { @@ -226,7 +226,7 @@ func (event *ActualLRPInstanceRemovedEvent) Key() string { if event.ActualLrp == nil { return "" } - return event.ActualLrp.GetInstanceGuid() + return event.ActualLrp.GetActualLrpInstanceKey().GetInstanceGuid() } // Deprecated: use the ActualLRPInstance versions of this instead @@ -247,7 +247,7 @@ func (event *ActualLRPCreatedEvent) Key() string { if resolveError != nil { return "" } - return actualLRP.GetInstanceGuid() + return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() } func NewActualLRPInstanceCreatedEvent(actualLrp *ActualLRP, traceId string) *ActualLRPInstanceCreatedEvent { @@ -265,7 +265,7 @@ func (event *ActualLRPInstanceCreatedEvent) Key() string { if event.ActualLrp == nil { return "" } - return event.ActualLrp.GetInstanceGuid() + return event.ActualLrp.GetActualLrpInstanceKey().GetInstanceGuid() } func (request *EventsByCellId) Validate() error { From 2c7c0af2e03a54f287115dccb31406a79e849370 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 20:32:44 +0000 Subject: [PATCH 055/155] Standardization of enum value names (include containing struct) --- models/image_layer.go | 26 +++++++++++++------------- models/metric_tags.go | 16 ++++++++-------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/models/image_layer.go b/models/image_layer.go index 6a62e561..edb2ef5a 100644 --- a/models/image_layer.go +++ b/models/image_layer.go @@ -25,11 +25,11 @@ func (l *ImageLayer) Validate() error { validationError = validationError.Append(ErrInvalidField{"media_type"}) } - if (l.DigestValue != "" || l.LayerType == LayerTypeExclusive) && l.DigestAlgorithm == DigestAlgorithmInvalid { + if (l.DigestValue != "" || l.LayerType == ImageLayer_LayerTypeExclusive) && l.DigestAlgorithm == ImageLayer_DigestAlgorithmInvalid { validationError = validationError.Append(ErrInvalidField{"digest_algorithm"}) } - if (l.DigestAlgorithm != DigestAlgorithmInvalid || l.LayerType == LayerTypeExclusive) && l.DigestValue == "" { + if (l.DigestAlgorithm != ImageLayer_DigestAlgorithmInvalid || l.LayerType == ImageLayer_LayerTypeExclusive) && l.DigestValue == "" { validationError = validationError.Append(ErrInvalidField{"digest_value"}) } @@ -56,7 +56,7 @@ func validateImageLayers(layers []*ImageLayer, legacyDownloadUser string) Valida validationError = validationError.Append(err) } - if layer.LayerType == LayerTypeExclusive { + if layer.LayerType == ImageLayer_LayerTypeExclusive { requiresLegacyDownloadUser = true } } @@ -85,7 +85,7 @@ func (layers ImageLayers) FilterByType(layerType ImageLayer_Type) ImageLayers { func (layers ImageLayers) ToDownloadActions(legacyDownloadUser string, existingAction *Action) *Action { downloadActions := []ActionInterface{} - for _, layer := range layers.FilterByType(LayerTypeExclusive) { + for _, layer := range layers.FilterByType(ImageLayer_LayerTypeExclusive) { digestAlgorithmName := strings.ToLower(layer.DigestAlgorithm.String()) downloadActions = append(downloadActions, &DownloadAction{ Artifact: layer.Name, @@ -115,7 +115,7 @@ func (layers ImageLayers) ToDownloadActions(legacyDownloadUser string, existingA func (layers ImageLayers) ToCachedDependencies() []*CachedDependency { cachedDependencies := []*CachedDependency{} - for _, layer := range layers.FilterByType(LayerTypeShared) { + for _, layer := range layers.FilterByType(ImageLayer_LayerTypeShared) { c := &CachedDependency{ Name: layer.Name, From: layer.Url, @@ -123,7 +123,7 @@ func (layers ImageLayers) ToCachedDependencies() []*CachedDependency { ChecksumValue: layer.DigestValue, } - if layer.DigestAlgorithm == DigestAlgorithmInvalid { + if layer.DigestAlgorithm == ImageLayer_DigestAlgorithmInvalid { c.ChecksumAlgorithm = "" } else { c.ChecksumAlgorithm = strings.ToLower(layer.DigestAlgorithm.String()) @@ -143,9 +143,9 @@ func (layers ImageLayers) ToCachedDependencies() []*CachedDependency { func (d ImageLayer_DigestAlgorithm) Valid() bool { switch d { - case DigestAlgorithmSha256: + case ImageLayer_DigestAlgorithmSha256: return true - case DigestAlgorithmSha512: + case ImageLayer_DigestAlgorithmSha512: return true default: return false @@ -154,11 +154,11 @@ func (d ImageLayer_DigestAlgorithm) Valid() bool { func (m ImageLayer_MediaType) Valid() bool { switch m { - case MediaTypeTar: + case ImageLayer_MediaTypeTar: return true - case MediaTypeTgz: + case ImageLayer_MediaTypeTgz: return true - case MediaTypeZip: + case ImageLayer_MediaTypeZip: return true default: return false @@ -167,9 +167,9 @@ func (m ImageLayer_MediaType) Valid() bool { func (t ImageLayer_Type) Valid() bool { switch t { - case LayerTypeExclusive: + case ImageLayer_LayerTypeExclusive: return true - case LayerTypeShared: + case ImageLayer_LayerTypeShared: return true default: return false diff --git a/models/metric_tags.go b/models/metric_tags.go index 2c1e246b..937a41d2 100644 --- a/models/metric_tags.go +++ b/models/metric_tags.go @@ -28,9 +28,9 @@ func (m *MetricTagValue) Validate() error { func (v MetricTagValue_DynamicValue) Valid() bool { switch v { - case MetricTagDynamicValueIndex: + case MetricTagValue_MetricTagDynamicValueIndex: return true - case MetricTagDynamicValueInstanceGuid: + case MetricTagValue_MetricTagDynamicValueInstanceGuid: return true default: return false @@ -42,16 +42,16 @@ func ConvertMetricTags(metricTags map[string]*MetricTagValue, info map[MetricTag for k, v := range metricTags { if v.Dynamic > 0 { switch v.Dynamic { - case MetricTagDynamicValueIndex: - val, ok := info[MetricTagDynamicValueIndex].(int32) + case MetricTagValue_MetricTagDynamicValueIndex: + val, ok := info[MetricTagValue_MetricTagDynamicValueIndex].(int32) if !ok { - return nil, fmt.Errorf("could not convert value %+v of type %T to int32", info[MetricTagDynamicValueIndex], info[MetricTagDynamicValueIndex]) + return nil, fmt.Errorf("could not convert value %+v of type %T to int32", info[MetricTagValue_MetricTagDynamicValueIndex], info[MetricTagValue_MetricTagDynamicValueIndex]) } tags[k] = strconv.FormatInt(int64(val), 10) - case MetricTagDynamicValueInstanceGuid: - val, ok := info[MetricTagDynamicValueInstanceGuid].(string) + case MetricTagValue_MetricTagDynamicValueInstanceGuid: + val, ok := info[MetricTagValue_MetricTagDynamicValueInstanceGuid].(string) if !ok { - return nil, fmt.Errorf("could not convert value %+v of type %T to string", info[MetricTagDynamicValueInstanceGuid], info[MetricTagDynamicValueInstanceGuid]) + return nil, fmt.Errorf("could not convert value %+v of type %T to string", info[MetricTagValue_MetricTagDynamicValueInstanceGuid], info[MetricTagValue_MetricTagDynamicValueInstanceGuid]) } tags[k] = val } From afe3dbdcdb8f34cbbe773d95a6f3c7a5e37218e0 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 20:48:05 +0000 Subject: [PATCH 056/155] Weird Routes issue (assume because we aren't using the one defined in routes.go any more) --- models/desired_lrp.go | 14 +++++++------- models/routes.go | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 3ef4464f..1e78a2c3 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -352,8 +352,8 @@ func (desired DesiredLRP) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range *desired.Routes { - totalRoutesLength += len(*value) + for _, value := range desired.Routes.Routes { + totalRoutesLength += len(value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -392,8 +392,8 @@ func (desired *DesiredLRPUpdate) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range *desired.Routes { - totalRoutesLength += len(*value) + for _, value := range desired.Routes.Routes { + totalRoutesLength += len(value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -419,14 +419,14 @@ func (desired DesiredLRPUpdate) IsRoutesGroupUpdated(routes *Routes, routerGroup return true } - desiredRoutes, desiredRoutesPresent := (*desired.Routes)[routerGroup] - requestRoutes, requestRoutesPresent := (*routes)[routerGroup] + desiredRoutes, desiredRoutesPresent := (desired.Routes.Routes)[routerGroup] + requestRoutes, requestRoutesPresent := (routes.Routes)[routerGroup] if desiredRoutesPresent != requestRoutesPresent { return true } if desiredRoutesPresent && requestRoutesPresent { - return !bytes.Equal(*desiredRoutes, *requestRoutes) + return !bytes.Equal(desiredRoutes, requestRoutes) } return true diff --git a/models/routes.go b/models/routes.go index 89e2658c..d55f8a04 100644 --- a/models/routes.go +++ b/models/routes.go @@ -65,13 +65,13 @@ package models // return true // } -// func (r Routes) Validate() error { -// totalRoutesLength := 0 -// for _, value := range r { -// totalRoutesLength += len(*value) -// if totalRoutesLength > maximumRouteLength { -// return ErrInvalidField{"routes"} -// } -// } -// return nil -// } +func (r Routes) Validate() error { + totalRoutesLength := 0 + for _, value := range r.Routes { + totalRoutesLength += len(value) + if totalRoutesLength > maximumRouteLength { + return ErrInvalidField{"routes"} + } + } + return nil +} From b39cb661d3284e93103485b2f7caded257deeaee Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 3 May 2024 21:57:36 +0000 Subject: [PATCH 057/155] Change package of protogen plugin to models and softlink .proto and .pb.go files into models Always ignore bbs.proto when generating our plugin's files --- models/bbs.pb.go | 1 + models/bbs.proto | 1 + protoc-gen-go-bbs/bbs.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 12 +++++------- protoc-gen-go-bbs/main.go | 6 +++++- 5 files changed, 13 insertions(+), 9 deletions(-) create mode 120000 models/bbs.pb.go create mode 120000 models/bbs.proto diff --git a/models/bbs.pb.go b/models/bbs.pb.go new file mode 120000 index 00000000..762390cd --- /dev/null +++ b/models/bbs.pb.go @@ -0,0 +1 @@ +../protoc-gen-go-bbs/bbs.pb.go \ No newline at end of file diff --git a/models/bbs.proto b/models/bbs.proto new file mode 120000 index 00000000..3ba036eb --- /dev/null +++ b/models/bbs.proto @@ -0,0 +1 @@ +../protoc-gen-go-bbs/bbs.proto \ No newline at end of file diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 20a894a2..16e8d261 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -1,4 +1,4 @@ -package main +package models import ( "fmt" diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 26c6363c..a40aecab 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -4,14 +4,13 @@ // protoc v5.27.0--rc1 // source: bbs.proto -package main +package models import ( - reflect "reflect" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" + reflect "reflect" ) const ( @@ -68,11 +67,10 @@ var file_bbs_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x2d, 0x5a, 0x2b, 0x63, 0x6f, + 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, - 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x62, 0x62, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_bbs_proto_goTypes = []interface{}{ diff --git a/protoc-gen-go-bbs/main.go b/protoc-gen-go-bbs/main.go index 4ff0f695..3f835602 100644 --- a/protoc-gen-go-bbs/main.go +++ b/protoc-gen-go-bbs/main.go @@ -1,4 +1,4 @@ -package main +package models import ( "flag" @@ -32,6 +32,10 @@ func main() { plugin.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL) for _, file := range plugin.Files { + if file.GeneratedFilenamePrefix == "bbs" { + // ignore the bbs.proto file for our plugin always + file.Generate = false + } if !file.Generate { continue } From 97f8dc32141bee8556400b60590c0b4743035bff Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 8 May 2024 20:09:21 +0000 Subject: [PATCH 058/155] Revert package change and remove softlinks Make bbs.pb.go a full file Regen protos --- models/actions.pb.go | 4 +- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 4 +- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 4 +- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 115 +++++++++++++++++++++++- models/bbs.proto | 1 - models/cached_dependency.pb.go | 4 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 4 +- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 4 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 4 +- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 4 +- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 4 +- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 4 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 4 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 4 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 4 +- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 4 +- models/events_bbs.pb.go | 2 +- models/image_layer.pb.go | 4 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 4 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 4 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 4 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 4 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 4 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 4 +- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 4 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 4 +- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 4 +- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 4 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 4 +- protoc-gen-go-bbs/main.go | 2 +- 55 files changed, 193 insertions(+), 81 deletions(-) mode change 120000 => 100644 models/bbs.pb.go delete mode 120000 models/bbs.proto diff --git a/models/actions.pb.go b/models/actions.pb.go index d73476ad..9e1aaec1 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: actions.proto package models diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 6d729a19..12c1f381 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 038c13de..660c8e99 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index c9de35ea..241aaccc 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 5981e220..c317ab7f 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: actual_lrp_requests.proto package models diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 54a036a8..1fd8bbf8 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go deleted file mode 120000 index 762390cd..00000000 --- a/models/bbs.pb.go +++ /dev/null @@ -1 +0,0 @@ -../protoc-gen-go-bbs/bbs.pb.go \ No newline at end of file diff --git a/models/bbs.pb.go b/models/bbs.pb.go new file mode 100644 index 00000000..991d4b28 --- /dev/null +++ b/models/bbs.pb.go @@ -0,0 +1,114 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.34.1 +// protoc v5.26.1 +// source: bbs.proto + +package models + +import ( + reflect "reflect" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1000, + Name: "bbs.bbs_json_name", + Tag: "bytes,1000,opt,name=bbs_json_name", + Filename: "bbs.proto", + }, + { + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), + ExtensionType: (*string)(nil), + Field: 2000, + Name: "bbs.bbs_enumvalue_customname", + Tag: "bytes,2000,opt,name=bbs_enumvalue_customname", + Filename: "bbs.proto", + }, +} + +// Extension fields to descriptorpb.FieldOptions. +var ( + // optional string bbs_json_name = 1000; + E_BbsJsonName = &file_bbs_proto_extTypes[0] +) + +// Extension fields to descriptorpb.EnumValueOptions. +var ( + // optional string bbs_enumvalue_customname = 2000; + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[1] +) + +var File_bbs_proto protoreflect.FileDescriptor + +var file_bbs_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, + 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x3a, 0x45, 0x0a, 0x0d, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x62, 0x73, 0x4a, 0x73, + 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, + 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, + 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var file_bbs_proto_goTypes = []interface{}{ + (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions + (*descriptorpb.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions +} +var file_bbs_proto_depIdxs = []int32{ + 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions + 1, // 1: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 0, // [0:2] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_bbs_proto_init() } +func file_bbs_proto_init() { + if File_bbs_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_bbs_proto_rawDesc, + NumEnums: 0, + NumMessages: 0, + NumExtensions: 2, + NumServices: 0, + }, + GoTypes: file_bbs_proto_goTypes, + DependencyIndexes: file_bbs_proto_depIdxs, + ExtensionInfos: file_bbs_proto_extTypes, + }.Build() + File_bbs_proto = out.File + file_bbs_proto_rawDesc = nil + file_bbs_proto_goTypes = nil + file_bbs_proto_depIdxs = nil +} diff --git a/models/bbs.proto b/models/bbs.proto deleted file mode 120000 index 3ba036eb..00000000 --- a/models/bbs.proto +++ /dev/null @@ -1 +0,0 @@ -../protoc-gen-go-bbs/bbs.proto \ No newline at end of file diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 582107ef..4e1cb3c1 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: cached_dependency.proto package models diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 38cec67b..bedc0b28 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index 235b8088..ad3df8b2 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: cells.proto package models diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 52e4038a..15a48ade 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 11d250b8..4b5350e7 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: certificate_properties.proto package models diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index a79ef661..56be2a98 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 6dc4f119..501cf5d6 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: check_definition.proto package models diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 60b971a7..1dc823e3 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index ea08455f..5189b948 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 86233162..6bb442b4 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 6337d71b..4fd7f88d 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: desired_lrp_requests.proto package models diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index f6724e2b..ca2956ac 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index 1b64d33f..ed1ca4b6 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: domain.proto package models diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 003fd4b3..453418a2 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 14cfe5bd..83de2436 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: environment_variables.proto package models diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 14e18bed..08bd071e 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index cd0742ce..9242509f 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: error.proto package models diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 6abb2865..9a6ea6df 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index e1f35fce..008ff76a 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: evacuation.proto package models diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 51565e71..bfabb2a7 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index ad12214f..becfb199 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: events.proto package models diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 374fafe3..7fd51d23 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: events.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index df9ae46b..e58053d3 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: image_layer.proto package models diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 5c02de18..5abc8824 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index df9c664d..7259230c 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: log_rate_limit.proto package models diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index f4787309..a1d90c17 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 7adf14f7..a205a885 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: metric_tags.proto package models diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 801b89fa..62d3d6ff 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 95cebc05..9d8c1807 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: modification_tag.proto package models diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index a70c137c..6332cfaa 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index af829aad..df3f1622 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: network.proto package models diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index b1a6fdda..8a5de937 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 31cc5982..7652906c 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: ping.proto package models diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 488addd8..37357fac 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index 4f87547c..c6c3c079 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: security_group.proto package models diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 5f1e5f58..bcfa6e2b 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index b8c96eeb..139d10f2 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: sidecar.proto package models diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index f04b4fba..7bf0a4b2 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index ced1a59b..8bbf487a 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: task.proto package models diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 800afe88..9c4da179 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index f4d7d0d9..c288db7f 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: task_requests.proto package models diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 93f72722..932f6e16 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 0c2018bc..1340e407 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: volume_mount.proto package models diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 40d55874..54ea0786 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0--rc1 +// - protoc v5.26.1 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 16e8d261..20a894a2 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -1,4 +1,4 @@ -package models +package main import ( "fmt" diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index a40aecab..a17b547f 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.27.0--rc1 +// protoc-gen-go v1.34.1 +// protoc v5.26.1 // source: bbs.proto package models diff --git a/protoc-gen-go-bbs/main.go b/protoc-gen-go-bbs/main.go index 3f835602..6a60fd43 100644 --- a/protoc-gen-go-bbs/main.go +++ b/protoc-gen-go-bbs/main.go @@ -1,4 +1,4 @@ -package models +package main import ( "flag" From f4f0ebb34c2ac2f9c9fc2aef8933594d8ef91446 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 8 May 2024 21:10:42 +0000 Subject: [PATCH 059/155] Handles Routes special case for Equal Regen protos --- models/desired_lrp.go | 14 +++---- models/desired_lrp_bbs.pb.go | 73 ++---------------------------------- protoc-gen-go-bbs/bbs.go | 9 ++++- protoc-gen-go-bbs/bbs.pb.go | 5 ++- 4 files changed, 20 insertions(+), 81 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 1e78a2c3..3ef4464f 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -352,8 +352,8 @@ func (desired DesiredLRP) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range desired.Routes.Routes { - totalRoutesLength += len(value) + for _, value := range *desired.Routes { + totalRoutesLength += len(*value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -392,8 +392,8 @@ func (desired *DesiredLRPUpdate) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range desired.Routes.Routes { - totalRoutesLength += len(value) + for _, value := range *desired.Routes { + totalRoutesLength += len(*value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -419,14 +419,14 @@ func (desired DesiredLRPUpdate) IsRoutesGroupUpdated(routes *Routes, routerGroup return true } - desiredRoutes, desiredRoutesPresent := (desired.Routes.Routes)[routerGroup] - requestRoutes, requestRoutesPresent := (routes.Routes)[routerGroup] + desiredRoutes, desiredRoutesPresent := (*desired.Routes)[routerGroup] + requestRoutes, requestRoutesPresent := (*routes)[routerGroup] if desiredRoutesPresent != requestRoutesPresent { return true } if desiredRoutesPresent && requestRoutesPresent { - return !bytes.Equal(desiredRoutes, requestRoutes) + return !bytes.Equal(*desiredRoutes, *requestRoutes) } return true diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 6bb442b4..18daf0b5 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -6,10 +6,6 @@ package models -import ( - bytes "bytes" -) - // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly type DesiredLRPSchedulingInfo struct { DesiredLrpKey *DesiredLRPKey @@ -56,7 +52,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { return false } - if !this.Routes.Equal(that1.Routes) { + if !this.Routes.Equal(*that1.Routes) { return false } if !this.ModificationTag.Equal(that1.ModificationTag) { @@ -716,69 +712,6 @@ func DesiredLRPRunInfoMetricTagsProtoMap(values map[string]*MetricTagValue) map[ return result } -// Prevent copylock errors when using ProtoRoutes directly -type Routes struct { - Routes map[string][]byte -} - -func (this *Routes) Equal(that interface{}) bool { - - if that == nil { - return this == nil - } - - that1, ok := that.(*Routes) - if !ok { - that2, ok := that.(Routes) - if ok { - that1 = &that2 - } else { - return false - } - } - - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - - if len(this.Routes) != len(that1.Routes) { - return false - } - for i := range this.Routes { - if !bytes.Equal(this.Routes[i], that1.Routes[i]) { - return false - } - } - return true -} -func (m *Routes) GetRoutes() map[string][]byte { - if m != nil { - return m.Routes - } - return nil -} -func (m *Routes) SetRoutes(value map[string][]byte) { - if m != nil { - m.Routes = value - } -} -func (x *Routes) ToProto() *ProtoRoutes { - proto := &ProtoRoutes{ - Routes: x.Routes, - } - return proto -} - -func RoutesProtoMap(values []*Routes) []*ProtoRoutes { - result := make([]*ProtoRoutes, len(values)) - for i, val := range values { - result[i] = val.ToProto() - } - return result -} - // Prevent copylock errors when using ProtoDesiredLRPUpdate directly type DesiredLRPUpdate struct { Instances *int32 @@ -812,7 +745,7 @@ func (this *DesiredLRPUpdate) Equal(that interface{}) bool { if this.Instances != that1.Instances { return false } - if !this.Routes.Equal(that1.Routes) { + if !this.Routes.Equal(*that1.Routes) { return false } if this.Annotation != that1.Annotation { @@ -1221,7 +1154,7 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.Routes.Equal(that1.Routes) { + if !this.Routes.Equal(*that1.Routes) { return false } if this.LogSource != that1.LogSource { diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 20a894a2..77df95de 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -127,7 +127,12 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa g.P("return false") g.P("}") } else if field.Message != nil { - g.P("if !this.", fieldName, ".Equal(that1.", fieldName, ") {") + pointer := "" + if fieldName == "Routes" { + pointer = "*" + log.Printf("Adding dereference because of Routes") + } + g.P("if !this.", fieldName, ".Equal(", pointer, "that1.", fieldName, ") {") g.P("return false") } else { g.P("if this.", fieldName, " != that1.", fieldName, " {") @@ -467,7 +472,7 @@ func protocVersion(plugin *protogen.Plugin) string { return fmt.Sprintf("v%d.%d.%d%s", v.GetMajor(), v.GetMinor(), v.GetPatch(), suffix) } -var ignoredMessages []string = []string{} +var ignoredMessages []string = []string{"ProtoRoutes"} func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { for _, msg := range file.Messages { diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index a17b547f..0e3cfa9f 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -4,13 +4,14 @@ // protoc v5.26.1 // source: bbs.proto -package models +package main import ( + reflect "reflect" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" - reflect "reflect" ) const ( From e070291dd8ddb009b30d3bbd1f81a0d7530df831 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 8 May 2024 21:12:32 +0000 Subject: [PATCH 060/155] Bring back old functionality after ignoring ProtoRoutes/Routes in our protoc plugin --- models/routes.go | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/models/routes.go b/models/routes.go index d55f8a04..74b54648 100644 --- a/models/routes.go +++ b/models/routes.go @@ -1,23 +1,23 @@ package models -// import ( -// "bytes" -// "encoding/json" -// ) +import ( + bytes "bytes" + "encoding/json" +) -// type Routes map[string]*json.RawMessage +type Routes map[string]*json.RawMessage -// func (r *Routes) protoRoutes() *ProtoRoutes { -// pr := &ProtoRoutes{ -// Routes: map[string][]byte{}, -// } +func (r *Routes) ToProto() *ProtoRoutes { + pr := &ProtoRoutes{ + Routes: map[string][]byte{}, + } -// for k, v := range *r { -// pr.Routes[k] = *v -// } + for k, v := range *r { + pr.Routes[k] = *v + } -// return pr -// } + return pr +} // func (r *Routes) Marshal() ([]byte, error) { // return r.protoRoutes().Marshal() @@ -56,19 +56,19 @@ package models // return r.protoRoutes().Size() // } -// func (r *Routes) Equal(other Routes) bool { -// for k, v := range *r { -// if !bytes.Equal(*v, *other[k]) { -// return false -// } -// } -// return true -// } +func (r *Routes) Equal(other Routes) bool { + for k, v := range *r { + if !bytes.Equal(*v, *other[k]) { + return false + } + } + return true +} func (r Routes) Validate() error { totalRoutesLength := 0 - for _, value := range r.Routes { - totalRoutesLength += len(value) + for _, value := range r { + totalRoutesLength += len(*value) if totalRoutesLength > maximumRouteLength { return ErrInvalidField{"routes"} } From 95e861a50f46a549f3eb38983f9d61f77bdd3abc Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 9 May 2024 20:54:13 +0000 Subject: [PATCH 061/155] Differentiate between Slices and Maps Add FromProto methods Regen protos --- models/actions_bbs.pb.go | 233 ++++++++++++++++++-- models/actual_lrp_bbs.pb.go | 146 +++++++++++- models/actual_lrp_requests_bbs.pb.go | 265 ++++++++++++++++++++-- models/cached_dependency_bbs.pb.go | 23 +- models/cells_bbs.pb.go | 83 ++++++- models/certificate_properties_bbs.pb.go | 17 +- models/check_definition_bbs.pb.go | 80 ++++++- models/desired_lrp_bbs.pb.go | 239 ++++++++++++++++++-- models/desired_lrp_requests_bbs.pb.go | 180 ++++++++++++++- models/domain_bbs.pb.go | 53 ++++- models/environment_variables_bbs.pb.go | 18 +- models/error_bbs.pb.go | 18 +- models/evacuation_bbs.pb.go | 133 ++++++++++- models/events_bbs.pb.go | 280 ++++++++++++++++++++++-- models/image_layer_bbs.pb.go | 23 +- models/log_rate_limit_bbs.pb.go | 17 +- models/metric_tags_bbs.pb.go | 18 +- models/modification_tag_bbs.pb.go | 18 +- models/network_bbs.pb.go | 17 +- models/ping_bbs.pb.go | 17 +- models/security_group_bbs.pb.go | 59 ++++- models/sidecar_bbs.pb.go | 19 +- models/task_bbs.pb.go | 94 +++++++- models/task_requests_bbs.pb.go | 241 ++++++++++++++++++-- models/volume_mount_bbs.pb.go | 55 ++++- protoc-gen-go-bbs/bbs.go | 102 ++++++++- 26 files changed, 2286 insertions(+), 162 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 12c1f381..b42f8963 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -184,7 +184,22 @@ func (x *Action) ToProto() *ProtoAction { return proto } -func ActionProtoMap(values []*Action) []*ProtoAction { +func (x *ProtoAction) FromProto() *Action { + copysafe := &Action{ + DownloadAction: x.DownloadAction.FromProto(), + UploadAction: x.UploadAction.FromProto(), + RunAction: x.RunAction.FromProto(), + TimeoutAction: x.TimeoutAction.FromProto(), + EmitProgressAction: x.EmitProgressAction.FromProto(), + TryAction: x.TryAction.FromProto(), + ParallelAction: x.ParallelAction.FromProto(), + SerialAction: x.SerialAction.FromProto(), + CodependentAction: x.CodependentAction.FromProto(), + } + return copysafe +} + +func ActionToProtoSlice(values []*Action) []*ProtoAction { result := make([]*ProtoAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -192,6 +207,14 @@ func ActionProtoMap(values []*Action) []*ProtoAction { return result } +func ActionFromProtoSlice(values []*ProtoAction) []*Action { + result := make([]*Action, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDownloadAction directly type DownloadAction struct { Artifact string @@ -354,7 +377,21 @@ func (x *DownloadAction) ToProto() *ProtoDownloadAction { return proto } -func DownloadActionProtoMap(values []*DownloadAction) []*ProtoDownloadAction { +func (x *ProtoDownloadAction) FromProto() *DownloadAction { + copysafe := &DownloadAction{ + Artifact: x.Artifact, + From: x.From, + To: x.To, + CacheKey: x.CacheKey, + LogSource: x.LogSource, + User: x.User, + ChecksumAlgorithm: x.ChecksumAlgorithm, + ChecksumValue: x.ChecksumValue, + } + return copysafe +} + +func DownloadActionToProtoSlice(values []*DownloadAction) []*ProtoDownloadAction { result := make([]*ProtoDownloadAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -362,6 +399,14 @@ func DownloadActionProtoMap(values []*DownloadAction) []*ProtoDownloadAction { return result } +func DownloadActionFromProtoSlice(values []*ProtoDownloadAction) []*DownloadAction { + result := make([]*DownloadAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoUploadAction directly type UploadAction struct { Artifact string @@ -476,7 +521,18 @@ func (x *UploadAction) ToProto() *ProtoUploadAction { return proto } -func UploadActionProtoMap(values []*UploadAction) []*ProtoUploadAction { +func (x *ProtoUploadAction) FromProto() *UploadAction { + copysafe := &UploadAction{ + Artifact: x.Artifact, + From: x.From, + To: x.To, + LogSource: x.LogSource, + User: x.User, + } + return copysafe +} + +func UploadActionToProtoSlice(values []*UploadAction) []*ProtoUploadAction { result := make([]*ProtoUploadAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -484,6 +540,14 @@ func UploadActionProtoMap(values []*UploadAction) []*ProtoUploadAction { return result } +func UploadActionFromProtoSlice(values []*ProtoUploadAction) []*UploadAction { + result := make([]*UploadAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoRunAction directly type RunAction struct { Path string @@ -647,7 +711,7 @@ func (x *RunAction) ToProto() *ProtoRunAction { Path: x.Path, Args: x.Args, Dir: x.Dir, - Env: EnvironmentVariableProtoMap(x.Env), + Env: EnvironmentVariableToProtoSlice(x.Env), ResourceLimits: x.ResourceLimits.ToProto(), User: x.User, LogSource: x.LogSource, @@ -656,7 +720,21 @@ func (x *RunAction) ToProto() *ProtoRunAction { return proto } -func RunActionProtoMap(values []*RunAction) []*ProtoRunAction { +func (x *ProtoRunAction) FromProto() *RunAction { + copysafe := &RunAction{ + Path: x.Path, + Args: x.Args, + Dir: x.Dir, + Env: EnvironmentVariableFromProtoSlice(x.Env), + ResourceLimits: x.ResourceLimits.FromProto(), + User: x.User, + LogSource: x.LogSource, + SuppressLogOutput: x.SuppressLogOutput, + } + return copysafe +} + +func RunActionToProtoSlice(values []*RunAction) []*ProtoRunAction { result := make([]*ProtoRunAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -664,6 +742,14 @@ func RunActionProtoMap(values []*RunAction) []*ProtoRunAction { return result } +func RunActionFromProtoSlice(values []*ProtoRunAction) []*RunAction { + result := make([]*RunAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTimeoutAction directly type TimeoutAction struct { Action *Action @@ -764,7 +850,17 @@ func (x *TimeoutAction) ToProto() *ProtoTimeoutAction { return proto } -func TimeoutActionProtoMap(values []*TimeoutAction) []*ProtoTimeoutAction { +func (x *ProtoTimeoutAction) FromProto() *TimeoutAction { + copysafe := &TimeoutAction{ + Action: x.Action.FromProto(), + DeprecatedTimeoutNs: x.DeprecatedTimeoutNs, + LogSource: x.LogSource, + TimeoutMs: x.TimeoutMs, + } + return copysafe +} + +func TimeoutActionToProtoSlice(values []*TimeoutAction) []*ProtoTimeoutAction { result := make([]*ProtoTimeoutAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -772,6 +868,14 @@ func TimeoutActionProtoMap(values []*TimeoutAction) []*ProtoTimeoutAction { return result } +func TimeoutActionFromProtoSlice(values []*ProtoTimeoutAction) []*TimeoutAction { + result := make([]*TimeoutAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoEmitProgressAction directly type EmitProgressAction struct { Action *Action @@ -886,7 +990,18 @@ func (x *EmitProgressAction) ToProto() *ProtoEmitProgressAction { return proto } -func EmitProgressActionProtoMap(values []*EmitProgressAction) []*ProtoEmitProgressAction { +func (x *ProtoEmitProgressAction) FromProto() *EmitProgressAction { + copysafe := &EmitProgressAction{ + Action: x.Action.FromProto(), + StartMessage: x.StartMessage, + SuccessMessage: x.SuccessMessage, + FailureMessagePrefix: x.FailureMessagePrefix, + LogSource: x.LogSource, + } + return copysafe +} + +func EmitProgressActionToProtoSlice(values []*EmitProgressAction) []*ProtoEmitProgressAction { result := make([]*ProtoEmitProgressAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -894,6 +1009,14 @@ func EmitProgressActionProtoMap(values []*EmitProgressAction) []*ProtoEmitProgre return result } +func EmitProgressActionFromProtoSlice(values []*ProtoEmitProgressAction) []*EmitProgressAction { + result := make([]*EmitProgressAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTryAction directly type TryAction struct { Action *Action @@ -960,7 +1083,15 @@ func (x *TryAction) ToProto() *ProtoTryAction { return proto } -func TryActionProtoMap(values []*TryAction) []*ProtoTryAction { +func (x *ProtoTryAction) FromProto() *TryAction { + copysafe := &TryAction{ + Action: x.Action.FromProto(), + LogSource: x.LogSource, + } + return copysafe +} + +func TryActionToProtoSlice(values []*TryAction) []*ProtoTryAction { result := make([]*ProtoTryAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -968,6 +1099,14 @@ func TryActionProtoMap(values []*TryAction) []*ProtoTryAction { return result } +func TryActionFromProtoSlice(values []*ProtoTryAction) []*TryAction { + result := make([]*TryAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoParallelAction directly type ParallelAction struct { Actions []*Action @@ -1033,13 +1172,21 @@ func (m *ParallelAction) SetLogSource(value string) { } func (x *ParallelAction) ToProto() *ProtoParallelAction { proto := &ProtoParallelAction{ - Actions: ActionProtoMap(x.Actions), + Actions: ActionToProtoSlice(x.Actions), LogSource: x.LogSource, } return proto } -func ParallelActionProtoMap(values []*ParallelAction) []*ProtoParallelAction { +func (x *ProtoParallelAction) FromProto() *ParallelAction { + copysafe := &ParallelAction{ + Actions: ActionFromProtoSlice(x.Actions), + LogSource: x.LogSource, + } + return copysafe +} + +func ParallelActionToProtoSlice(values []*ParallelAction) []*ProtoParallelAction { result := make([]*ProtoParallelAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1047,6 +1194,14 @@ func ParallelActionProtoMap(values []*ParallelAction) []*ProtoParallelAction { return result } +func ParallelActionFromProtoSlice(values []*ProtoParallelAction) []*ParallelAction { + result := make([]*ParallelAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoSerialAction directly type SerialAction struct { Actions []*Action @@ -1112,13 +1267,21 @@ func (m *SerialAction) SetLogSource(value string) { } func (x *SerialAction) ToProto() *ProtoSerialAction { proto := &ProtoSerialAction{ - Actions: ActionProtoMap(x.Actions), + Actions: ActionToProtoSlice(x.Actions), LogSource: x.LogSource, } return proto } -func SerialActionProtoMap(values []*SerialAction) []*ProtoSerialAction { +func (x *ProtoSerialAction) FromProto() *SerialAction { + copysafe := &SerialAction{ + Actions: ActionFromProtoSlice(x.Actions), + LogSource: x.LogSource, + } + return copysafe +} + +func SerialActionToProtoSlice(values []*SerialAction) []*ProtoSerialAction { result := make([]*ProtoSerialAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1126,6 +1289,14 @@ func SerialActionProtoMap(values []*SerialAction) []*ProtoSerialAction { return result } +func SerialActionFromProtoSlice(values []*ProtoSerialAction) []*SerialAction { + result := make([]*SerialAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoCodependentAction directly type CodependentAction struct { Actions []*Action @@ -1191,13 +1362,21 @@ func (m *CodependentAction) SetLogSource(value string) { } func (x *CodependentAction) ToProto() *ProtoCodependentAction { proto := &ProtoCodependentAction{ - Actions: ActionProtoMap(x.Actions), + Actions: ActionToProtoSlice(x.Actions), LogSource: x.LogSource, } return proto } -func CodependentActionProtoMap(values []*CodependentAction) []*ProtoCodependentAction { +func (x *ProtoCodependentAction) FromProto() *CodependentAction { + copysafe := &CodependentAction{ + Actions: ActionFromProtoSlice(x.Actions), + LogSource: x.LogSource, + } + return copysafe +} + +func CodependentActionToProtoSlice(values []*CodependentAction) []*ProtoCodependentAction { result := make([]*ProtoCodependentAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1205,6 +1384,14 @@ func CodependentActionProtoMap(values []*CodependentAction) []*ProtoCodependentA return result } +func CodependentActionFromProtoSlice(values []*ProtoCodependentAction) []*CodependentAction { + result := make([]*CodependentAction, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoResourceLimits directly type ResourceLimits struct { Nofile *uint64 @@ -1279,10 +1466,26 @@ func (x *ResourceLimits) ToProto() *ProtoResourceLimits { return proto } -func ResourceLimitsProtoMap(values []*ResourceLimits) []*ProtoResourceLimits { +func (x *ProtoResourceLimits) FromProto() *ResourceLimits { + copysafe := &ResourceLimits{ + Nofile: x.Nofile, + Nproc: x.Nproc, + } + return copysafe +} + +func ResourceLimitsToProtoSlice(values []*ResourceLimits) []*ProtoResourceLimits { result := make([]*ProtoResourceLimits, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func ResourceLimitsFromProtoSlice(values []*ProtoResourceLimits) []*ResourceLimits { + result := make([]*ResourceLimits, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 241aaccc..dfa456f4 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -76,7 +76,15 @@ func (x *ActualLRPGroup) ToProto() *ProtoActualLRPGroup { return proto } -func ActualLRPGroupProtoMap(values []*ActualLRPGroup) []*ProtoActualLRPGroup { +func (x *ProtoActualLRPGroup) FromProto() *ActualLRPGroup { + copysafe := &ActualLRPGroup{ + Instance: x.Instance.FromProto(), + Evacuating: x.Evacuating.FromProto(), + } + return copysafe +} + +func ActualLRPGroupToProtoSlice(values []*ActualLRPGroup) []*ProtoActualLRPGroup { result := make([]*ProtoActualLRPGroup, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -84,6 +92,14 @@ func ActualLRPGroupProtoMap(values []*ActualLRPGroup) []*ProtoActualLRPGroup { return result } +func ActualLRPGroupFromProtoSlice(values []*ProtoActualLRPGroup) []*ActualLRPGroup { + result := make([]*ActualLRPGroup, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoPortMapping directly type PortMapping struct { ContainerPort uint32 @@ -182,7 +198,17 @@ func (x *PortMapping) ToProto() *ProtoPortMapping { return proto } -func PortMappingProtoMap(values []*PortMapping) []*ProtoPortMapping { +func (x *ProtoPortMapping) FromProto() *PortMapping { + copysafe := &PortMapping{ + ContainerPort: x.ContainerPort, + HostPort: x.HostPort, + ContainerTlsProxyPort: x.ContainerTlsProxyPort, + HostTlsProxyPort: x.HostTlsProxyPort, + } + return copysafe +} + +func PortMappingToProtoSlice(values []*PortMapping) []*ProtoPortMapping { result := make([]*ProtoPortMapping, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -190,6 +216,14 @@ func PortMappingProtoMap(values []*PortMapping) []*ProtoPortMapping { return result } +func PortMappingFromProtoSlice(values []*ProtoPortMapping) []*PortMapping { + result := make([]*PortMapping, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPKey directly type ActualLRPKey struct { ProcessGuid string @@ -272,7 +306,16 @@ func (x *ActualLRPKey) ToProto() *ProtoActualLRPKey { return proto } -func ActualLRPKeyProtoMap(values []*ActualLRPKey) []*ProtoActualLRPKey { +func (x *ProtoActualLRPKey) FromProto() *ActualLRPKey { + copysafe := &ActualLRPKey{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + Domain: x.Domain, + } + return copysafe +} + +func ActualLRPKeyToProtoSlice(values []*ActualLRPKey) []*ProtoActualLRPKey { result := make([]*ProtoActualLRPKey, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -280,6 +323,14 @@ func ActualLRPKeyProtoMap(values []*ActualLRPKey) []*ProtoActualLRPKey { return result } +func ActualLRPKeyFromProtoSlice(values []*ProtoActualLRPKey) []*ActualLRPKey { + result := make([]*ActualLRPKey, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPInstanceKey directly type ActualLRPInstanceKey struct { InstanceGuid string @@ -346,7 +397,15 @@ func (x *ActualLRPInstanceKey) ToProto() *ProtoActualLRPInstanceKey { return proto } -func ActualLRPInstanceKeyProtoMap(values []*ActualLRPInstanceKey) []*ProtoActualLRPInstanceKey { +func (x *ProtoActualLRPInstanceKey) FromProto() *ActualLRPInstanceKey { + copysafe := &ActualLRPInstanceKey{ + InstanceGuid: x.InstanceGuid, + CellId: x.CellId, + } + return copysafe +} + +func ActualLRPInstanceKeyToProtoSlice(values []*ActualLRPInstanceKey) []*ProtoActualLRPInstanceKey { result := make([]*ProtoActualLRPInstanceKey, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -354,6 +413,14 @@ func ActualLRPInstanceKeyProtoMap(values []*ActualLRPInstanceKey) []*ProtoActual return result } +func ActualLRPInstanceKeyFromProtoSlice(values []*ProtoActualLRPInstanceKey) []*ActualLRPInstanceKey { + result := make([]*ActualLRPInstanceKey, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + type ActualLRPNetInfo_PreferredAddress int32 const ( @@ -480,14 +547,24 @@ func (m *ActualLRPNetInfo) SetPreferredAddress(value ActualLRPNetInfo_PreferredA func (x *ActualLRPNetInfo) ToProto() *ProtoActualLRPNetInfo { proto := &ProtoActualLRPNetInfo{ Address: x.Address, - Ports: PortMappingProtoMap(x.Ports), + Ports: PortMappingToProtoSlice(x.Ports), InstanceAddress: x.InstanceAddress, PreferredAddress: ProtoActualLRPNetInfo_PreferredAddress(x.PreferredAddress), } return proto } -func ActualLRPNetInfoProtoMap(values []*ActualLRPNetInfo) []*ProtoActualLRPNetInfo { +func (x *ProtoActualLRPNetInfo) FromProto() *ActualLRPNetInfo { + copysafe := &ActualLRPNetInfo{ + Address: x.Address, + Ports: PortMappingFromProtoSlice(x.Ports), + InstanceAddress: x.InstanceAddress, + PreferredAddress: ActualLRPNetInfo_PreferredAddress(x.PreferredAddress), + } + return copysafe +} + +func ActualLRPNetInfoToProtoSlice(values []*ActualLRPNetInfo) []*ProtoActualLRPNetInfo { result := make([]*ProtoActualLRPNetInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -495,6 +572,14 @@ func ActualLRPNetInfoProtoMap(values []*ActualLRPNetInfo) []*ProtoActualLRPNetIn return result } +func ActualLRPNetInfoFromProtoSlice(values []*ProtoActualLRPNetInfo) []*ActualLRPNetInfo { + result := make([]*ActualLRPNetInfo, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPInternalRoute directly type ActualLRPInternalRoute struct { Hostname string @@ -545,7 +630,14 @@ func (x *ActualLRPInternalRoute) ToProto() *ProtoActualLRPInternalRoute { return proto } -func ActualLRPInternalRouteProtoMap(values []*ActualLRPInternalRoute) []*ProtoActualLRPInternalRoute { +func (x *ProtoActualLRPInternalRoute) FromProto() *ActualLRPInternalRoute { + copysafe := &ActualLRPInternalRoute{ + Hostname: x.Hostname, + } + return copysafe +} + +func ActualLRPInternalRouteToProtoSlice(values []*ActualLRPInternalRoute) []*ProtoActualLRPInternalRoute { result := make([]*ProtoActualLRPInternalRoute, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -553,6 +645,14 @@ func ActualLRPInternalRouteProtoMap(values []*ActualLRPInternalRoute) []*ProtoAc return result } +func ActualLRPInternalRouteFromProtoSlice(values []*ProtoActualLRPInternalRoute) []*ActualLRPInternalRoute { + result := make([]*ActualLRPInternalRoute, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + type ActualLRP_Presence int32 const ( @@ -846,7 +946,7 @@ func (x *ActualLRP) ToProto() *ProtoActualLRP { Since: x.Since, ModificationTag: x.ModificationTag.ToProto(), Presence: ProtoActualLRP_Presence(x.Presence), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + ActualLrpInternalRoutes: ActualLRPInternalRouteToProtoSlice(x.ActualLrpInternalRoutes), MetricTags: x.MetricTags, Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, @@ -854,10 +954,38 @@ func (x *ActualLRP) ToProto() *ProtoActualLRP { return proto } -func ActualLRPProtoMap(values []*ActualLRP) []*ProtoActualLRP { +func (x *ProtoActualLRP) FromProto() *ActualLRP { + copysafe := &ActualLRP{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.FromProto(), + CrashCount: x.CrashCount, + CrashReason: x.CrashReason, + State: x.State, + PlacementError: x.PlacementError, + Since: x.Since, + ModificationTag: x.ModificationTag.FromProto(), + Presence: ActualLRP_Presence(x.Presence), + ActualLrpInternalRoutes: ActualLRPInternalRouteFromProtoSlice(x.ActualLrpInternalRoutes), + MetricTags: x.MetricTags, + Routable: x.Routable, + AvailabilityZone: x.AvailabilityZone, + } + return copysafe +} + +func ActualLRPToProtoSlice(values []*ActualLRP) []*ProtoActualLRP { result := make([]*ProtoActualLRP, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func ActualLRPFromProtoSlice(values []*ProtoActualLRP) []*ActualLRP { + result := make([]*ActualLRP, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 1fd8bbf8..08f311b0 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -56,7 +56,14 @@ func (x *ActualLRPLifecycleResponse) ToProto() *ProtoActualLRPLifecycleResponse return proto } -func ActualLRPLifecycleResponseProtoMap(values []*ActualLRPLifecycleResponse) []*ProtoActualLRPLifecycleResponse { +func (x *ProtoActualLRPLifecycleResponse) FromProto() *ActualLRPLifecycleResponse { + copysafe := &ActualLRPLifecycleResponse{ + Error: x.Error.FromProto(), + } + return copysafe +} + +func ActualLRPLifecycleResponseToProtoSlice(values []*ActualLRPLifecycleResponse) []*ProtoActualLRPLifecycleResponse { result := make([]*ProtoActualLRPLifecycleResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -64,6 +71,14 @@ func ActualLRPLifecycleResponseProtoMap(values []*ActualLRPLifecycleResponse) [] return result } +func ActualLRPLifecycleResponseFromProtoSlice(values []*ProtoActualLRPLifecycleResponse) []*ActualLRPLifecycleResponse { + result := make([]*ActualLRPLifecycleResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPGroupsResponse directly type ActualLRPGroupsResponse struct { Error *Error @@ -130,12 +145,20 @@ func (m *ActualLRPGroupsResponse) SetActualLrpGroups(value []*ActualLRPGroup) { func (x *ActualLRPGroupsResponse) ToProto() *ProtoActualLRPGroupsResponse { proto := &ProtoActualLRPGroupsResponse{ Error: x.Error.ToProto(), - ActualLrpGroups: ActualLRPGroupProtoMap(x.ActualLrpGroups), + ActualLrpGroups: ActualLRPGroupToProtoSlice(x.ActualLrpGroups), } return proto } -func ActualLRPGroupsResponseProtoMap(values []*ActualLRPGroupsResponse) []*ProtoActualLRPGroupsResponse { +func (x *ProtoActualLRPGroupsResponse) FromProto() *ActualLRPGroupsResponse { + copysafe := &ActualLRPGroupsResponse{ + Error: x.Error.FromProto(), + ActualLrpGroups: ActualLRPGroupFromProtoSlice(x.ActualLrpGroups), + } + return copysafe +} + +func ActualLRPGroupsResponseToProtoSlice(values []*ActualLRPGroupsResponse) []*ProtoActualLRPGroupsResponse { result := make([]*ProtoActualLRPGroupsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -143,6 +166,14 @@ func ActualLRPGroupsResponseProtoMap(values []*ActualLRPGroupsResponse) []*Proto return result } +func ActualLRPGroupsResponseFromProtoSlice(values []*ProtoActualLRPGroupsResponse) []*ActualLRPGroupsResponse { + result := make([]*ActualLRPGroupsResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPGroupResponse directly type ActualLRPGroupResponse struct { Error *Error @@ -209,7 +240,15 @@ func (x *ActualLRPGroupResponse) ToProto() *ProtoActualLRPGroupResponse { return proto } -func ActualLRPGroupResponseProtoMap(values []*ActualLRPGroupResponse) []*ProtoActualLRPGroupResponse { +func (x *ProtoActualLRPGroupResponse) FromProto() *ActualLRPGroupResponse { + copysafe := &ActualLRPGroupResponse{ + Error: x.Error.FromProto(), + ActualLrpGroup: x.ActualLrpGroup.FromProto(), + } + return copysafe +} + +func ActualLRPGroupResponseToProtoSlice(values []*ActualLRPGroupResponse) []*ProtoActualLRPGroupResponse { result := make([]*ProtoActualLRPGroupResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -217,6 +256,14 @@ func ActualLRPGroupResponseProtoMap(values []*ActualLRPGroupResponse) []*ProtoAc return result } +func ActualLRPGroupResponseFromProtoSlice(values []*ProtoActualLRPGroupResponse) []*ActualLRPGroupResponse { + result := make([]*ActualLRPGroupResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPGroupsRequest directly type ActualLRPGroupsRequest struct { Domain string @@ -283,7 +330,15 @@ func (x *ActualLRPGroupsRequest) ToProto() *ProtoActualLRPGroupsRequest { return proto } -func ActualLRPGroupsRequestProtoMap(values []*ActualLRPGroupsRequest) []*ProtoActualLRPGroupsRequest { +func (x *ProtoActualLRPGroupsRequest) FromProto() *ActualLRPGroupsRequest { + copysafe := &ActualLRPGroupsRequest{ + Domain: x.Domain, + CellId: x.CellId, + } + return copysafe +} + +func ActualLRPGroupsRequestToProtoSlice(values []*ActualLRPGroupsRequest) []*ProtoActualLRPGroupsRequest { result := make([]*ProtoActualLRPGroupsRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -291,6 +346,14 @@ func ActualLRPGroupsRequestProtoMap(values []*ActualLRPGroupsRequest) []*ProtoAc return result } +func ActualLRPGroupsRequestFromProtoSlice(values []*ProtoActualLRPGroupsRequest) []*ActualLRPGroupsRequest { + result := make([]*ActualLRPGroupsRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPGroupsByProcessGuidRequest directly type ActualLRPGroupsByProcessGuidRequest struct { ProcessGuid string @@ -341,7 +404,14 @@ func (x *ActualLRPGroupsByProcessGuidRequest) ToProto() *ProtoActualLRPGroupsByP return proto } -func ActualLRPGroupsByProcessGuidRequestProtoMap(values []*ActualLRPGroupsByProcessGuidRequest) []*ProtoActualLRPGroupsByProcessGuidRequest { +func (x *ProtoActualLRPGroupsByProcessGuidRequest) FromProto() *ActualLRPGroupsByProcessGuidRequest { + copysafe := &ActualLRPGroupsByProcessGuidRequest{ + ProcessGuid: x.ProcessGuid, + } + return copysafe +} + +func ActualLRPGroupsByProcessGuidRequestToProtoSlice(values []*ActualLRPGroupsByProcessGuidRequest) []*ProtoActualLRPGroupsByProcessGuidRequest { result := make([]*ProtoActualLRPGroupsByProcessGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -349,6 +419,14 @@ func ActualLRPGroupsByProcessGuidRequestProtoMap(values []*ActualLRPGroupsByProc return result } +func ActualLRPGroupsByProcessGuidRequestFromProtoSlice(values []*ProtoActualLRPGroupsByProcessGuidRequest) []*ActualLRPGroupsByProcessGuidRequest { + result := make([]*ActualLRPGroupsByProcessGuidRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPGroupByProcessGuidAndIndexRequest directly type ActualLRPGroupByProcessGuidAndIndexRequest struct { ProcessGuid string @@ -415,7 +493,15 @@ func (x *ActualLRPGroupByProcessGuidAndIndexRequest) ToProto() *ProtoActualLRPGr return proto } -func ActualLRPGroupByProcessGuidAndIndexRequestProtoMap(values []*ActualLRPGroupByProcessGuidAndIndexRequest) []*ProtoActualLRPGroupByProcessGuidAndIndexRequest { +func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) FromProto() *ActualLRPGroupByProcessGuidAndIndexRequest { + copysafe := &ActualLRPGroupByProcessGuidAndIndexRequest{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + } + return copysafe +} + +func ActualLRPGroupByProcessGuidAndIndexRequestToProtoSlice(values []*ActualLRPGroupByProcessGuidAndIndexRequest) []*ProtoActualLRPGroupByProcessGuidAndIndexRequest { result := make([]*ProtoActualLRPGroupByProcessGuidAndIndexRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -423,6 +509,14 @@ func ActualLRPGroupByProcessGuidAndIndexRequestProtoMap(values []*ActualLRPGroup return result } +func ActualLRPGroupByProcessGuidAndIndexRequestFromProtoSlice(values []*ProtoActualLRPGroupByProcessGuidAndIndexRequest) []*ActualLRPGroupByProcessGuidAndIndexRequest { + result := make([]*ActualLRPGroupByProcessGuidAndIndexRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoClaimActualLRPRequest directly type ClaimActualLRPRequest struct { ProcessGuid string @@ -505,7 +599,16 @@ func (x *ClaimActualLRPRequest) ToProto() *ProtoClaimActualLRPRequest { return proto } -func ClaimActualLRPRequestProtoMap(values []*ClaimActualLRPRequest) []*ProtoClaimActualLRPRequest { +func (x *ProtoClaimActualLRPRequest) FromProto() *ClaimActualLRPRequest { + copysafe := &ClaimActualLRPRequest{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + } + return copysafe +} + +func ClaimActualLRPRequestToProtoSlice(values []*ClaimActualLRPRequest) []*ProtoClaimActualLRPRequest { result := make([]*ProtoClaimActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -513,6 +616,14 @@ func ClaimActualLRPRequestProtoMap(values []*ClaimActualLRPRequest) []*ProtoClai return result } +func ClaimActualLRPRequestFromProtoSlice(values []*ProtoClaimActualLRPRequest) []*ClaimActualLRPRequest { + result := make([]*ClaimActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoStartActualLRPRequest directly type StartActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -664,7 +775,7 @@ func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + ActualLrpInternalRoutes: ActualLRPInternalRouteToProtoSlice(x.ActualLrpInternalRoutes), MetricTags: x.MetricTags, Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, @@ -672,7 +783,20 @@ func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { return proto } -func StartActualLRPRequestProtoMap(values []*StartActualLRPRequest) []*ProtoStartActualLRPRequest { +func (x *ProtoStartActualLRPRequest) FromProto() *StartActualLRPRequest { + copysafe := &StartActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.FromProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteFromProtoSlice(x.ActualLrpInternalRoutes), + MetricTags: x.MetricTags, + Routable: x.Routable, + AvailabilityZone: x.AvailabilityZone, + } + return copysafe +} + +func StartActualLRPRequestToProtoSlice(values []*StartActualLRPRequest) []*ProtoStartActualLRPRequest { result := make([]*ProtoStartActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -680,6 +804,14 @@ func StartActualLRPRequestProtoMap(values []*StartActualLRPRequest) []*ProtoStar return result } +func StartActualLRPRequestFromProtoSlice(values []*ProtoStartActualLRPRequest) []*StartActualLRPRequest { + result := make([]*StartActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoCrashActualLRPRequest directly type CrashActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -762,7 +894,16 @@ func (x *CrashActualLRPRequest) ToProto() *ProtoCrashActualLRPRequest { return proto } -func CrashActualLRPRequestProtoMap(values []*CrashActualLRPRequest) []*ProtoCrashActualLRPRequest { +func (x *ProtoCrashActualLRPRequest) FromProto() *CrashActualLRPRequest { + copysafe := &CrashActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + ErrorMessage: x.ErrorMessage, + } + return copysafe +} + +func CrashActualLRPRequestToProtoSlice(values []*CrashActualLRPRequest) []*ProtoCrashActualLRPRequest { result := make([]*ProtoCrashActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -770,6 +911,14 @@ func CrashActualLRPRequestProtoMap(values []*CrashActualLRPRequest) []*ProtoCras return result } +func CrashActualLRPRequestFromProtoSlice(values []*ProtoCrashActualLRPRequest) []*CrashActualLRPRequest { + result := make([]*CrashActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoFailActualLRPRequest directly type FailActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -836,7 +985,15 @@ func (x *FailActualLRPRequest) ToProto() *ProtoFailActualLRPRequest { return proto } -func FailActualLRPRequestProtoMap(values []*FailActualLRPRequest) []*ProtoFailActualLRPRequest { +func (x *ProtoFailActualLRPRequest) FromProto() *FailActualLRPRequest { + copysafe := &FailActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ErrorMessage: x.ErrorMessage, + } + return copysafe +} + +func FailActualLRPRequestToProtoSlice(values []*FailActualLRPRequest) []*ProtoFailActualLRPRequest { result := make([]*ProtoFailActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -844,6 +1001,14 @@ func FailActualLRPRequestProtoMap(values []*FailActualLRPRequest) []*ProtoFailAc return result } +func FailActualLRPRequestFromProtoSlice(values []*ProtoFailActualLRPRequest) []*FailActualLRPRequest { + result := make([]*FailActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoRetireActualLRPRequest directly type RetireActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -894,7 +1059,14 @@ func (x *RetireActualLRPRequest) ToProto() *ProtoRetireActualLRPRequest { return proto } -func RetireActualLRPRequestProtoMap(values []*RetireActualLRPRequest) []*ProtoRetireActualLRPRequest { +func (x *ProtoRetireActualLRPRequest) FromProto() *RetireActualLRPRequest { + copysafe := &RetireActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + } + return copysafe +} + +func RetireActualLRPRequestToProtoSlice(values []*RetireActualLRPRequest) []*ProtoRetireActualLRPRequest { result := make([]*ProtoRetireActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -902,6 +1074,14 @@ func RetireActualLRPRequestProtoMap(values []*RetireActualLRPRequest) []*ProtoRe return result } +func RetireActualLRPRequestFromProtoSlice(values []*ProtoRetireActualLRPRequest) []*RetireActualLRPRequest { + result := make([]*RetireActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoRemoveActualLRPRequest directly type RemoveActualLRPRequest struct { ProcessGuid string @@ -984,7 +1164,16 @@ func (x *RemoveActualLRPRequest) ToProto() *ProtoRemoveActualLRPRequest { return proto } -func RemoveActualLRPRequestProtoMap(values []*RemoveActualLRPRequest) []*ProtoRemoveActualLRPRequest { +func (x *ProtoRemoveActualLRPRequest) FromProto() *RemoveActualLRPRequest { + copysafe := &RemoveActualLRPRequest{ + ProcessGuid: x.ProcessGuid, + Index: x.Index, + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + } + return copysafe +} + +func RemoveActualLRPRequestToProtoSlice(values []*RemoveActualLRPRequest) []*ProtoRemoveActualLRPRequest { result := make([]*ProtoRemoveActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -992,6 +1181,14 @@ func RemoveActualLRPRequestProtoMap(values []*RemoveActualLRPRequest) []*ProtoRe return result } +func RemoveActualLRPRequestFromProtoSlice(values []*ProtoRemoveActualLRPRequest) []*RemoveActualLRPRequest { + result := make([]*RemoveActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPsResponse directly type ActualLRPsResponse struct { Error *Error @@ -1058,12 +1255,20 @@ func (m *ActualLRPsResponse) SetActualLrps(value []*ActualLRP) { func (x *ActualLRPsResponse) ToProto() *ProtoActualLRPsResponse { proto := &ProtoActualLRPsResponse{ Error: x.Error.ToProto(), - ActualLrps: ActualLRPProtoMap(x.ActualLrps), + ActualLrps: ActualLRPToProtoSlice(x.ActualLrps), } return proto } -func ActualLRPsResponseProtoMap(values []*ActualLRPsResponse) []*ProtoActualLRPsResponse { +func (x *ProtoActualLRPsResponse) FromProto() *ActualLRPsResponse { + copysafe := &ActualLRPsResponse{ + Error: x.Error.FromProto(), + ActualLrps: ActualLRPFromProtoSlice(x.ActualLrps), + } + return copysafe +} + +func ActualLRPsResponseToProtoSlice(values []*ActualLRPsResponse) []*ProtoActualLRPsResponse { result := make([]*ProtoActualLRPsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1071,6 +1276,14 @@ func ActualLRPsResponseProtoMap(values []*ActualLRPsResponse) []*ProtoActualLRPs return result } +func ActualLRPsResponseFromProtoSlice(values []*ProtoActualLRPsResponse) []*ActualLRPsResponse { + result := make([]*ActualLRPsResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPsRequest directly type ActualLRPsRequest struct { Domain string @@ -1172,10 +1385,28 @@ func (x *ActualLRPsRequest) ToProto() *ProtoActualLRPsRequest { return proto } -func ActualLRPsRequestProtoMap(values []*ActualLRPsRequest) []*ProtoActualLRPsRequest { +func (x *ProtoActualLRPsRequest) FromProto() *ActualLRPsRequest { + copysafe := &ActualLRPsRequest{ + Domain: x.Domain, + CellId: x.CellId, + ProcessGuid: x.ProcessGuid, + Index: x.Index, + } + return copysafe +} + +func ActualLRPsRequestToProtoSlice(values []*ActualLRPsRequest) []*ProtoActualLRPsRequest { result := make([]*ProtoActualLRPsRequest, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func ActualLRPsRequestFromProtoSlice(values []*ProtoActualLRPsRequest) []*ActualLRPsRequest { + result := make([]*ActualLRPsRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index bedc0b28..4a2804e1 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -152,10 +152,31 @@ func (x *CachedDependency) ToProto() *ProtoCachedDependency { return proto } -func CachedDependencyProtoMap(values []*CachedDependency) []*ProtoCachedDependency { +func (x *ProtoCachedDependency) FromProto() *CachedDependency { + copysafe := &CachedDependency{ + Name: x.Name, + From: x.From, + To: x.To, + CacheKey: x.CacheKey, + LogSource: x.LogSource, + ChecksumAlgorithm: x.ChecksumAlgorithm, + ChecksumValue: x.ChecksumValue, + } + return copysafe +} + +func CachedDependencyToProtoSlice(values []*CachedDependency) []*ProtoCachedDependency { result := make([]*ProtoCachedDependency, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func CachedDependencyFromProtoSlice(values []*ProtoCachedDependency) []*CachedDependency { + result := make([]*CachedDependency, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 15a48ade..bf97539d 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -88,7 +88,16 @@ func (x *CellCapacity) ToProto() *ProtoCellCapacity { return proto } -func CellCapacityProtoMap(values []*CellCapacity) []*ProtoCellCapacity { +func (x *ProtoCellCapacity) FromProto() *CellCapacity { + copysafe := &CellCapacity{ + MemoryMb: x.MemoryMb, + DiskMb: x.DiskMb, + Containers: x.Containers, + } + return copysafe +} + +func CellCapacityToProtoSlice(values []*CellCapacity) []*ProtoCellCapacity { result := make([]*ProtoCellCapacity, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -96,6 +105,14 @@ func CellCapacityProtoMap(values []*CellCapacity) []*ProtoCellCapacity { return result } +func CellCapacityFromProtoSlice(values []*ProtoCellCapacity) []*CellCapacity { + result := make([]*CellCapacity, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoCellPresence directly type CellPresence struct { CellId string @@ -265,7 +282,7 @@ func (x *CellPresence) ToProto() *ProtoCellPresence { RepAddress: x.RepAddress, Zone: x.Zone, Capacity: x.Capacity.ToProto(), - RootfsProviders: ProviderProtoMap(x.RootfsProviders), + RootfsProviders: ProviderToProtoSlice(x.RootfsProviders), PlacementTags: x.PlacementTags, OptionalPlacementTags: x.OptionalPlacementTags, RepUrl: x.RepUrl, @@ -273,7 +290,21 @@ func (x *CellPresence) ToProto() *ProtoCellPresence { return proto } -func CellPresenceProtoMap(values []*CellPresence) []*ProtoCellPresence { +func (x *ProtoCellPresence) FromProto() *CellPresence { + copysafe := &CellPresence{ + CellId: x.CellId, + RepAddress: x.RepAddress, + Zone: x.Zone, + Capacity: x.Capacity.FromProto(), + RootfsProviders: ProviderFromProtoSlice(x.RootfsProviders), + PlacementTags: x.PlacementTags, + OptionalPlacementTags: x.OptionalPlacementTags, + RepUrl: x.RepUrl, + } + return copysafe +} + +func CellPresenceToProtoSlice(values []*CellPresence) []*ProtoCellPresence { result := make([]*ProtoCellPresence, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -281,6 +312,14 @@ func CellPresenceProtoMap(values []*CellPresence) []*ProtoCellPresence { return result } +func CellPresenceFromProtoSlice(values []*ProtoCellPresence) []*CellPresence { + result := make([]*CellPresence, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoProvider directly type Provider struct { Name string @@ -352,7 +391,15 @@ func (x *Provider) ToProto() *ProtoProvider { return proto } -func ProviderProtoMap(values []*Provider) []*ProtoProvider { +func (x *ProtoProvider) FromProto() *Provider { + copysafe := &Provider{ + Name: x.Name, + Properties: x.Properties, + } + return copysafe +} + +func ProviderToProtoSlice(values []*Provider) []*ProtoProvider { result := make([]*ProtoProvider, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -360,6 +407,14 @@ func ProviderProtoMap(values []*Provider) []*ProtoProvider { return result } +func ProviderFromProtoSlice(values []*ProtoProvider) []*Provider { + result := make([]*Provider, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoCellsResponse directly type CellsResponse struct { Error *Error @@ -426,15 +481,31 @@ func (m *CellsResponse) SetCells(value []*CellPresence) { func (x *CellsResponse) ToProto() *ProtoCellsResponse { proto := &ProtoCellsResponse{ Error: x.Error.ToProto(), - Cells: CellPresenceProtoMap(x.Cells), + Cells: CellPresenceToProtoSlice(x.Cells), } return proto } -func CellsResponseProtoMap(values []*CellsResponse) []*ProtoCellsResponse { +func (x *ProtoCellsResponse) FromProto() *CellsResponse { + copysafe := &CellsResponse{ + Error: x.Error.FromProto(), + Cells: CellPresenceFromProtoSlice(x.Cells), + } + return copysafe +} + +func CellsResponseToProtoSlice(values []*CellsResponse) []*ProtoCellsResponse { result := make([]*ProtoCellsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func CellsResponseFromProtoSlice(values []*ProtoCellsResponse) []*CellsResponse { + result := make([]*CellsResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 56be2a98..ef1e4a76 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -61,10 +61,25 @@ func (x *CertificateProperties) ToProto() *ProtoCertificateProperties { return proto } -func CertificatePropertiesProtoMap(values []*CertificateProperties) []*ProtoCertificateProperties { +func (x *ProtoCertificateProperties) FromProto() *CertificateProperties { + copysafe := &CertificateProperties{ + OrganizationalUnit: x.OrganizationalUnit, + } + return copysafe +} + +func CertificatePropertiesToProtoSlice(values []*CertificateProperties) []*ProtoCertificateProperties { result := make([]*ProtoCertificateProperties, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func CertificatePropertiesFromProtoSlice(values []*ProtoCertificateProperties) []*CertificateProperties { + result := make([]*CertificateProperties, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 1dc823e3..b1a16a29 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -91,14 +91,23 @@ func (m *CheckDefinition) SetReadinessChecks(value []*Check) { } func (x *CheckDefinition) ToProto() *ProtoCheckDefinition { proto := &ProtoCheckDefinition{ - Checks: CheckProtoMap(x.Checks), + Checks: CheckToProtoSlice(x.Checks), LogSource: x.LogSource, - ReadinessChecks: CheckProtoMap(x.ReadinessChecks), + ReadinessChecks: CheckToProtoSlice(x.ReadinessChecks), } return proto } -func CheckDefinitionProtoMap(values []*CheckDefinition) []*ProtoCheckDefinition { +func (x *ProtoCheckDefinition) FromProto() *CheckDefinition { + copysafe := &CheckDefinition{ + Checks: CheckFromProtoSlice(x.Checks), + LogSource: x.LogSource, + ReadinessChecks: CheckFromProtoSlice(x.ReadinessChecks), + } + return copysafe +} + +func CheckDefinitionToProtoSlice(values []*CheckDefinition) []*ProtoCheckDefinition { result := make([]*ProtoCheckDefinition, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -106,6 +115,14 @@ func CheckDefinitionProtoMap(values []*CheckDefinition) []*ProtoCheckDefinition return result } +func CheckDefinitionFromProtoSlice(values []*ProtoCheckDefinition) []*CheckDefinition { + result := make([]*CheckDefinition, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoCheck directly type Check struct { TcpCheck *TCPCheck @@ -172,7 +189,15 @@ func (x *Check) ToProto() *ProtoCheck { return proto } -func CheckProtoMap(values []*Check) []*ProtoCheck { +func (x *ProtoCheck) FromProto() *Check { + copysafe := &Check{ + TcpCheck: x.TcpCheck.FromProto(), + HttpCheck: x.HttpCheck.FromProto(), + } + return copysafe +} + +func CheckToProtoSlice(values []*Check) []*ProtoCheck { result := make([]*ProtoCheck, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -180,6 +205,14 @@ func CheckProtoMap(values []*Check) []*ProtoCheck { return result } +func CheckFromProtoSlice(values []*ProtoCheck) []*Check { + result := make([]*Check, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTCPCheck directly type TCPCheck struct { Port uint32 @@ -262,7 +295,16 @@ func (x *TCPCheck) ToProto() *ProtoTCPCheck { return proto } -func TCPCheckProtoMap(values []*TCPCheck) []*ProtoTCPCheck { +func (x *ProtoTCPCheck) FromProto() *TCPCheck { + copysafe := &TCPCheck{ + Port: x.Port, + ConnectTimeoutMs: x.ConnectTimeoutMs, + IntervalMs: x.IntervalMs, + } + return copysafe +} + +func TCPCheckToProtoSlice(values []*TCPCheck) []*ProtoTCPCheck { result := make([]*ProtoTCPCheck, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -270,6 +312,14 @@ func TCPCheckProtoMap(values []*TCPCheck) []*ProtoTCPCheck { return result } +func TCPCheckFromProtoSlice(values []*ProtoTCPCheck) []*TCPCheck { + result := make([]*TCPCheck, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoHTTPCheck directly type HTTPCheck struct { Port uint32 @@ -368,10 +418,28 @@ func (x *HTTPCheck) ToProto() *ProtoHTTPCheck { return proto } -func HTTPCheckProtoMap(values []*HTTPCheck) []*ProtoHTTPCheck { +func (x *ProtoHTTPCheck) FromProto() *HTTPCheck { + copysafe := &HTTPCheck{ + Port: x.Port, + RequestTimeoutMs: x.RequestTimeoutMs, + Path: x.Path, + IntervalMs: x.IntervalMs, + } + return copysafe +} + +func HTTPCheckToProtoSlice(values []*HTTPCheck) []*ProtoHTTPCheck { result := make([]*ProtoHTTPCheck, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func HTTPCheckFromProtoSlice(values []*ProtoHTTPCheck) []*HTTPCheck { + result := make([]*HTTPCheck, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 18daf0b5..3a525c78 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -173,7 +173,21 @@ func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { return proto } -func DesiredLRPSchedulingInfoProtoMap(values []*DesiredLRPSchedulingInfo) []*ProtoDesiredLRPSchedulingInfo { +func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { + copysafe := &DesiredLRPSchedulingInfo{ + DesiredLrpKey: x.DesiredLrpKey.FromProto(), + Annotation: x.Annotation, + Instances: x.Instances, + DesiredLrpResource: x.DesiredLrpResource.FromProto(), + Routes: x.Routes.FromProto(), + ModificationTag: x.ModificationTag.FromProto(), + VolumePlacement: x.VolumePlacement.FromProto(), + PlacementTags: x.PlacementTags, + } + return copysafe +} + +func DesiredLRPSchedulingInfoToProtoSlice(values []*DesiredLRPSchedulingInfo) []*ProtoDesiredLRPSchedulingInfo { result := make([]*ProtoDesiredLRPSchedulingInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -181,6 +195,14 @@ func DesiredLRPSchedulingInfoProtoMap(values []*DesiredLRPSchedulingInfo) []*Pro return result } +func DesiredLRPSchedulingInfoFromProtoSlice(values []*ProtoDesiredLRPSchedulingInfo) []*DesiredLRPSchedulingInfo { + result := make([]*DesiredLRPSchedulingInfo, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPRunInfo directly type DesiredLRPRunInfo struct { DesiredLrpKey *DesiredLRPKey @@ -666,7 +688,7 @@ func (m *DesiredLRPRunInfo) SetLogRateLimit(value *LogRateLimit) { func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { proto := &ProtoDesiredLRPRunInfo{ DesiredLrpKey: x.DesiredLrpKey.ToProto(), - EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), + EnvironmentVariables: EnvironmentVariableToProtoSlice(x.EnvironmentVariables), Setup: x.Setup.ToProto(), Action: x.Action.ToProto(), Monitor: x.Monitor.ToProto(), @@ -674,29 +696,62 @@ func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { Privileged: x.Privileged, CpuWeight: x.CpuWeight, Ports: x.Ports, - EgressRules: SecurityGroupRuleProtoMap(x.EgressRules), + EgressRules: SecurityGroupRuleToProtoSlice(x.EgressRules), LogSource: x.LogSource, MetricsGuid: x.MetricsGuid, CreatedAt: x.CreatedAt, - CachedDependencies: CachedDependencyProtoMap(x.CachedDependencies), + CachedDependencies: CachedDependencyToProtoSlice(x.CachedDependencies), LegacyDownloadUser: x.LegacyDownloadUser, TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, - VolumeMounts: VolumeMountProtoMap(x.VolumeMounts), + VolumeMounts: VolumeMountToProtoSlice(x.VolumeMounts), Network: x.Network.ToProto(), StartTimeoutMs: x.StartTimeoutMs, CertificateProperties: x.CertificateProperties.ToProto(), ImageUsername: x.ImageUsername, ImagePassword: x.ImagePassword, CheckDefinition: x.CheckDefinition.ToProto(), - ImageLayers: ImageLayerProtoMap(x.ImageLayers), - MetricTags: DesiredLRPRunInfoMetricTagsProtoMap(x.MetricTags), - Sidecars: SidecarProtoMap(x.Sidecars), + ImageLayers: ImageLayerToProtoSlice(x.ImageLayers), + MetricTags: DesiredLRPRunInfoMetricTagsToProtoMap(x.MetricTags), + Sidecars: SidecarToProtoSlice(x.Sidecars), LogRateLimit: x.LogRateLimit.ToProto(), } return proto } -func DesiredLRPRunInfoProtoMap(values []*DesiredLRPRunInfo) []*ProtoDesiredLRPRunInfo { +func (x *ProtoDesiredLRPRunInfo) FromProto() *DesiredLRPRunInfo { + copysafe := &DesiredLRPRunInfo{ + DesiredLrpKey: x.DesiredLrpKey.FromProto(), + EnvironmentVariables: EnvironmentVariableFromProtoSlice(x.EnvironmentVariables), + Setup: x.Setup.FromProto(), + Action: x.Action.FromProto(), + Monitor: x.Monitor.FromProto(), + DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, + Privileged: x.Privileged, + CpuWeight: x.CpuWeight, + Ports: x.Ports, + EgressRules: SecurityGroupRuleFromProtoSlice(x.EgressRules), + LogSource: x.LogSource, + MetricsGuid: x.MetricsGuid, + CreatedAt: x.CreatedAt, + CachedDependencies: CachedDependencyFromProtoSlice(x.CachedDependencies), + LegacyDownloadUser: x.LegacyDownloadUser, + TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, + VolumeMounts: VolumeMountFromProtoSlice(x.VolumeMounts), + Network: x.Network.FromProto(), + StartTimeoutMs: x.StartTimeoutMs, + CertificateProperties: x.CertificateProperties.FromProto(), + ImageUsername: x.ImageUsername, + ImagePassword: x.ImagePassword, + CheckDefinition: x.CheckDefinition.FromProto(), + ImageLayers: ImageLayerFromProtoSlice(x.ImageLayers), + MetricTags: DesiredLRPRunInfoMetricTagsFromProtoMap(x.MetricTags), + Sidecars: SidecarFromProtoSlice(x.Sidecars), + LogRateLimit: x.LogRateLimit.FromProto(), + } + return copysafe +} + +func DesiredLRPRunInfoToProtoSlice(values []*DesiredLRPRunInfo) []*ProtoDesiredLRPRunInfo { result := make([]*ProtoDesiredLRPRunInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -704,7 +759,7 @@ func DesiredLRPRunInfoProtoMap(values []*DesiredLRPRunInfo) []*ProtoDesiredLRPRu return result } -func DesiredLRPRunInfoMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { +func DesiredLRPRunInfoMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -712,6 +767,22 @@ func DesiredLRPRunInfoMetricTagsProtoMap(values map[string]*MetricTagValue) map[ return result } +func DesiredLRPRunInfoFromProtoSlice(values []*ProtoDesiredLRPRunInfo) []*DesiredLRPRunInfo { + result := make([]*DesiredLRPRunInfo, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + +func DesiredLRPRunInfoMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + result := make(map[string]*MetricTagValue, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPUpdate directly type DesiredLRPUpdate struct { Instances *int32 @@ -819,12 +890,22 @@ func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { Instances: x.Instances, Routes: x.Routes.ToProto(), Annotation: x.Annotation, - MetricTags: DesiredLRPUpdateMetricTagsProtoMap(x.MetricTags), + MetricTags: DesiredLRPUpdateMetricTagsToProtoMap(x.MetricTags), } return proto } -func DesiredLRPUpdateProtoMap(values []*DesiredLRPUpdate) []*ProtoDesiredLRPUpdate { +func (x *ProtoDesiredLRPUpdate) FromProto() *DesiredLRPUpdate { + copysafe := &DesiredLRPUpdate{ + Instances: x.Instances, + Routes: x.Routes.FromProto(), + Annotation: x.Annotation, + MetricTags: DesiredLRPUpdateMetricTagsFromProtoMap(x.MetricTags), + } + return copysafe +} + +func DesiredLRPUpdateToProtoSlice(values []*DesiredLRPUpdate) []*ProtoDesiredLRPUpdate { result := make([]*ProtoDesiredLRPUpdate, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -832,7 +913,7 @@ func DesiredLRPUpdateProtoMap(values []*DesiredLRPUpdate) []*ProtoDesiredLRPUpda return result } -func DesiredLRPUpdateMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { +func DesiredLRPUpdateMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -840,6 +921,22 @@ func DesiredLRPUpdateMetricTagsProtoMap(values map[string]*MetricTagValue) map[s return result } +func DesiredLRPUpdateFromProtoSlice(values []*ProtoDesiredLRPUpdate) []*DesiredLRPUpdate { + result := make([]*DesiredLRPUpdate, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + +func DesiredLRPUpdateMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + result := make(map[string]*MetricTagValue, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPKey directly type DesiredLRPKey struct { ProcessGuid string @@ -922,7 +1019,16 @@ func (x *DesiredLRPKey) ToProto() *ProtoDesiredLRPKey { return proto } -func DesiredLRPKeyProtoMap(values []*DesiredLRPKey) []*ProtoDesiredLRPKey { +func (x *ProtoDesiredLRPKey) FromProto() *DesiredLRPKey { + copysafe := &DesiredLRPKey{ + ProcessGuid: x.ProcessGuid, + Domain: x.Domain, + LogGuid: x.LogGuid, + } + return copysafe +} + +func DesiredLRPKeyToProtoSlice(values []*DesiredLRPKey) []*ProtoDesiredLRPKey { result := make([]*ProtoDesiredLRPKey, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -930,6 +1036,14 @@ func DesiredLRPKeyProtoMap(values []*DesiredLRPKey) []*ProtoDesiredLRPKey { return result } +func DesiredLRPKeyFromProtoSlice(values []*ProtoDesiredLRPKey) []*DesiredLRPKey { + result := make([]*DesiredLRPKey, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPResource directly type DesiredLRPResource struct { MemoryMb int32 @@ -1028,7 +1142,17 @@ func (x *DesiredLRPResource) ToProto() *ProtoDesiredLRPResource { return proto } -func DesiredLRPResourceProtoMap(values []*DesiredLRPResource) []*ProtoDesiredLRPResource { +func (x *ProtoDesiredLRPResource) FromProto() *DesiredLRPResource { + copysafe := &DesiredLRPResource{ + MemoryMb: x.MemoryMb, + DiskMb: x.DiskMb, + RootFs: x.RootFs, + MaxPids: x.MaxPids, + } + return copysafe +} + +func DesiredLRPResourceToProtoSlice(values []*DesiredLRPResource) []*ProtoDesiredLRPResource { result := make([]*ProtoDesiredLRPResource, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1036,6 +1160,14 @@ func DesiredLRPResourceProtoMap(values []*DesiredLRPResource) []*ProtoDesiredLRP return result } +func DesiredLRPResourceFromProtoSlice(values []*ProtoDesiredLRPResource) []*DesiredLRPResource { + result := make([]*DesiredLRPResource, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRP directly type DesiredLRP struct { ProcessGuid string @@ -1682,7 +1814,7 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { Domain: x.Domain, RootFs: x.RootFs, Instances: x.Instances, - EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), + EnvironmentVariables: EnvironmentVariableToProtoSlice(x.EnvironmentVariables), Setup: x.Setup.ToProto(), Action: x.Action.ToProto(), StartTimeoutMs: x.StartTimeoutMs, @@ -1698,12 +1830,12 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { LogGuid: x.LogGuid, MetricsGuid: x.MetricsGuid, Annotation: x.Annotation, - EgressRules: SecurityGroupRuleProtoMap(x.EgressRules), + EgressRules: SecurityGroupRuleToProtoSlice(x.EgressRules), ModificationTag: x.ModificationTag.ToProto(), - CachedDependencies: CachedDependencyProtoMap(x.CachedDependencies), + CachedDependencies: CachedDependencyToProtoSlice(x.CachedDependencies), LegacyDownloadUser: x.LegacyDownloadUser, TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, - VolumeMounts: VolumeMountProtoMap(x.VolumeMounts), + VolumeMounts: VolumeMountToProtoSlice(x.VolumeMounts), Network: x.Network.ToProto(), PlacementTags: x.PlacementTags, MaxPids: x.MaxPids, @@ -1711,15 +1843,58 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { ImageUsername: x.ImageUsername, ImagePassword: x.ImagePassword, CheckDefinition: x.CheckDefinition.ToProto(), - ImageLayers: ImageLayerProtoMap(x.ImageLayers), - MetricTags: DesiredLRPMetricTagsProtoMap(x.MetricTags), - Sidecars: SidecarProtoMap(x.Sidecars), + ImageLayers: ImageLayerToProtoSlice(x.ImageLayers), + MetricTags: DesiredLRPMetricTagsToProtoMap(x.MetricTags), + Sidecars: SidecarToProtoSlice(x.Sidecars), LogRateLimit: x.LogRateLimit.ToProto(), } return proto } -func DesiredLRPProtoMap(values []*DesiredLRP) []*ProtoDesiredLRP { +func (x *ProtoDesiredLRP) FromProto() *DesiredLRP { + copysafe := &DesiredLRP{ + ProcessGuid: x.ProcessGuid, + Domain: x.Domain, + RootFs: x.RootFs, + Instances: x.Instances, + EnvironmentVariables: EnvironmentVariableFromProtoSlice(x.EnvironmentVariables), + Setup: x.Setup.FromProto(), + Action: x.Action.FromProto(), + StartTimeoutMs: x.StartTimeoutMs, + DeprecatedStartTimeoutS: x.DeprecatedStartTimeoutS, + Monitor: x.Monitor.FromProto(), + DiskMb: x.DiskMb, + MemoryMb: x.MemoryMb, + CpuWeight: x.CpuWeight, + Privileged: x.Privileged, + Ports: x.Ports, + Routes: x.Routes.FromProto(), + LogSource: x.LogSource, + LogGuid: x.LogGuid, + MetricsGuid: x.MetricsGuid, + Annotation: x.Annotation, + EgressRules: SecurityGroupRuleFromProtoSlice(x.EgressRules), + ModificationTag: x.ModificationTag.FromProto(), + CachedDependencies: CachedDependencyFromProtoSlice(x.CachedDependencies), + LegacyDownloadUser: x.LegacyDownloadUser, + TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, + VolumeMounts: VolumeMountFromProtoSlice(x.VolumeMounts), + Network: x.Network.FromProto(), + PlacementTags: x.PlacementTags, + MaxPids: x.MaxPids, + CertificateProperties: x.CertificateProperties.FromProto(), + ImageUsername: x.ImageUsername, + ImagePassword: x.ImagePassword, + CheckDefinition: x.CheckDefinition.FromProto(), + ImageLayers: ImageLayerFromProtoSlice(x.ImageLayers), + MetricTags: DesiredLRPMetricTagsFromProtoMap(x.MetricTags), + Sidecars: SidecarFromProtoSlice(x.Sidecars), + LogRateLimit: x.LogRateLimit.FromProto(), + } + return copysafe +} + +func DesiredLRPToProtoSlice(values []*DesiredLRP) []*ProtoDesiredLRP { result := make([]*ProtoDesiredLRP, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1727,10 +1902,26 @@ func DesiredLRPProtoMap(values []*DesiredLRP) []*ProtoDesiredLRP { return result } -func DesiredLRPMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { +func DesiredLRPMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func DesiredLRPFromProtoSlice(values []*ProtoDesiredLRP) []*DesiredLRP { + result := make([]*DesiredLRP, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + +func DesiredLRPMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + result := make(map[string]*MetricTagValue, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index ca2956ac..b54c54f2 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -56,7 +56,14 @@ func (x *DesiredLRPLifecycleResponse) ToProto() *ProtoDesiredLRPLifecycleRespons return proto } -func DesiredLRPLifecycleResponseProtoMap(values []*DesiredLRPLifecycleResponse) []*ProtoDesiredLRPLifecycleResponse { +func (x *ProtoDesiredLRPLifecycleResponse) FromProto() *DesiredLRPLifecycleResponse { + copysafe := &DesiredLRPLifecycleResponse{ + Error: x.Error.FromProto(), + } + return copysafe +} + +func DesiredLRPLifecycleResponseToProtoSlice(values []*DesiredLRPLifecycleResponse) []*ProtoDesiredLRPLifecycleResponse { result := make([]*ProtoDesiredLRPLifecycleResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -64,6 +71,14 @@ func DesiredLRPLifecycleResponseProtoMap(values []*DesiredLRPLifecycleResponse) return result } +func DesiredLRPLifecycleResponseFromProtoSlice(values []*ProtoDesiredLRPLifecycleResponse) []*DesiredLRPLifecycleResponse { + result := make([]*DesiredLRPLifecycleResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPsResponse directly type DesiredLRPsResponse struct { Error *Error @@ -130,12 +145,20 @@ func (m *DesiredLRPsResponse) SetDesiredLrps(value []*DesiredLRP) { func (x *DesiredLRPsResponse) ToProto() *ProtoDesiredLRPsResponse { proto := &ProtoDesiredLRPsResponse{ Error: x.Error.ToProto(), - DesiredLrps: DesiredLRPProtoMap(x.DesiredLrps), + DesiredLrps: DesiredLRPToProtoSlice(x.DesiredLrps), } return proto } -func DesiredLRPsResponseProtoMap(values []*DesiredLRPsResponse) []*ProtoDesiredLRPsResponse { +func (x *ProtoDesiredLRPsResponse) FromProto() *DesiredLRPsResponse { + copysafe := &DesiredLRPsResponse{ + Error: x.Error.FromProto(), + DesiredLrps: DesiredLRPFromProtoSlice(x.DesiredLrps), + } + return copysafe +} + +func DesiredLRPsResponseToProtoSlice(values []*DesiredLRPsResponse) []*ProtoDesiredLRPsResponse { result := make([]*ProtoDesiredLRPsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -143,6 +166,14 @@ func DesiredLRPsResponseProtoMap(values []*DesiredLRPsResponse) []*ProtoDesiredL return result } +func DesiredLRPsResponseFromProtoSlice(values []*ProtoDesiredLRPsResponse) []*DesiredLRPsResponse { + result := make([]*DesiredLRPsResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPsRequest directly type DesiredLRPsRequest struct { Domain string @@ -214,7 +245,15 @@ func (x *DesiredLRPsRequest) ToProto() *ProtoDesiredLRPsRequest { return proto } -func DesiredLRPsRequestProtoMap(values []*DesiredLRPsRequest) []*ProtoDesiredLRPsRequest { +func (x *ProtoDesiredLRPsRequest) FromProto() *DesiredLRPsRequest { + copysafe := &DesiredLRPsRequest{ + Domain: x.Domain, + ProcessGuids: x.ProcessGuids, + } + return copysafe +} + +func DesiredLRPsRequestToProtoSlice(values []*DesiredLRPsRequest) []*ProtoDesiredLRPsRequest { result := make([]*ProtoDesiredLRPsRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -222,6 +261,14 @@ func DesiredLRPsRequestProtoMap(values []*DesiredLRPsRequest) []*ProtoDesiredLRP return result } +func DesiredLRPsRequestFromProtoSlice(values []*ProtoDesiredLRPsRequest) []*DesiredLRPsRequest { + result := make([]*DesiredLRPsRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPResponse directly type DesiredLRPResponse struct { Error *Error @@ -288,7 +335,15 @@ func (x *DesiredLRPResponse) ToProto() *ProtoDesiredLRPResponse { return proto } -func DesiredLRPResponseProtoMap(values []*DesiredLRPResponse) []*ProtoDesiredLRPResponse { +func (x *ProtoDesiredLRPResponse) FromProto() *DesiredLRPResponse { + copysafe := &DesiredLRPResponse{ + Error: x.Error.FromProto(), + DesiredLrp: x.DesiredLrp.FromProto(), + } + return copysafe +} + +func DesiredLRPResponseToProtoSlice(values []*DesiredLRPResponse) []*ProtoDesiredLRPResponse { result := make([]*ProtoDesiredLRPResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -296,6 +351,14 @@ func DesiredLRPResponseProtoMap(values []*DesiredLRPResponse) []*ProtoDesiredLRP return result } +func DesiredLRPResponseFromProtoSlice(values []*ProtoDesiredLRPResponse) []*DesiredLRPResponse { + result := make([]*DesiredLRPResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfosResponse directly type DesiredLRPSchedulingInfosResponse struct { Error *Error @@ -362,12 +425,20 @@ func (m *DesiredLRPSchedulingInfosResponse) SetDesiredLrpSchedulingInfos(value [ func (x *DesiredLRPSchedulingInfosResponse) ToProto() *ProtoDesiredLRPSchedulingInfosResponse { proto := &ProtoDesiredLRPSchedulingInfosResponse{ Error: x.Error.ToProto(), - DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoProtoMap(x.DesiredLrpSchedulingInfos), + DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoToProtoSlice(x.DesiredLrpSchedulingInfos), } return proto } -func DesiredLRPSchedulingInfosResponseProtoMap(values []*DesiredLRPSchedulingInfosResponse) []*ProtoDesiredLRPSchedulingInfosResponse { +func (x *ProtoDesiredLRPSchedulingInfosResponse) FromProto() *DesiredLRPSchedulingInfosResponse { + copysafe := &DesiredLRPSchedulingInfosResponse{ + Error: x.Error.FromProto(), + DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoFromProtoSlice(x.DesiredLrpSchedulingInfos), + } + return copysafe +} + +func DesiredLRPSchedulingInfosResponseToProtoSlice(values []*DesiredLRPSchedulingInfosResponse) []*ProtoDesiredLRPSchedulingInfosResponse { result := make([]*ProtoDesiredLRPSchedulingInfosResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -375,6 +446,14 @@ func DesiredLRPSchedulingInfosResponseProtoMap(values []*DesiredLRPSchedulingInf return result } +func DesiredLRPSchedulingInfosResponseFromProtoSlice(values []*ProtoDesiredLRPSchedulingInfosResponse) []*DesiredLRPSchedulingInfosResponse { + result := make([]*DesiredLRPSchedulingInfosResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfoByProcessGuidResponse directly type DesiredLRPSchedulingInfoByProcessGuidResponse struct { Error *Error @@ -441,7 +520,15 @@ func (x *DesiredLRPSchedulingInfoByProcessGuidResponse) ToProto() *ProtoDesiredL return proto } -func DesiredLRPSchedulingInfoByProcessGuidResponseProtoMap(values []*DesiredLRPSchedulingInfoByProcessGuidResponse) []*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { +func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) FromProto() *DesiredLRPSchedulingInfoByProcessGuidResponse { + copysafe := &DesiredLRPSchedulingInfoByProcessGuidResponse{ + Error: x.Error.FromProto(), + DesiredLrpSchedulingInfo: x.DesiredLrpSchedulingInfo.FromProto(), + } + return copysafe +} + +func DesiredLRPSchedulingInfoByProcessGuidResponseToProtoSlice(values []*DesiredLRPSchedulingInfoByProcessGuidResponse) []*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { result := make([]*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -449,6 +536,14 @@ func DesiredLRPSchedulingInfoByProcessGuidResponseProtoMap(values []*DesiredLRPS return result } +func DesiredLRPSchedulingInfoByProcessGuidResponseFromProtoSlice(values []*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) []*DesiredLRPSchedulingInfoByProcessGuidResponse { + result := make([]*DesiredLRPSchedulingInfoByProcessGuidResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPByProcessGuidRequest directly type DesiredLRPByProcessGuidRequest struct { ProcessGuid string @@ -499,7 +594,14 @@ func (x *DesiredLRPByProcessGuidRequest) ToProto() *ProtoDesiredLRPByProcessGuid return proto } -func DesiredLRPByProcessGuidRequestProtoMap(values []*DesiredLRPByProcessGuidRequest) []*ProtoDesiredLRPByProcessGuidRequest { +func (x *ProtoDesiredLRPByProcessGuidRequest) FromProto() *DesiredLRPByProcessGuidRequest { + copysafe := &DesiredLRPByProcessGuidRequest{ + ProcessGuid: x.ProcessGuid, + } + return copysafe +} + +func DesiredLRPByProcessGuidRequestToProtoSlice(values []*DesiredLRPByProcessGuidRequest) []*ProtoDesiredLRPByProcessGuidRequest { result := make([]*ProtoDesiredLRPByProcessGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -507,6 +609,14 @@ func DesiredLRPByProcessGuidRequestProtoMap(values []*DesiredLRPByProcessGuidReq return result } +func DesiredLRPByProcessGuidRequestFromProtoSlice(values []*ProtoDesiredLRPByProcessGuidRequest) []*DesiredLRPByProcessGuidRequest { + result := make([]*DesiredLRPByProcessGuidRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesireLRPRequest directly type DesireLRPRequest struct { DesiredLrp *DesiredLRP @@ -557,7 +667,14 @@ func (x *DesireLRPRequest) ToProto() *ProtoDesireLRPRequest { return proto } -func DesireLRPRequestProtoMap(values []*DesireLRPRequest) []*ProtoDesireLRPRequest { +func (x *ProtoDesireLRPRequest) FromProto() *DesireLRPRequest { + copysafe := &DesireLRPRequest{ + DesiredLrp: x.DesiredLrp.FromProto(), + } + return copysafe +} + +func DesireLRPRequestToProtoSlice(values []*DesireLRPRequest) []*ProtoDesireLRPRequest { result := make([]*ProtoDesireLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -565,6 +682,14 @@ func DesireLRPRequestProtoMap(values []*DesireLRPRequest) []*ProtoDesireLRPReque return result } +func DesireLRPRequestFromProtoSlice(values []*ProtoDesireLRPRequest) []*DesireLRPRequest { + result := make([]*DesireLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoUpdateDesiredLRPRequest directly type UpdateDesiredLRPRequest struct { ProcessGuid string @@ -631,7 +756,15 @@ func (x *UpdateDesiredLRPRequest) ToProto() *ProtoUpdateDesiredLRPRequest { return proto } -func UpdateDesiredLRPRequestProtoMap(values []*UpdateDesiredLRPRequest) []*ProtoUpdateDesiredLRPRequest { +func (x *ProtoUpdateDesiredLRPRequest) FromProto() *UpdateDesiredLRPRequest { + copysafe := &UpdateDesiredLRPRequest{ + ProcessGuid: x.ProcessGuid, + Update: x.Update.FromProto(), + } + return copysafe +} + +func UpdateDesiredLRPRequestToProtoSlice(values []*UpdateDesiredLRPRequest) []*ProtoUpdateDesiredLRPRequest { result := make([]*ProtoUpdateDesiredLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -639,6 +772,14 @@ func UpdateDesiredLRPRequestProtoMap(values []*UpdateDesiredLRPRequest) []*Proto return result } +func UpdateDesiredLRPRequestFromProtoSlice(values []*ProtoUpdateDesiredLRPRequest) []*UpdateDesiredLRPRequest { + result := make([]*UpdateDesiredLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoRemoveDesiredLRPRequest directly type RemoveDesiredLRPRequest struct { ProcessGuid string @@ -689,10 +830,25 @@ func (x *RemoveDesiredLRPRequest) ToProto() *ProtoRemoveDesiredLRPRequest { return proto } -func RemoveDesiredLRPRequestProtoMap(values []*RemoveDesiredLRPRequest) []*ProtoRemoveDesiredLRPRequest { +func (x *ProtoRemoveDesiredLRPRequest) FromProto() *RemoveDesiredLRPRequest { + copysafe := &RemoveDesiredLRPRequest{ + ProcessGuid: x.ProcessGuid, + } + return copysafe +} + +func RemoveDesiredLRPRequestToProtoSlice(values []*RemoveDesiredLRPRequest) []*ProtoRemoveDesiredLRPRequest { result := make([]*ProtoRemoveDesiredLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func RemoveDesiredLRPRequestFromProtoSlice(values []*ProtoRemoveDesiredLRPRequest) []*RemoveDesiredLRPRequest { + result := make([]*RemoveDesiredLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 453418a2..8b0d8089 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -77,7 +77,15 @@ func (x *DomainsResponse) ToProto() *ProtoDomainsResponse { return proto } -func DomainsResponseProtoMap(values []*DomainsResponse) []*ProtoDomainsResponse { +func (x *ProtoDomainsResponse) FromProto() *DomainsResponse { + copysafe := &DomainsResponse{ + Error: x.Error.FromProto(), + Domains: x.Domains, + } + return copysafe +} + +func DomainsResponseToProtoSlice(values []*DomainsResponse) []*ProtoDomainsResponse { result := make([]*ProtoDomainsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -85,6 +93,14 @@ func DomainsResponseProtoMap(values []*DomainsResponse) []*ProtoDomainsResponse return result } +func DomainsResponseFromProtoSlice(values []*ProtoDomainsResponse) []*DomainsResponse { + result := make([]*DomainsResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoUpsertDomainResponse directly type UpsertDomainResponse struct { Error *Error @@ -135,7 +151,14 @@ func (x *UpsertDomainResponse) ToProto() *ProtoUpsertDomainResponse { return proto } -func UpsertDomainResponseProtoMap(values []*UpsertDomainResponse) []*ProtoUpsertDomainResponse { +func (x *ProtoUpsertDomainResponse) FromProto() *UpsertDomainResponse { + copysafe := &UpsertDomainResponse{ + Error: x.Error.FromProto(), + } + return copysafe +} + +func UpsertDomainResponseToProtoSlice(values []*UpsertDomainResponse) []*ProtoUpsertDomainResponse { result := make([]*ProtoUpsertDomainResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -143,6 +166,14 @@ func UpsertDomainResponseProtoMap(values []*UpsertDomainResponse) []*ProtoUpsert return result } +func UpsertDomainResponseFromProtoSlice(values []*ProtoUpsertDomainResponse) []*UpsertDomainResponse { + result := make([]*UpsertDomainResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoUpsertDomainRequest directly type UpsertDomainRequest struct { Domain string @@ -209,10 +240,26 @@ func (x *UpsertDomainRequest) ToProto() *ProtoUpsertDomainRequest { return proto } -func UpsertDomainRequestProtoMap(values []*UpsertDomainRequest) []*ProtoUpsertDomainRequest { +func (x *ProtoUpsertDomainRequest) FromProto() *UpsertDomainRequest { + copysafe := &UpsertDomainRequest{ + Domain: x.Domain, + Ttl: x.Ttl, + } + return copysafe +} + +func UpsertDomainRequestToProtoSlice(values []*UpsertDomainRequest) []*ProtoUpsertDomainRequest { result := make([]*ProtoUpsertDomainRequest, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func UpsertDomainRequestFromProtoSlice(values []*ProtoUpsertDomainRequest) []*UpsertDomainRequest { + result := make([]*UpsertDomainRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 08bd071e..63eb20c6 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -72,10 +72,26 @@ func (x *EnvironmentVariable) ToProto() *ProtoEnvironmentVariable { return proto } -func EnvironmentVariableProtoMap(values []*EnvironmentVariable) []*ProtoEnvironmentVariable { +func (x *ProtoEnvironmentVariable) FromProto() *EnvironmentVariable { + copysafe := &EnvironmentVariable{ + Name: x.Name, + Value: x.Value, + } + return copysafe +} + +func EnvironmentVariableToProtoSlice(values []*EnvironmentVariable) []*ProtoEnvironmentVariable { result := make([]*ProtoEnvironmentVariable, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func EnvironmentVariableFromProtoSlice(values []*ProtoEnvironmentVariable) []*EnvironmentVariable { + result := make([]*EnvironmentVariable, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 9a6ea6df..31ec62f9 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -172,10 +172,26 @@ func (x *Error) ToProto() *ProtoError { return proto } -func ErrorProtoMap(values []*Error) []*ProtoError { +func (x *ProtoError) FromProto() *Error { + copysafe := &Error{ + Type: Error_Type(x.Type), + Message: x.Message, + } + return copysafe +} + +func ErrorToProtoSlice(values []*Error) []*ProtoError { result := make([]*ProtoError, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func ErrorFromProtoSlice(values []*ProtoError) []*Error { + result := make([]*Error, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index bfabb2a7..ea16a209 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -72,7 +72,15 @@ func (x *EvacuationResponse) ToProto() *ProtoEvacuationResponse { return proto } -func EvacuationResponseProtoMap(values []*EvacuationResponse) []*ProtoEvacuationResponse { +func (x *ProtoEvacuationResponse) FromProto() *EvacuationResponse { + copysafe := &EvacuationResponse{ + Error: x.Error.FromProto(), + KeepContainer: x.KeepContainer, + } + return copysafe +} + +func EvacuationResponseToProtoSlice(values []*EvacuationResponse) []*ProtoEvacuationResponse { result := make([]*ProtoEvacuationResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +88,14 @@ func EvacuationResponseProtoMap(values []*EvacuationResponse) []*ProtoEvacuation return result } +func EvacuationResponseFromProtoSlice(values []*ProtoEvacuationResponse) []*EvacuationResponse { + result := make([]*EvacuationResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoEvacuateClaimedActualLRPRequest directly type EvacuateClaimedActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -146,7 +162,15 @@ func (x *EvacuateClaimedActualLRPRequest) ToProto() *ProtoEvacuateClaimedActualL return proto } -func EvacuateClaimedActualLRPRequestProtoMap(values []*EvacuateClaimedActualLRPRequest) []*ProtoEvacuateClaimedActualLRPRequest { +func (x *ProtoEvacuateClaimedActualLRPRequest) FromProto() *EvacuateClaimedActualLRPRequest { + copysafe := &EvacuateClaimedActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + } + return copysafe +} + +func EvacuateClaimedActualLRPRequestToProtoSlice(values []*EvacuateClaimedActualLRPRequest) []*ProtoEvacuateClaimedActualLRPRequest { result := make([]*ProtoEvacuateClaimedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -154,6 +178,14 @@ func EvacuateClaimedActualLRPRequestProtoMap(values []*EvacuateClaimedActualLRPR return result } +func EvacuateClaimedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateClaimedActualLRPRequest) []*EvacuateClaimedActualLRPRequest { + result := make([]*EvacuateClaimedActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoEvacuateRunningActualLRPRequest directly type EvacuateRunningActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -305,7 +337,7 @@ func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualL ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), - ActualLrpInternalRoutes: ActualLRPInternalRouteProtoMap(x.ActualLrpInternalRoutes), + ActualLrpInternalRoutes: ActualLRPInternalRouteToProtoSlice(x.ActualLrpInternalRoutes), MetricTags: x.MetricTags, Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, @@ -313,7 +345,20 @@ func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualL return proto } -func EvacuateRunningActualLRPRequestProtoMap(values []*EvacuateRunningActualLRPRequest) []*ProtoEvacuateRunningActualLRPRequest { +func (x *ProtoEvacuateRunningActualLRPRequest) FromProto() *EvacuateRunningActualLRPRequest { + copysafe := &EvacuateRunningActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + ActualLrpNetInfo: x.ActualLrpNetInfo.FromProto(), + ActualLrpInternalRoutes: ActualLRPInternalRouteFromProtoSlice(x.ActualLrpInternalRoutes), + MetricTags: x.MetricTags, + Routable: x.Routable, + AvailabilityZone: x.AvailabilityZone, + } + return copysafe +} + +func EvacuateRunningActualLRPRequestToProtoSlice(values []*EvacuateRunningActualLRPRequest) []*ProtoEvacuateRunningActualLRPRequest { result := make([]*ProtoEvacuateRunningActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -321,6 +366,14 @@ func EvacuateRunningActualLRPRequestProtoMap(values []*EvacuateRunningActualLRPR return result } +func EvacuateRunningActualLRPRequestFromProtoSlice(values []*ProtoEvacuateRunningActualLRPRequest) []*EvacuateRunningActualLRPRequest { + result := make([]*EvacuateRunningActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoEvacuateStoppedActualLRPRequest directly type EvacuateStoppedActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -387,7 +440,15 @@ func (x *EvacuateStoppedActualLRPRequest) ToProto() *ProtoEvacuateStoppedActualL return proto } -func EvacuateStoppedActualLRPRequestProtoMap(values []*EvacuateStoppedActualLRPRequest) []*ProtoEvacuateStoppedActualLRPRequest { +func (x *ProtoEvacuateStoppedActualLRPRequest) FromProto() *EvacuateStoppedActualLRPRequest { + copysafe := &EvacuateStoppedActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + } + return copysafe +} + +func EvacuateStoppedActualLRPRequestToProtoSlice(values []*EvacuateStoppedActualLRPRequest) []*ProtoEvacuateStoppedActualLRPRequest { result := make([]*ProtoEvacuateStoppedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -395,6 +456,14 @@ func EvacuateStoppedActualLRPRequestProtoMap(values []*EvacuateStoppedActualLRPR return result } +func EvacuateStoppedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateStoppedActualLRPRequest) []*EvacuateStoppedActualLRPRequest { + result := make([]*EvacuateStoppedActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoEvacuateCrashedActualLRPRequest directly type EvacuateCrashedActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -477,7 +546,16 @@ func (x *EvacuateCrashedActualLRPRequest) ToProto() *ProtoEvacuateCrashedActualL return proto } -func EvacuateCrashedActualLRPRequestProtoMap(values []*EvacuateCrashedActualLRPRequest) []*ProtoEvacuateCrashedActualLRPRequest { +func (x *ProtoEvacuateCrashedActualLRPRequest) FromProto() *EvacuateCrashedActualLRPRequest { + copysafe := &EvacuateCrashedActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + ErrorMessage: x.ErrorMessage, + } + return copysafe +} + +func EvacuateCrashedActualLRPRequestToProtoSlice(values []*EvacuateCrashedActualLRPRequest) []*ProtoEvacuateCrashedActualLRPRequest { result := make([]*ProtoEvacuateCrashedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -485,6 +563,14 @@ func EvacuateCrashedActualLRPRequestProtoMap(values []*EvacuateCrashedActualLRPR return result } +func EvacuateCrashedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateCrashedActualLRPRequest) []*EvacuateCrashedActualLRPRequest { + result := make([]*EvacuateCrashedActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPRequest directly type RemoveEvacuatingActualLRPRequest struct { ActualLrpKey *ActualLRPKey @@ -551,7 +637,15 @@ func (x *RemoveEvacuatingActualLRPRequest) ToProto() *ProtoRemoveEvacuatingActua return proto } -func RemoveEvacuatingActualLRPRequestProtoMap(values []*RemoveEvacuatingActualLRPRequest) []*ProtoRemoveEvacuatingActualLRPRequest { +func (x *ProtoRemoveEvacuatingActualLRPRequest) FromProto() *RemoveEvacuatingActualLRPRequest { + copysafe := &RemoveEvacuatingActualLRPRequest{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + } + return copysafe +} + +func RemoveEvacuatingActualLRPRequestToProtoSlice(values []*RemoveEvacuatingActualLRPRequest) []*ProtoRemoveEvacuatingActualLRPRequest { result := make([]*ProtoRemoveEvacuatingActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -559,6 +653,14 @@ func RemoveEvacuatingActualLRPRequestProtoMap(values []*RemoveEvacuatingActualLR return result } +func RemoveEvacuatingActualLRPRequestFromProtoSlice(values []*ProtoRemoveEvacuatingActualLRPRequest) []*RemoveEvacuatingActualLRPRequest { + result := make([]*RemoveEvacuatingActualLRPRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPResponse directly type RemoveEvacuatingActualLRPResponse struct { Error *Error @@ -609,10 +711,25 @@ func (x *RemoveEvacuatingActualLRPResponse) ToProto() *ProtoRemoveEvacuatingActu return proto } -func RemoveEvacuatingActualLRPResponseProtoMap(values []*RemoveEvacuatingActualLRPResponse) []*ProtoRemoveEvacuatingActualLRPResponse { +func (x *ProtoRemoveEvacuatingActualLRPResponse) FromProto() *RemoveEvacuatingActualLRPResponse { + copysafe := &RemoveEvacuatingActualLRPResponse{ + Error: x.Error.FromProto(), + } + return copysafe +} + +func RemoveEvacuatingActualLRPResponseToProtoSlice(values []*RemoveEvacuatingActualLRPResponse) []*ProtoRemoveEvacuatingActualLRPResponse { result := make([]*ProtoRemoveEvacuatingActualLRPResponse, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func RemoveEvacuatingActualLRPResponseFromProtoSlice(values []*ProtoRemoveEvacuatingActualLRPResponse) []*RemoveEvacuatingActualLRPResponse { + result := make([]*RemoveEvacuatingActualLRPResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 7fd51d23..6210f51b 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -56,7 +56,14 @@ func (x *ActualLRPCreatedEvent) ToProto() *ProtoActualLRPCreatedEvent { return proto } -func ActualLRPCreatedEventProtoMap(values []*ActualLRPCreatedEvent) []*ProtoActualLRPCreatedEvent { +func (x *ProtoActualLRPCreatedEvent) FromProto() *ActualLRPCreatedEvent { + copysafe := &ActualLRPCreatedEvent{ + ActualLrpGroup: x.ActualLrpGroup.FromProto(), + } + return copysafe +} + +func ActualLRPCreatedEventToProtoSlice(values []*ActualLRPCreatedEvent) []*ProtoActualLRPCreatedEvent { result := make([]*ProtoActualLRPCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -64,6 +71,14 @@ func ActualLRPCreatedEventProtoMap(values []*ActualLRPCreatedEvent) []*ProtoActu return result } +func ActualLRPCreatedEventFromProtoSlice(values []*ProtoActualLRPCreatedEvent) []*ActualLRPCreatedEvent { + result := make([]*ActualLRPCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPChangedEvent directly type ActualLRPChangedEvent struct { Before *ActualLRPGroup @@ -130,7 +145,15 @@ func (x *ActualLRPChangedEvent) ToProto() *ProtoActualLRPChangedEvent { return proto } -func ActualLRPChangedEventProtoMap(values []*ActualLRPChangedEvent) []*ProtoActualLRPChangedEvent { +func (x *ProtoActualLRPChangedEvent) FromProto() *ActualLRPChangedEvent { + copysafe := &ActualLRPChangedEvent{ + Before: x.Before.FromProto(), + After: x.After.FromProto(), + } + return copysafe +} + +func ActualLRPChangedEventToProtoSlice(values []*ActualLRPChangedEvent) []*ProtoActualLRPChangedEvent { result := make([]*ProtoActualLRPChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -138,6 +161,14 @@ func ActualLRPChangedEventProtoMap(values []*ActualLRPChangedEvent) []*ProtoActu return result } +func ActualLRPChangedEventFromProtoSlice(values []*ProtoActualLRPChangedEvent) []*ActualLRPChangedEvent { + result := make([]*ActualLRPChangedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPRemovedEvent directly type ActualLRPRemovedEvent struct { ActualLrpGroup *ActualLRPGroup @@ -188,7 +219,14 @@ func (x *ActualLRPRemovedEvent) ToProto() *ProtoActualLRPRemovedEvent { return proto } -func ActualLRPRemovedEventProtoMap(values []*ActualLRPRemovedEvent) []*ProtoActualLRPRemovedEvent { +func (x *ProtoActualLRPRemovedEvent) FromProto() *ActualLRPRemovedEvent { + copysafe := &ActualLRPRemovedEvent{ + ActualLrpGroup: x.ActualLrpGroup.FromProto(), + } + return copysafe +} + +func ActualLRPRemovedEventToProtoSlice(values []*ActualLRPRemovedEvent) []*ProtoActualLRPRemovedEvent { result := make([]*ProtoActualLRPRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -196,6 +234,14 @@ func ActualLRPRemovedEventProtoMap(values []*ActualLRPRemovedEvent) []*ProtoActu return result } +func ActualLRPRemovedEventFromProtoSlice(values []*ProtoActualLRPRemovedEvent) []*ActualLRPRemovedEvent { + result := make([]*ActualLRPRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPInstanceCreatedEvent directly type ActualLRPInstanceCreatedEvent struct { ActualLrp *ActualLRP @@ -262,7 +308,15 @@ func (x *ActualLRPInstanceCreatedEvent) ToProto() *ProtoActualLRPInstanceCreated return proto } -func ActualLRPInstanceCreatedEventProtoMap(values []*ActualLRPInstanceCreatedEvent) []*ProtoActualLRPInstanceCreatedEvent { +func (x *ProtoActualLRPInstanceCreatedEvent) FromProto() *ActualLRPInstanceCreatedEvent { + copysafe := &ActualLRPInstanceCreatedEvent{ + ActualLrp: x.ActualLrp.FromProto(), + TraceId: x.TraceId, + } + return copysafe +} + +func ActualLRPInstanceCreatedEventToProtoSlice(values []*ActualLRPInstanceCreatedEvent) []*ProtoActualLRPInstanceCreatedEvent { result := make([]*ProtoActualLRPInstanceCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -270,6 +324,14 @@ func ActualLRPInstanceCreatedEventProtoMap(values []*ActualLRPInstanceCreatedEve return result } +func ActualLRPInstanceCreatedEventFromProtoSlice(values []*ProtoActualLRPInstanceCreatedEvent) []*ActualLRPInstanceCreatedEvent { + result := make([]*ActualLRPInstanceCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPInfo directly type ActualLRPInfo struct { ActualLrpNetInfo *ActualLRPNetInfo @@ -467,7 +529,23 @@ func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { return proto } -func ActualLRPInfoProtoMap(values []*ActualLRPInfo) []*ProtoActualLRPInfo { +func (x *ProtoActualLRPInfo) FromProto() *ActualLRPInfo { + copysafe := &ActualLRPInfo{ + ActualLrpNetInfo: x.ActualLrpNetInfo.FromProto(), + CrashCount: x.CrashCount, + CrashReason: x.CrashReason, + State: x.State, + PlacementError: x.PlacementError, + Since: x.Since, + ModificationTag: x.ModificationTag.FromProto(), + Presence: ActualLRP_Presence(x.Presence), + Routable: x.Routable, + AvailabilityZone: x.AvailabilityZone, + } + return copysafe +} + +func ActualLRPInfoToProtoSlice(values []*ActualLRPInfo) []*ProtoActualLRPInfo { result := make([]*ProtoActualLRPInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -475,6 +553,14 @@ func ActualLRPInfoProtoMap(values []*ActualLRPInfo) []*ProtoActualLRPInfo { return result } +func ActualLRPInfoFromProtoSlice(values []*ProtoActualLRPInfo) []*ActualLRPInfo { + result := make([]*ActualLRPInfo, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPInstanceChangedEvent directly type ActualLRPInstanceChangedEvent struct { ActualLrpKey *ActualLRPKey @@ -589,7 +675,18 @@ func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChanged return proto } -func ActualLRPInstanceChangedEventProtoMap(values []*ActualLRPInstanceChangedEvent) []*ProtoActualLRPInstanceChangedEvent { +func (x *ProtoActualLRPInstanceChangedEvent) FromProto() *ActualLRPInstanceChangedEvent { + copysafe := &ActualLRPInstanceChangedEvent{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + Before: x.Before.FromProto(), + After: x.After.FromProto(), + TraceId: x.TraceId, + } + return copysafe +} + +func ActualLRPInstanceChangedEventToProtoSlice(values []*ActualLRPInstanceChangedEvent) []*ProtoActualLRPInstanceChangedEvent { result := make([]*ProtoActualLRPInstanceChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -597,6 +694,14 @@ func ActualLRPInstanceChangedEventProtoMap(values []*ActualLRPInstanceChangedEve return result } +func ActualLRPInstanceChangedEventFromProtoSlice(values []*ProtoActualLRPInstanceChangedEvent) []*ActualLRPInstanceChangedEvent { + result := make([]*ActualLRPInstanceChangedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPInstanceRemovedEvent directly type ActualLRPInstanceRemovedEvent struct { ActualLrp *ActualLRP @@ -663,7 +768,15 @@ func (x *ActualLRPInstanceRemovedEvent) ToProto() *ProtoActualLRPInstanceRemoved return proto } -func ActualLRPInstanceRemovedEventProtoMap(values []*ActualLRPInstanceRemovedEvent) []*ProtoActualLRPInstanceRemovedEvent { +func (x *ProtoActualLRPInstanceRemovedEvent) FromProto() *ActualLRPInstanceRemovedEvent { + copysafe := &ActualLRPInstanceRemovedEvent{ + ActualLrp: x.ActualLrp.FromProto(), + TraceId: x.TraceId, + } + return copysafe +} + +func ActualLRPInstanceRemovedEventToProtoSlice(values []*ActualLRPInstanceRemovedEvent) []*ProtoActualLRPInstanceRemovedEvent { result := make([]*ProtoActualLRPInstanceRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -671,6 +784,14 @@ func ActualLRPInstanceRemovedEventProtoMap(values []*ActualLRPInstanceRemovedEve return result } +func ActualLRPInstanceRemovedEventFromProtoSlice(values []*ProtoActualLRPInstanceRemovedEvent) []*ActualLRPInstanceRemovedEvent { + result := make([]*ActualLRPInstanceRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPCreatedEvent directly type DesiredLRPCreatedEvent struct { DesiredLrp *DesiredLRP @@ -737,7 +858,15 @@ func (x *DesiredLRPCreatedEvent) ToProto() *ProtoDesiredLRPCreatedEvent { return proto } -func DesiredLRPCreatedEventProtoMap(values []*DesiredLRPCreatedEvent) []*ProtoDesiredLRPCreatedEvent { +func (x *ProtoDesiredLRPCreatedEvent) FromProto() *DesiredLRPCreatedEvent { + copysafe := &DesiredLRPCreatedEvent{ + DesiredLrp: x.DesiredLrp.FromProto(), + TraceId: x.TraceId, + } + return copysafe +} + +func DesiredLRPCreatedEventToProtoSlice(values []*DesiredLRPCreatedEvent) []*ProtoDesiredLRPCreatedEvent { result := make([]*ProtoDesiredLRPCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -745,6 +874,14 @@ func DesiredLRPCreatedEventProtoMap(values []*DesiredLRPCreatedEvent) []*ProtoDe return result } +func DesiredLRPCreatedEventFromProtoSlice(values []*ProtoDesiredLRPCreatedEvent) []*DesiredLRPCreatedEvent { + result := make([]*DesiredLRPCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPChangedEvent directly type DesiredLRPChangedEvent struct { Before *DesiredLRP @@ -827,7 +964,16 @@ func (x *DesiredLRPChangedEvent) ToProto() *ProtoDesiredLRPChangedEvent { return proto } -func DesiredLRPChangedEventProtoMap(values []*DesiredLRPChangedEvent) []*ProtoDesiredLRPChangedEvent { +func (x *ProtoDesiredLRPChangedEvent) FromProto() *DesiredLRPChangedEvent { + copysafe := &DesiredLRPChangedEvent{ + Before: x.Before.FromProto(), + After: x.After.FromProto(), + TraceId: x.TraceId, + } + return copysafe +} + +func DesiredLRPChangedEventToProtoSlice(values []*DesiredLRPChangedEvent) []*ProtoDesiredLRPChangedEvent { result := make([]*ProtoDesiredLRPChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -835,6 +981,14 @@ func DesiredLRPChangedEventProtoMap(values []*DesiredLRPChangedEvent) []*ProtoDe return result } +func DesiredLRPChangedEventFromProtoSlice(values []*ProtoDesiredLRPChangedEvent) []*DesiredLRPChangedEvent { + result := make([]*DesiredLRPChangedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesiredLRPRemovedEvent directly type DesiredLRPRemovedEvent struct { DesiredLrp *DesiredLRP @@ -901,7 +1055,15 @@ func (x *DesiredLRPRemovedEvent) ToProto() *ProtoDesiredLRPRemovedEvent { return proto } -func DesiredLRPRemovedEventProtoMap(values []*DesiredLRPRemovedEvent) []*ProtoDesiredLRPRemovedEvent { +func (x *ProtoDesiredLRPRemovedEvent) FromProto() *DesiredLRPRemovedEvent { + copysafe := &DesiredLRPRemovedEvent{ + DesiredLrp: x.DesiredLrp.FromProto(), + TraceId: x.TraceId, + } + return copysafe +} + +func DesiredLRPRemovedEventToProtoSlice(values []*DesiredLRPRemovedEvent) []*ProtoDesiredLRPRemovedEvent { result := make([]*ProtoDesiredLRPRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -909,6 +1071,14 @@ func DesiredLRPRemovedEventProtoMap(values []*DesiredLRPRemovedEvent) []*ProtoDe return result } +func DesiredLRPRemovedEventFromProtoSlice(values []*ProtoDesiredLRPRemovedEvent) []*DesiredLRPRemovedEvent { + result := make([]*DesiredLRPRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoActualLRPCrashedEvent directly type ActualLRPCrashedEvent struct { ActualLrpKey *ActualLRPKey @@ -1023,7 +1193,18 @@ func (x *ActualLRPCrashedEvent) ToProto() *ProtoActualLRPCrashedEvent { return proto } -func ActualLRPCrashedEventProtoMap(values []*ActualLRPCrashedEvent) []*ProtoActualLRPCrashedEvent { +func (x *ProtoActualLRPCrashedEvent) FromProto() *ActualLRPCrashedEvent { + copysafe := &ActualLRPCrashedEvent{ + ActualLrpKey: x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + CrashCount: x.CrashCount, + CrashReason: x.CrashReason, + Since: x.Since, + } + return copysafe +} + +func ActualLRPCrashedEventToProtoSlice(values []*ActualLRPCrashedEvent) []*ProtoActualLRPCrashedEvent { result := make([]*ProtoActualLRPCrashedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1031,6 +1212,14 @@ func ActualLRPCrashedEventProtoMap(values []*ActualLRPCrashedEvent) []*ProtoActu return result } +func ActualLRPCrashedEventFromProtoSlice(values []*ProtoActualLRPCrashedEvent) []*ActualLRPCrashedEvent { + result := make([]*ActualLRPCrashedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoEventsByCellId directly type EventsByCellId struct { CellId string @@ -1081,7 +1270,14 @@ func (x *EventsByCellId) ToProto() *ProtoEventsByCellId { return proto } -func EventsByCellIdProtoMap(values []*EventsByCellId) []*ProtoEventsByCellId { +func (x *ProtoEventsByCellId) FromProto() *EventsByCellId { + copysafe := &EventsByCellId{ + CellId: x.CellId, + } + return copysafe +} + +func EventsByCellIdToProtoSlice(values []*EventsByCellId) []*ProtoEventsByCellId { result := make([]*ProtoEventsByCellId, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1089,6 +1285,14 @@ func EventsByCellIdProtoMap(values []*EventsByCellId) []*ProtoEventsByCellId { return result } +func EventsByCellIdFromProtoSlice(values []*ProtoEventsByCellId) []*EventsByCellId { + result := make([]*EventsByCellId, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTaskCreatedEvent directly type TaskCreatedEvent struct { Task *Task @@ -1139,7 +1343,14 @@ func (x *TaskCreatedEvent) ToProto() *ProtoTaskCreatedEvent { return proto } -func TaskCreatedEventProtoMap(values []*TaskCreatedEvent) []*ProtoTaskCreatedEvent { +func (x *ProtoTaskCreatedEvent) FromProto() *TaskCreatedEvent { + copysafe := &TaskCreatedEvent{ + Task: x.Task.FromProto(), + } + return copysafe +} + +func TaskCreatedEventToProtoSlice(values []*TaskCreatedEvent) []*ProtoTaskCreatedEvent { result := make([]*ProtoTaskCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1147,6 +1358,14 @@ func TaskCreatedEventProtoMap(values []*TaskCreatedEvent) []*ProtoTaskCreatedEve return result } +func TaskCreatedEventFromProtoSlice(values []*ProtoTaskCreatedEvent) []*TaskCreatedEvent { + result := make([]*TaskCreatedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTaskChangedEvent directly type TaskChangedEvent struct { Before *Task @@ -1213,7 +1432,15 @@ func (x *TaskChangedEvent) ToProto() *ProtoTaskChangedEvent { return proto } -func TaskChangedEventProtoMap(values []*TaskChangedEvent) []*ProtoTaskChangedEvent { +func (x *ProtoTaskChangedEvent) FromProto() *TaskChangedEvent { + copysafe := &TaskChangedEvent{ + Before: x.Before.FromProto(), + After: x.After.FromProto(), + } + return copysafe +} + +func TaskChangedEventToProtoSlice(values []*TaskChangedEvent) []*ProtoTaskChangedEvent { result := make([]*ProtoTaskChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1221,6 +1448,14 @@ func TaskChangedEventProtoMap(values []*TaskChangedEvent) []*ProtoTaskChangedEve return result } +func TaskChangedEventFromProtoSlice(values []*ProtoTaskChangedEvent) []*TaskChangedEvent { + result := make([]*TaskChangedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTaskRemovedEvent directly type TaskRemovedEvent struct { Task *Task @@ -1271,10 +1506,25 @@ func (x *TaskRemovedEvent) ToProto() *ProtoTaskRemovedEvent { return proto } -func TaskRemovedEventProtoMap(values []*TaskRemovedEvent) []*ProtoTaskRemovedEvent { +func (x *ProtoTaskRemovedEvent) FromProto() *TaskRemovedEvent { + copysafe := &TaskRemovedEvent{ + Task: x.Task.FromProto(), + } + return copysafe +} + +func TaskRemovedEventToProtoSlice(values []*TaskRemovedEvent) []*ProtoTaskRemovedEvent { result := make([]*ProtoTaskRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func TaskRemovedEventFromProtoSlice(values []*ProtoTaskRemovedEvent) []*TaskRemovedEvent { + result := make([]*TaskRemovedEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 5abc8824..9f69408c 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -249,10 +249,31 @@ func (x *ImageLayer) ToProto() *ProtoImageLayer { return proto } -func ImageLayerProtoMap(values []*ImageLayer) []*ProtoImageLayer { +func (x *ProtoImageLayer) FromProto() *ImageLayer { + copysafe := &ImageLayer{ + Name: x.Name, + Url: x.Url, + DestinationPath: x.DestinationPath, + LayerType: ImageLayer_Type(x.LayerType), + MediaType: ImageLayer_MediaType(x.MediaType), + DigestAlgorithm: ImageLayer_DigestAlgorithm(x.DigestAlgorithm), + DigestValue: x.DigestValue, + } + return copysafe +} + +func ImageLayerToProtoSlice(values []*ImageLayer) []*ProtoImageLayer { result := make([]*ProtoImageLayer, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func ImageLayerFromProtoSlice(values []*ProtoImageLayer) []*ImageLayer { + result := make([]*ImageLayer, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index a1d90c17..06b93c19 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -56,10 +56,25 @@ func (x *LogRateLimit) ToProto() *ProtoLogRateLimit { return proto } -func LogRateLimitProtoMap(values []*LogRateLimit) []*ProtoLogRateLimit { +func (x *ProtoLogRateLimit) FromProto() *LogRateLimit { + copysafe := &LogRateLimit{ + BytesPerSecond: x.BytesPerSecond, + } + return copysafe +} + +func LogRateLimitToProtoSlice(values []*LogRateLimit) []*ProtoLogRateLimit { result := make([]*ProtoLogRateLimit, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func LogRateLimitFromProtoSlice(values []*ProtoLogRateLimit) []*LogRateLimit { + result := make([]*LogRateLimit, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 62d3d6ff..bab1d751 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -106,10 +106,26 @@ func (x *MetricTagValue) ToProto() *ProtoMetricTagValue { return proto } -func MetricTagValueProtoMap(values []*MetricTagValue) []*ProtoMetricTagValue { +func (x *ProtoMetricTagValue) FromProto() *MetricTagValue { + copysafe := &MetricTagValue{ + Static: x.Static, + Dynamic: MetricTagValue_DynamicValue(x.Dynamic), + } + return copysafe +} + +func MetricTagValueToProtoSlice(values []*MetricTagValue) []*ProtoMetricTagValue { result := make([]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func MetricTagValueFromProtoSlice(values []*ProtoMetricTagValue) []*MetricTagValue { + result := make([]*MetricTagValue, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 6332cfaa..d002738f 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -72,10 +72,26 @@ func (x *ModificationTag) ToProto() *ProtoModificationTag { return proto } -func ModificationTagProtoMap(values []*ModificationTag) []*ProtoModificationTag { +func (x *ProtoModificationTag) FromProto() *ModificationTag { + copysafe := &ModificationTag{ + Epoch: x.Epoch, + Index: x.Index, + } + return copysafe +} + +func ModificationTagToProtoSlice(values []*ModificationTag) []*ProtoModificationTag { result := make([]*ProtoModificationTag, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func ModificationTagFromProtoSlice(values []*ProtoModificationTag) []*ModificationTag { + result := make([]*ModificationTag, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 8a5de937..9f325d12 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -61,10 +61,25 @@ func (x *Network) ToProto() *ProtoNetwork { return proto } -func NetworkProtoMap(values []*Network) []*ProtoNetwork { +func (x *ProtoNetwork) FromProto() *Network { + copysafe := &Network{ + Properties: x.Properties, + } + return copysafe +} + +func NetworkToProtoSlice(values []*Network) []*ProtoNetwork { result := make([]*ProtoNetwork, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func NetworkFromProtoSlice(values []*ProtoNetwork) []*Network { + result := make([]*Network, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 37357fac..df9d20a3 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -56,10 +56,25 @@ func (x *PingResponse) ToProto() *ProtoPingResponse { return proto } -func PingResponseProtoMap(values []*PingResponse) []*ProtoPingResponse { +func (x *ProtoPingResponse) FromProto() *PingResponse { + copysafe := &PingResponse{ + Available: x.Available, + } + return copysafe +} + +func PingResponseToProtoSlice(values []*PingResponse) []*ProtoPingResponse { result := make([]*ProtoPingResponse, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func PingResponseFromProtoSlice(values []*ProtoPingResponse) []*PingResponse { + result := make([]*PingResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index bcfa6e2b..ec2744ff 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -72,7 +72,15 @@ func (x *PortRange) ToProto() *ProtoPortRange { return proto } -func PortRangeProtoMap(values []*PortRange) []*ProtoPortRange { +func (x *ProtoPortRange) FromProto() *PortRange { + copysafe := &PortRange{ + Start: x.Start, + End: x.End, + } + return copysafe +} + +func PortRangeToProtoSlice(values []*PortRange) []*ProtoPortRange { result := make([]*ProtoPortRange, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +88,14 @@ func PortRangeProtoMap(values []*PortRange) []*ProtoPortRange { return result } +func PortRangeFromProtoSlice(values []*ProtoPortRange) []*PortRange { + result := make([]*PortRange, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoICMPInfo directly type ICMPInfo struct { Type int32 @@ -146,7 +162,15 @@ func (x *ICMPInfo) ToProto() *ProtoICMPInfo { return proto } -func ICMPInfoProtoMap(values []*ICMPInfo) []*ProtoICMPInfo { +func (x *ProtoICMPInfo) FromProto() *ICMPInfo { + copysafe := &ICMPInfo{ + Type: x.Type, + Code: x.Code, + } + return copysafe +} + +func ICMPInfoToProtoSlice(values []*ICMPInfo) []*ProtoICMPInfo { result := make([]*ProtoICMPInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -154,6 +178,14 @@ func ICMPInfoProtoMap(values []*ICMPInfo) []*ProtoICMPInfo { return result } +func ICMPInfoFromProtoSlice(values []*ProtoICMPInfo) []*ICMPInfo { + result := make([]*ICMPInfo, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoSecurityGroupRule directly type SecurityGroupRule struct { Protocol string @@ -315,10 +347,31 @@ func (x *SecurityGroupRule) ToProto() *ProtoSecurityGroupRule { return proto } -func SecurityGroupRuleProtoMap(values []*SecurityGroupRule) []*ProtoSecurityGroupRule { +func (x *ProtoSecurityGroupRule) FromProto() *SecurityGroupRule { + copysafe := &SecurityGroupRule{ + Protocol: x.Protocol, + Destinations: x.Destinations, + Ports: x.Ports, + PortRange: x.PortRange.FromProto(), + IcmpInfo: x.IcmpInfo.FromProto(), + Log: x.Log, + Annotations: x.Annotations, + } + return copysafe +} + +func SecurityGroupRuleToProtoSlice(values []*SecurityGroupRule) []*ProtoSecurityGroupRule { result := make([]*ProtoSecurityGroupRule, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func SecurityGroupRuleFromProtoSlice(values []*ProtoSecurityGroupRule) []*SecurityGroupRule { + result := make([]*SecurityGroupRule, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 7bf0a4b2..e93a4498 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -88,10 +88,27 @@ func (x *Sidecar) ToProto() *ProtoSidecar { return proto } -func SidecarProtoMap(values []*Sidecar) []*ProtoSidecar { +func (x *ProtoSidecar) FromProto() *Sidecar { + copysafe := &Sidecar{ + Action: x.Action.FromProto(), + DiskMb: x.DiskMb, + MemoryMb: x.MemoryMb, + } + return copysafe +} + +func SidecarToProtoSlice(values []*Sidecar) []*ProtoSidecar { result := make([]*ProtoSidecar, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func SidecarFromProtoSlice(values []*ProtoSidecar) []*Sidecar { + result := make([]*Sidecar, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 9c4da179..6564a09c 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -483,7 +483,7 @@ func (m *TaskDefinition) SetMetricTags(value map[string]*MetricTagValue) { func (x *TaskDefinition) ToProto() *ProtoTaskDefinition { proto := &ProtoTaskDefinition{ RootFs: x.RootFs, - EnvironmentVariables: EnvironmentVariableProtoMap(x.EnvironmentVariables), + EnvironmentVariables: EnvironmentVariableToProtoSlice(x.EnvironmentVariables), Action: x.Action.ToProto(), DiskMb: x.DiskMb, MemoryMb: x.MemoryMb, @@ -495,25 +495,58 @@ func (x *TaskDefinition) ToProto() *ProtoTaskDefinition { ResultFile: x.ResultFile, CompletionCallbackUrl: x.CompletionCallbackUrl, Annotation: x.Annotation, - EgressRules: SecurityGroupRuleProtoMap(x.EgressRules), - CachedDependencies: CachedDependencyProtoMap(x.CachedDependencies), + EgressRules: SecurityGroupRuleToProtoSlice(x.EgressRules), + CachedDependencies: CachedDependencyToProtoSlice(x.CachedDependencies), LegacyDownloadUser: x.LegacyDownloadUser, TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, - VolumeMounts: VolumeMountProtoMap(x.VolumeMounts), + VolumeMounts: VolumeMountToProtoSlice(x.VolumeMounts), Network: x.Network.ToProto(), PlacementTags: x.PlacementTags, MaxPids: x.MaxPids, CertificateProperties: x.CertificateProperties.ToProto(), ImageUsername: x.ImageUsername, ImagePassword: x.ImagePassword, - ImageLayers: ImageLayerProtoMap(x.ImageLayers), + ImageLayers: ImageLayerToProtoSlice(x.ImageLayers), LogRateLimit: x.LogRateLimit.ToProto(), - MetricTags: TaskDefinitionMetricTagsProtoMap(x.MetricTags), + MetricTags: TaskDefinitionMetricTagsToProtoMap(x.MetricTags), } return proto } -func TaskDefinitionProtoMap(values []*TaskDefinition) []*ProtoTaskDefinition { +func (x *ProtoTaskDefinition) FromProto() *TaskDefinition { + copysafe := &TaskDefinition{ + RootFs: x.RootFs, + EnvironmentVariables: EnvironmentVariableFromProtoSlice(x.EnvironmentVariables), + Action: x.Action.FromProto(), + DiskMb: x.DiskMb, + MemoryMb: x.MemoryMb, + CpuWeight: x.CpuWeight, + Privileged: x.Privileged, + LogSource: x.LogSource, + LogGuid: x.LogGuid, + MetricsGuid: x.MetricsGuid, + ResultFile: x.ResultFile, + CompletionCallbackUrl: x.CompletionCallbackUrl, + Annotation: x.Annotation, + EgressRules: SecurityGroupRuleFromProtoSlice(x.EgressRules), + CachedDependencies: CachedDependencyFromProtoSlice(x.CachedDependencies), + LegacyDownloadUser: x.LegacyDownloadUser, + TrustedSystemCertificatesPath: x.TrustedSystemCertificatesPath, + VolumeMounts: VolumeMountFromProtoSlice(x.VolumeMounts), + Network: x.Network.FromProto(), + PlacementTags: x.PlacementTags, + MaxPids: x.MaxPids, + CertificateProperties: x.CertificateProperties.FromProto(), + ImageUsername: x.ImageUsername, + ImagePassword: x.ImagePassword, + ImageLayers: ImageLayerFromProtoSlice(x.ImageLayers), + LogRateLimit: x.LogRateLimit.FromProto(), + MetricTags: TaskDefinitionMetricTagsFromProtoMap(x.MetricTags), + } + return copysafe +} + +func TaskDefinitionToProtoSlice(values []*TaskDefinition) []*ProtoTaskDefinition { result := make([]*ProtoTaskDefinition, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -521,7 +554,7 @@ func TaskDefinitionProtoMap(values []*TaskDefinition) []*ProtoTaskDefinition { return result } -func TaskDefinitionMetricTagsProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { +func TaskDefinitionMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -529,6 +562,22 @@ func TaskDefinitionMetricTagsProtoMap(values map[string]*MetricTagValue) map[str return result } +func TaskDefinitionFromProtoSlice(values []*ProtoTaskDefinition) []*TaskDefinition { + result := make([]*TaskDefinition, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + +func TaskDefinitionMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + result := make(map[string]*MetricTagValue, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + type Task_State int32 const ( @@ -807,10 +856,37 @@ func (x *Task) ToProto() *ProtoTask { return proto } -func TaskProtoMap(values []*Task) []*ProtoTask { +func (x *ProtoTask) FromProto() *Task { + copysafe := &Task{ + TaskDefinition: x.TaskDefinition.FromProto(), + TaskGuid: x.TaskGuid, + Domain: x.Domain, + CreatedAt: x.CreatedAt, + UpdatedAt: x.UpdatedAt, + FirstCompletedAt: x.FirstCompletedAt, + State: Task_State(x.State), + CellId: x.CellId, + Result: x.Result, + Failed: x.Failed, + FailureReason: x.FailureReason, + RejectionCount: x.RejectionCount, + RejectionReason: x.RejectionReason, + } + return copysafe +} + +func TaskToProtoSlice(values []*Task) []*ProtoTask { result := make([]*ProtoTask, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func TaskFromProtoSlice(values []*ProtoTask) []*Task { + result := make([]*Task, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 932f6e16..4c29d5a8 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -56,7 +56,14 @@ func (x *TaskLifecycleResponse) ToProto() *ProtoTaskLifecycleResponse { return proto } -func TaskLifecycleResponseProtoMap(values []*TaskLifecycleResponse) []*ProtoTaskLifecycleResponse { +func (x *ProtoTaskLifecycleResponse) FromProto() *TaskLifecycleResponse { + copysafe := &TaskLifecycleResponse{ + Error: x.Error.FromProto(), + } + return copysafe +} + +func TaskLifecycleResponseToProtoSlice(values []*TaskLifecycleResponse) []*ProtoTaskLifecycleResponse { result := make([]*ProtoTaskLifecycleResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -64,6 +71,14 @@ func TaskLifecycleResponseProtoMap(values []*TaskLifecycleResponse) []*ProtoTask return result } +func TaskLifecycleResponseFromProtoSlice(values []*ProtoTaskLifecycleResponse) []*TaskLifecycleResponse { + result := make([]*TaskLifecycleResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoDesireTaskRequest directly type DesireTaskRequest struct { TaskDefinition *TaskDefinition @@ -146,7 +161,16 @@ func (x *DesireTaskRequest) ToProto() *ProtoDesireTaskRequest { return proto } -func DesireTaskRequestProtoMap(values []*DesireTaskRequest) []*ProtoDesireTaskRequest { +func (x *ProtoDesireTaskRequest) FromProto() *DesireTaskRequest { + copysafe := &DesireTaskRequest{ + TaskDefinition: x.TaskDefinition.FromProto(), + TaskGuid: x.TaskGuid, + Domain: x.Domain, + } + return copysafe +} + +func DesireTaskRequestToProtoSlice(values []*DesireTaskRequest) []*ProtoDesireTaskRequest { result := make([]*ProtoDesireTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -154,6 +178,14 @@ func DesireTaskRequestProtoMap(values []*DesireTaskRequest) []*ProtoDesireTaskRe return result } +func DesireTaskRequestFromProtoSlice(values []*ProtoDesireTaskRequest) []*DesireTaskRequest { + result := make([]*DesireTaskRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoStartTaskRequest directly type StartTaskRequest struct { TaskGuid string @@ -220,7 +252,15 @@ func (x *StartTaskRequest) ToProto() *ProtoStartTaskRequest { return proto } -func StartTaskRequestProtoMap(values []*StartTaskRequest) []*ProtoStartTaskRequest { +func (x *ProtoStartTaskRequest) FromProto() *StartTaskRequest { + copysafe := &StartTaskRequest{ + TaskGuid: x.TaskGuid, + CellId: x.CellId, + } + return copysafe +} + +func StartTaskRequestToProtoSlice(values []*StartTaskRequest) []*ProtoStartTaskRequest { result := make([]*ProtoStartTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -228,6 +268,14 @@ func StartTaskRequestProtoMap(values []*StartTaskRequest) []*ProtoStartTaskReque return result } +func StartTaskRequestFromProtoSlice(values []*ProtoStartTaskRequest) []*StartTaskRequest { + result := make([]*StartTaskRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoStartTaskResponse directly type StartTaskResponse struct { Error *Error @@ -294,7 +342,15 @@ func (x *StartTaskResponse) ToProto() *ProtoStartTaskResponse { return proto } -func StartTaskResponseProtoMap(values []*StartTaskResponse) []*ProtoStartTaskResponse { +func (x *ProtoStartTaskResponse) FromProto() *StartTaskResponse { + copysafe := &StartTaskResponse{ + Error: x.Error.FromProto(), + ShouldStart: x.ShouldStart, + } + return copysafe +} + +func StartTaskResponseToProtoSlice(values []*StartTaskResponse) []*ProtoStartTaskResponse { result := make([]*ProtoStartTaskResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -302,6 +358,14 @@ func StartTaskResponseProtoMap(values []*StartTaskResponse) []*ProtoStartTaskRes return result } +func StartTaskResponseFromProtoSlice(values []*ProtoStartTaskResponse) []*StartTaskResponse { + result := make([]*StartTaskResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoFailTaskRequest directly type FailTaskRequest struct { TaskGuid string @@ -368,7 +432,15 @@ func (x *FailTaskRequest) ToProto() *ProtoFailTaskRequest { return proto } -func FailTaskRequestProtoMap(values []*FailTaskRequest) []*ProtoFailTaskRequest { +func (x *ProtoFailTaskRequest) FromProto() *FailTaskRequest { + copysafe := &FailTaskRequest{ + TaskGuid: x.TaskGuid, + FailureReason: x.FailureReason, + } + return copysafe +} + +func FailTaskRequestToProtoSlice(values []*FailTaskRequest) []*ProtoFailTaskRequest { result := make([]*ProtoFailTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -376,6 +448,14 @@ func FailTaskRequestProtoMap(values []*FailTaskRequest) []*ProtoFailTaskRequest return result } +func FailTaskRequestFromProtoSlice(values []*ProtoFailTaskRequest) []*FailTaskRequest { + result := make([]*FailTaskRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoRejectTaskRequest directly type RejectTaskRequest struct { TaskGuid string @@ -442,7 +522,15 @@ func (x *RejectTaskRequest) ToProto() *ProtoRejectTaskRequest { return proto } -func RejectTaskRequestProtoMap(values []*RejectTaskRequest) []*ProtoRejectTaskRequest { +func (x *ProtoRejectTaskRequest) FromProto() *RejectTaskRequest { + copysafe := &RejectTaskRequest{ + TaskGuid: x.TaskGuid, + RejectionReason: x.RejectionReason, + } + return copysafe +} + +func RejectTaskRequestToProtoSlice(values []*RejectTaskRequest) []*ProtoRejectTaskRequest { result := make([]*ProtoRejectTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -450,6 +538,14 @@ func RejectTaskRequestProtoMap(values []*RejectTaskRequest) []*ProtoRejectTaskRe return result } +func RejectTaskRequestFromProtoSlice(values []*ProtoRejectTaskRequest) []*RejectTaskRequest { + result := make([]*RejectTaskRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTaskGuidRequest directly type TaskGuidRequest struct { TaskGuid string @@ -500,7 +596,14 @@ func (x *TaskGuidRequest) ToProto() *ProtoTaskGuidRequest { return proto } -func TaskGuidRequestProtoMap(values []*TaskGuidRequest) []*ProtoTaskGuidRequest { +func (x *ProtoTaskGuidRequest) FromProto() *TaskGuidRequest { + copysafe := &TaskGuidRequest{ + TaskGuid: x.TaskGuid, + } + return copysafe +} + +func TaskGuidRequestToProtoSlice(values []*TaskGuidRequest) []*ProtoTaskGuidRequest { result := make([]*ProtoTaskGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -508,6 +611,14 @@ func TaskGuidRequestProtoMap(values []*TaskGuidRequest) []*ProtoTaskGuidRequest return result } +func TaskGuidRequestFromProtoSlice(values []*ProtoTaskGuidRequest) []*TaskGuidRequest { + result := make([]*TaskGuidRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoCompleteTaskRequest directly type CompleteTaskRequest struct { TaskGuid string @@ -622,7 +733,18 @@ func (x *CompleteTaskRequest) ToProto() *ProtoCompleteTaskRequest { return proto } -func CompleteTaskRequestProtoMap(values []*CompleteTaskRequest) []*ProtoCompleteTaskRequest { +func (x *ProtoCompleteTaskRequest) FromProto() *CompleteTaskRequest { + copysafe := &CompleteTaskRequest{ + TaskGuid: x.TaskGuid, + CellId: x.CellId, + Failed: x.Failed, + FailureReason: x.FailureReason, + Result: x.Result, + } + return copysafe +} + +func CompleteTaskRequestToProtoSlice(values []*CompleteTaskRequest) []*ProtoCompleteTaskRequest { result := make([]*ProtoCompleteTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -630,6 +752,14 @@ func CompleteTaskRequestProtoMap(values []*CompleteTaskRequest) []*ProtoComplete return result } +func CompleteTaskRequestFromProtoSlice(values []*ProtoCompleteTaskRequest) []*CompleteTaskRequest { + result := make([]*CompleteTaskRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTaskCallbackResponse directly type TaskCallbackResponse struct { TaskGuid string @@ -760,7 +890,19 @@ func (x *TaskCallbackResponse) ToProto() *ProtoTaskCallbackResponse { return proto } -func TaskCallbackResponseProtoMap(values []*TaskCallbackResponse) []*ProtoTaskCallbackResponse { +func (x *ProtoTaskCallbackResponse) FromProto() *TaskCallbackResponse { + copysafe := &TaskCallbackResponse{ + TaskGuid: x.TaskGuid, + Failed: x.Failed, + FailureReason: x.FailureReason, + Result: x.Result, + Annotation: x.Annotation, + CreatedAt: x.CreatedAt, + } + return copysafe +} + +func TaskCallbackResponseToProtoSlice(values []*TaskCallbackResponse) []*ProtoTaskCallbackResponse { result := make([]*ProtoTaskCallbackResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -768,6 +910,14 @@ func TaskCallbackResponseProtoMap(values []*TaskCallbackResponse) []*ProtoTaskCa return result } +func TaskCallbackResponseFromProtoSlice(values []*ProtoTaskCallbackResponse) []*TaskCallbackResponse { + result := make([]*TaskCallbackResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTasksRequest directly type TasksRequest struct { Domain string @@ -834,7 +984,15 @@ func (x *TasksRequest) ToProto() *ProtoTasksRequest { return proto } -func TasksRequestProtoMap(values []*TasksRequest) []*ProtoTasksRequest { +func (x *ProtoTasksRequest) FromProto() *TasksRequest { + copysafe := &TasksRequest{ + Domain: x.Domain, + CellId: x.CellId, + } + return copysafe +} + +func TasksRequestToProtoSlice(values []*TasksRequest) []*ProtoTasksRequest { result := make([]*ProtoTasksRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -842,6 +1000,14 @@ func TasksRequestProtoMap(values []*TasksRequest) []*ProtoTasksRequest { return result } +func TasksRequestFromProtoSlice(values []*ProtoTasksRequest) []*TasksRequest { + result := make([]*TasksRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTasksResponse directly type TasksResponse struct { Error *Error @@ -908,12 +1074,20 @@ func (m *TasksResponse) SetTasks(value []*Task) { func (x *TasksResponse) ToProto() *ProtoTasksResponse { proto := &ProtoTasksResponse{ Error: x.Error.ToProto(), - Tasks: TaskProtoMap(x.Tasks), + Tasks: TaskToProtoSlice(x.Tasks), } return proto } -func TasksResponseProtoMap(values []*TasksResponse) []*ProtoTasksResponse { +func (x *ProtoTasksResponse) FromProto() *TasksResponse { + copysafe := &TasksResponse{ + Error: x.Error.FromProto(), + Tasks: TaskFromProtoSlice(x.Tasks), + } + return copysafe +} + +func TasksResponseToProtoSlice(values []*TasksResponse) []*ProtoTasksResponse { result := make([]*ProtoTasksResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -921,6 +1095,14 @@ func TasksResponseProtoMap(values []*TasksResponse) []*ProtoTasksResponse { return result } +func TasksResponseFromProtoSlice(values []*ProtoTasksResponse) []*TasksResponse { + result := make([]*TasksResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTaskByGuidRequest directly type TaskByGuidRequest struct { TaskGuid string @@ -971,7 +1153,14 @@ func (x *TaskByGuidRequest) ToProto() *ProtoTaskByGuidRequest { return proto } -func TaskByGuidRequestProtoMap(values []*TaskByGuidRequest) []*ProtoTaskByGuidRequest { +func (x *ProtoTaskByGuidRequest) FromProto() *TaskByGuidRequest { + copysafe := &TaskByGuidRequest{ + TaskGuid: x.TaskGuid, + } + return copysafe +} + +func TaskByGuidRequestToProtoSlice(values []*TaskByGuidRequest) []*ProtoTaskByGuidRequest { result := make([]*ProtoTaskByGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -979,6 +1168,14 @@ func TaskByGuidRequestProtoMap(values []*TaskByGuidRequest) []*ProtoTaskByGuidRe return result } +func TaskByGuidRequestFromProtoSlice(values []*ProtoTaskByGuidRequest) []*TaskByGuidRequest { + result := make([]*TaskByGuidRequest, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoTaskResponse directly type TaskResponse struct { Error *Error @@ -1045,10 +1242,26 @@ func (x *TaskResponse) ToProto() *ProtoTaskResponse { return proto } -func TaskResponseProtoMap(values []*TaskResponse) []*ProtoTaskResponse { +func (x *ProtoTaskResponse) FromProto() *TaskResponse { + copysafe := &TaskResponse{ + Error: x.Error.FromProto(), + Task: x.Task.FromProto(), + } + return copysafe +} + +func TaskResponseToProtoSlice(values []*TaskResponse) []*ProtoTaskResponse { result := make([]*ProtoTaskResponse, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func TaskResponseFromProtoSlice(values []*ProtoTaskResponse) []*TaskResponse { + result := make([]*TaskResponse, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 54ea0786..a1701358 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -72,7 +72,15 @@ func (x *SharedDevice) ToProto() *ProtoSharedDevice { return proto } -func SharedDeviceProtoMap(values []*SharedDevice) []*ProtoSharedDevice { +func (x *ProtoSharedDevice) FromProto() *SharedDevice { + copysafe := &SharedDevice{ + VolumeId: x.VolumeId, + MountConfig: x.MountConfig, + } + return copysafe +} + +func SharedDeviceToProtoSlice(values []*SharedDevice) []*ProtoSharedDevice { result := make([]*ProtoSharedDevice, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +88,14 @@ func SharedDeviceProtoMap(values []*SharedDevice) []*ProtoSharedDevice { return result } +func SharedDeviceFromProtoSlice(values []*ProtoSharedDevice) []*SharedDevice { + result := make([]*SharedDevice, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoVolumeMount directly type VolumeMount struct { Driver string @@ -178,7 +194,17 @@ func (x *VolumeMount) ToProto() *ProtoVolumeMount { return proto } -func VolumeMountProtoMap(values []*VolumeMount) []*ProtoVolumeMount { +func (x *ProtoVolumeMount) FromProto() *VolumeMount { + copysafe := &VolumeMount{ + Driver: x.Driver, + ContainerDir: x.ContainerDir, + Mode: x.Mode, + Shared: x.Shared.FromProto(), + } + return copysafe +} + +func VolumeMountToProtoSlice(values []*VolumeMount) []*ProtoVolumeMount { result := make([]*ProtoVolumeMount, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -186,6 +212,14 @@ func VolumeMountProtoMap(values []*VolumeMount) []*ProtoVolumeMount { return result } +func VolumeMountFromProtoSlice(values []*ProtoVolumeMount) []*VolumeMount { + result := make([]*VolumeMount, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} + // Prevent copylock errors when using ProtoVolumePlacement directly type VolumePlacement struct { DriverNames []string @@ -241,10 +275,25 @@ func (x *VolumePlacement) ToProto() *ProtoVolumePlacement { return proto } -func VolumePlacementProtoMap(values []*VolumePlacement) []*ProtoVolumePlacement { +func (x *ProtoVolumePlacement) FromProto() *VolumePlacement { + copysafe := &VolumePlacement{ + DriverNames: x.DriverNames, + } + return copysafe +} + +func VolumePlacementToProtoSlice(values []*VolumePlacement) []*ProtoVolumePlacement { result := make([]*ProtoVolumePlacement, len(values)) for i, val := range values { result[i] = val.ToProto() } return result } + +func VolumePlacementFromProtoSlice(values []*ProtoVolumePlacement) []*VolumePlacement { + result := make([]*VolumePlacement, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 77df95de..35989065 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -16,7 +16,9 @@ import ( type bbsGenerateHelperInterface interface { genCopysafeStruct(g *protogen.GeneratedFile, msg *protogen.Message) genToProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) - genProtoMapMethod(g *protogen.GeneratedFile, msg *protogen.Message) + genFromProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) + genToProtoSliceMethod(g *protogen.GeneratedFile, msg *protogen.Message) + genFromProtoSliceMethod(g *protogen.GeneratedFile, msg *protogen.Message) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) genAccessors(g *protogen.GeneratedFile, msg *protogen.Message) genEqual(g *protogen.GeneratedFile, msg *protogen.Message) @@ -368,11 +370,11 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog fieldCopysafeName = getFieldName(fieldCopysafeName) if field.Desc.Cardinality() == protoreflect.Repeated { if field.Desc.IsList() { - g.P(protoFieldName, ": ", fieldCopysafeName, "ProtoMap(x.", getFieldName(protoFieldName), "),") + g.P(protoFieldName, ": ", fieldCopysafeName, "ToProtoSlice(x.", getFieldName(protoFieldName), "),") } else if field.Desc.IsMap() { mapValueKind := field.Desc.MapValue().Kind() if mapValueKind == protoreflect.MessageKind { - g.P(protoFieldName, ": ", copysafeName, getFieldName(protoFieldName), "ProtoMap(x.", protoFieldName, "),") + g.P(protoFieldName, ": ", copysafeName, getFieldName(protoFieldName), "ToProtoMap(x.", protoFieldName, "),") } else { g.P(protoFieldName, ": ", "x.", protoFieldName, ",") } @@ -400,10 +402,54 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog } } -func (bbsGenerateHelper) genProtoMapMethod(g *protogen.GeneratedFile, msg *protogen.Message) { +func (bbsGenerateHelper) genFromProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) { unsafeName := getUnsafeName(g, msg.GoIdent) if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { - g.P("func ", copysafeName, "ProtoMap(values []*", copysafeName, ") []*", unsafeName, " {") + g.P("func(x *", unsafeName, ") FromProto() *", copysafeName, " {") + g.P("copysafe := &", copysafeName, "{") + for _, field := range msg.Fields { + protoFieldName := field.GoName + if field.Message != nil { + fieldCopysafeName, _ := getCopysafeName(g, field.Message.GoIdent) + fieldCopysafeName = getFieldName(fieldCopysafeName) + if field.Desc.Cardinality() == protoreflect.Repeated { + if field.Desc.IsList() { + g.P(protoFieldName, ": ", fieldCopysafeName, "FromProtoSlice(x.", getFieldName(protoFieldName), "),") + } else if field.Desc.IsMap() { + mapValueKind := field.Desc.MapValue().Kind() + if mapValueKind == protoreflect.MessageKind { + g.P(protoFieldName, ": ", copysafeName, getFieldName(protoFieldName), "FromProtoMap(x.", protoFieldName, "),") + } else { + g.P(protoFieldName, ": ", "x.", protoFieldName, ",") + } + } else { + panic("Unrecognized Repeated field found") + } + } else { + g.P(protoFieldName, ": x.", getFieldName(protoFieldName), ".FromProto(),") + } + } else if field.Enum != nil { + g.P(protoFieldName, ": ", getActualType(g, field), "(x.", protoFieldName, "),") + } else { + // we weren't using oneof correctly, so we're not going to support it + // if field.Oneof != nil { + // g.P(protoFieldName, ": &x.", protoFieldName, ",") + // } else { + g.P(protoFieldName, ": x.", protoFieldName, ",") + // } + } + } + g.P("}") + g.P("return copysafe") + g.P("}") + g.P() + } +} + +func (bbsGenerateHelper) genToProtoSliceMethod(g *protogen.GeneratedFile, msg *protogen.Message) { + unsafeName := getUnsafeName(g, msg.GoIdent) + if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + g.P("func ", copysafeName, "ToProtoSlice(values []*", copysafeName, ") []*", unsafeName, " {") g.P("result := make([]*", unsafeName, ", len(values))") g.P("for i, val := range values {") g.P("result[i] = val.ToProto()") @@ -426,7 +472,7 @@ func (bbsGenerateHelper) genProtoMapMethod(g *protogen.GeneratedFile, msg *proto protoMapValueType := "*" + protoValueFieldType protoFieldType := "map[" + mapKeyType + "]" + protoMapValueType - g.P("func ", copysafeName, getFieldName(field.GoName), "ProtoMap(values ", fieldType, ") ", protoFieldType, " {") + g.P("func ", copysafeName, getFieldName(field.GoName), "ToProtoMap(values ", fieldType, ") ", protoFieldType, " {") g.P("result := make(map[", mapKeyType, "]*", protoValueFieldType, ", len(values))") g.P("for i, val := range values {") g.P("result[i] = val.ToProto()") @@ -440,6 +486,46 @@ func (bbsGenerateHelper) genProtoMapMethod(g *protogen.GeneratedFile, msg *proto } } +func (bbsGenerateHelper) genFromProtoSliceMethod(g *protogen.GeneratedFile, msg *protogen.Message) { + unsafeName := getUnsafeName(g, msg.GoIdent) + if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + g.P("func ", copysafeName, "FromProtoSlice(values []*", unsafeName, ") []*", copysafeName, " {") + g.P("result := make([]*", copysafeName, ", len(values))") + g.P("for i, val := range values {") + g.P("result[i] = val.FromProto()") + g.P("}") + g.P("return result") + g.P("}") + g.P() + + for _, field := range msg.Fields { + if field.Desc.IsMap() { + mapValueKind := field.Desc.MapValue().Kind() + if mapValueKind == protoreflect.MessageKind { + valueField := field.Desc.MapValue().Message().FullName() + rawGoIdent := strings.Split(string(valueField), ".") + protoValueFieldType := rawGoIdent[1] + valueFieldType, _ := strings.CutPrefix(protoValueFieldType, *prefix) + mapValueType := "*" + valueFieldType + mapKeyType := field.Desc.MapKey().Kind().String() + fieldType := "map[" + mapKeyType + "]" + mapValueType + protoMapValueType := "*" + protoValueFieldType + protoFieldType := "map[" + mapKeyType + "]" + protoMapValueType + + g.P("func ", copysafeName, getFieldName(field.GoName), "FromProtoMap(values ", protoFieldType, ") ", fieldType, " {") + g.P("result := make(map[", mapKeyType, "]*", valueFieldType, ", len(values))") + g.P("for i, val := range values {") + g.P("result[i] = val.FromProto()") + g.P("}") + g.P("return result") + g.P("}") + g.P() + } + } + } + } +} + func generateFile(plugin *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile { filename := file.GeneratedFilenamePrefix + "_bbs.pb.go" g := plugin.NewGeneratedFile(filename, file.GoImportPath) @@ -487,6 +573,8 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { helper.genFriendlyEnums(g, msg) helper.genCopysafeStruct(g, msg) helper.genToProtoMethod(g, msg) - helper.genProtoMapMethod(g, msg) + helper.genFromProtoMethod(g, msg) + helper.genToProtoSliceMethod(g, msg) + helper.genFromProtoSliceMethod(g, msg) } } From e201b57a4e7910bf12722c4996321206384ae3d7 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 9 May 2024 21:46:18 +0000 Subject: [PATCH 062/155] Add FromProto to Routes special case --- models/routes.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/models/routes.go b/models/routes.go index 74b54648..b9f9892c 100644 --- a/models/routes.go +++ b/models/routes.go @@ -19,6 +19,16 @@ func (r *Routes) ToProto() *ProtoRoutes { return pr } +func (pr *ProtoRoutes) FromProto() *Routes { + r := Routes{} + + for k, v := range pr.Routes { + *r[k] = v + } + + return &r +} + // func (r *Routes) Marshal() ([]byte, error) { // return r.protoRoutes().Marshal() // } From ee2edeb1766b1b9acf22456a1c7a8045be702bc4 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 9 May 2024 21:46:52 +0000 Subject: [PATCH 063/155] Test changes to reflect proto and model changes --- models/actions_test.go | 6 +- models/actual_lrp_requests_test.go | 3 +- models/actual_lrp_test.go | 121 +++++++++++++--------- models/desired_lrp_requests_test.go | 3 +- models/desired_lrp_test.go | 94 +++++++++-------- models/events_test.go | 40 +++---- models/image_layer_test.go | 50 ++++----- models/metric_tags_test.go | 38 +++---- models/routes_test.go | 8 +- models/security_groups_test.go | 8 +- models/task_test.go | 64 ++++++------ models/test/model_helpers/constructors.go | 29 +++--- test_helpers/actual_lrp_group_matcher.go | 4 +- test_helpers/actual_lrp_matcher.go | 2 +- 14 files changed, 253 insertions(+), 217 deletions(-) diff --git a/models/actions_test.go b/models/actions_test.go index 6054bbd0..02d46c21 100644 --- a/models/actions_test.go +++ b/models/actions_test.go @@ -293,8 +293,8 @@ var _ = Describe("Actions", func() { nproc uint64 = 20 ) resourceLimits := &models.ResourceLimits{} - resourceLimits.SetNofile(nofile) - resourceLimits.SetNproc(nproc) + resourceLimits.SetNofile(&nofile) + resourceLimits.SetNproc(&nproc) itSerializesAndDeserializes( `{ "user": "me", @@ -359,7 +359,7 @@ var _ = Describe("Actions", func() { var nofile uint64 = 10 resourceLimits := &models.ResourceLimits{} - resourceLimits.SetNofile(nofile) + resourceLimits.SetNofile(&nofile) itSerializesAndDeserializes( `{ diff --git a/models/actual_lrp_requests_test.go b/models/actual_lrp_requests_test.go index b54faf67..9573a6e1 100644 --- a/models/actual_lrp_requests_test.go +++ b/models/actual_lrp_requests_test.go @@ -36,7 +36,8 @@ var _ = Describe("ActualLRP Requests", func() { CellId: "abc123", ProcessGuid: "def456", } - request.SetIndex(3) + index := int32(3) + request.SetIndex(&index) expectedJSON = `{ "domain": "cfapps", diff --git a/models/actual_lrp_test.go b/models/actual_lrp_test.go index 751eef5c..a57f40e3 100644 --- a/models/actual_lrp_test.go +++ b/models/actual_lrp_test.go @@ -11,8 +11,9 @@ import ( ) func defaultCrashedActual(crashCount int32, lastCrashed int64) *models.ActualLRP { + actualLrpKey := models.NewActualLRPKey("p-guid", 0, "domain") return &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("p-guid", 0, "domain"), + ActualLrpKey: &actualLrpKey, State: models.ActualLRPStateCrashed, CrashCount: crashCount, Since: lastCrashed, @@ -178,7 +179,8 @@ var _ = Describe("ActualLRP", func() { Context("when Routable is false", func() { BeforeEach(func() { - actualLRPInfo.SetRoutable(false) + routable := false + actualLRPInfo.SetRoutable(&routable) }) It("sets routable to provided value", func() { @@ -190,7 +192,8 @@ var _ = Describe("ActualLRP", func() { Context("when Routable is true", func() { BeforeEach(func() { - actualLRPInfo.SetRoutable(true) + routable := true + actualLRPInfo.SetRoutable(&routable) }) It("sets routable to provided value", func() { @@ -366,11 +369,11 @@ var _ = Describe("ActualLRP", func() { BeforeEach(func() { lrpKey := models.NewActualLRPKey("process-guid", 1, "domain") instanceLRP = &models.ActualLRP{ - ActualLRPKey: lrpKey, + ActualLrpKey: &lrpKey, Since: 1138, } evacuatingLRP = &models.ActualLRP{ - ActualLRPKey: lrpKey, + ActualLrpKey: &lrpKey, Since: 3417, } }) @@ -497,13 +500,13 @@ var _ = Describe("ActualLRP", func() { netInfo = models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown, models.NewPortMapping(5678, 8080), models.NewPortMapping(1234, 8081)) lrp = models.ActualLRP{ - ActualLRPKey: lrpKey, - ActualLRPInstanceKey: instanceKey, - ActualLRPNetInfo: netInfo, + ActualLrpKey: &lrpKey, + ActualLrpInstanceKey: &instanceKey, + ActualLrpNetInfo: &netInfo, CrashCount: 1, State: models.ActualLRPStateRunning, Since: 1138, - ModificationTag: models.ModificationTag{ + ModificationTag: &models.ModificationTag{ Epoch: "some-guid", Index: 50, }, @@ -517,43 +520,44 @@ var _ = Describe("ActualLRP", func() { ) BeforeEach(func() { + actualLrpKey := models.NewActualLRPKey("fake-process-guid", 1, "fake-domain") before = &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("fake-process-guid", 1, "fake-domain"), + ActualLrpKey: &actualLrpKey, } afterKey = models.ActualLRPKey{} - afterKey = before.ActualLRPKey + afterKey = *before.ActualLrpKey }) Context("when the ProcessGuid fields differ", func() { BeforeEach(func() { - before.ProcessGuid = "some-process-guid" + before.ActualLrpKey.ProcessGuid = "some-process-guid" afterKey.ProcessGuid = "another-process-guid" }) It("is not allowed", func() { - Expect(before.AllowsTransitionTo(&afterKey, &before.ActualLRPInstanceKey, before.GetState())).To(BeFalse()) + Expect(before.AllowsTransitionTo(&afterKey, before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) }) }) Context("when the Index fields differ", func() { BeforeEach(func() { - before.Index = 1138 + before.ActualLrpKey.Index = 1138 afterKey.Index = 3417 }) It("is not allowed", func() { - Expect(before.AllowsTransitionTo(&afterKey, &before.ActualLRPInstanceKey, before.GetState())).To(BeFalse()) + Expect(before.AllowsTransitionTo(&afterKey, before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) }) }) Context("when the Domain fields differ", func() { BeforeEach(func() { - before.Domain = "some-domain" + before.ActualLrpKey.Domain = "some-domain" afterKey.Domain = "another-domain" }) It("is not allowed", func() { - Expect(before.AllowsTransitionTo(&afterKey, &before.ActualLRPInstanceKey, before.GetState())).To(BeFalse()) + Expect(before.AllowsTransitionTo(&afterKey, before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) }) }) @@ -629,8 +633,8 @@ var _ = Describe("ActualLRP", func() { entry := entry It(EntryToString(entry), func() { before.State = entry.BeforeState - before.ActualLRPInstanceKey = entry.BeforeInstanceKey - Expect(before.AllowsTransitionTo(&before.ActualLRPKey, &entry.AfterInstanceKey, entry.AfterState)).To(Equal(entry.Allowed)) + before.ActualLrpInstanceKey = &entry.BeforeInstanceKey + Expect(before.AllowsTransitionTo(before.ActualLrpKey, &entry.AfterInstanceKey, entry.AfterState)).To(Equal(entry.Allowed)) }) } }) @@ -640,7 +644,7 @@ var _ = Describe("ActualLRP", func() { Context("when state is unclaimed", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLRPKey: lrpKey, + ActualLrpKey: &lrpKey, State: models.ActualLRPStateUnclaimed, Since: 1138, } @@ -656,8 +660,8 @@ var _ = Describe("ActualLRP", func() { Context("when state is claimed", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLRPKey: lrpKey, - ActualLRPInstanceKey: instanceKey, + ActualLrpKey: &lrpKey, + ActualLrpInstanceKey: &instanceKey, State: models.ActualLRPStateClaimed, Since: 1138, } @@ -672,9 +676,9 @@ var _ = Describe("ActualLRP", func() { Context("when state is running", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLRPKey: lrpKey, - ActualLRPInstanceKey: instanceKey, - ActualLRPNetInfo: netInfo, + ActualLrpKey: &lrpKey, + ActualLrpInstanceKey: &instanceKey, + ActualLrpNetInfo: &netInfo, State: models.ActualLRPStateRunning, Since: 1138, } @@ -689,7 +693,7 @@ var _ = Describe("ActualLRP", func() { Context("when state is not set", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLRPKey: lrpKey, + ActualLrpKey: &lrpKey, State: "", Since: 1138, } @@ -706,7 +710,7 @@ var _ = Describe("ActualLRP", func() { Context("when since is not set", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLRPKey: lrpKey, + ActualLrpKey: &lrpKey, State: models.ActualLRPStateUnclaimed, Since: 0, } @@ -722,7 +726,7 @@ var _ = Describe("ActualLRP", func() { Context("when state is crashed", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLRPKey: lrpKey, + ActualLrpKey: &lrpKey, State: models.ActualLRPStateCrashed, Since: 1138, } @@ -738,15 +742,19 @@ var _ = Describe("ActualLRP", func() { Describe("ResolveActualLRPGroups", func() { It("returns ordinary ActualLRPs in the instance slot of ActualLRPGroups", func() { + actualLrpKey1 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") + actualLrpInstanceKey1 := models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0") lrp1 := &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("process-guid-0", 0, "domain-0"), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0"), + ActualLrpKey: &actualLrpKey1, + ActualLrpInstanceKey: &actualLrpInstanceKey1, Presence: models.ActualLRP_Ordinary, State: models.ActualLRPStateRunning, } + actualLrpKey2 := models.NewActualLRPKey("process-guid-1", 1, "domain-1") + actualLrpInstanceKey2 := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-0") lrp2 := &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("process-guid-1", 1, "domain-1"), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-0"), + ActualLrpKey: &actualLrpKey2, + ActualLrpInstanceKey: &actualLrpInstanceKey2, Presence: models.ActualLRP_Ordinary, State: models.ActualLRPStateRunning, } @@ -758,15 +766,19 @@ var _ = Describe("ActualLRP", func() { }) It("returns evacuating ActualLRPs in the evacuating slot of ActualLRPGroups", func() { + actualLrpKey1 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") + actualLrpInstanceKey1 := models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0") lrp1 := &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("process-guid-0", 0, "domain-0"), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0"), + ActualLrpKey: &actualLrpKey1, + ActualLrpInstanceKey: &actualLrpInstanceKey1, Presence: models.ActualLRP_Evacuating, State: models.ActualLRPStateRunning, } + actualLrpKey2 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") + actualLrpInstanceKey2 := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1") lrp2 := &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("process-guid-0", 0, "domain-0"), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1"), + ActualLrpKey: &actualLrpKey2, + ActualLrpInstanceKey: &actualLrpInstanceKey2, Presence: models.ActualLRP_Ordinary, State: models.ActualLRPStateRunning, } @@ -782,15 +794,19 @@ var _ = Describe("ActualLRP", func() { supLRPState string, supLRPPresence models.ActualLRP_Presence, infLRPState string, infLRPPresence models.ActualLRP_Presence, ) { + actualLrpKey1 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") + actualLrpInstanceKey1 := models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0") supLRP := &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("process-guid-0", 0, "domain-0"), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0"), + ActualLrpKey: &actualLrpKey1, + ActualLrpInstanceKey: &actualLrpInstanceKey1, Presence: supLRPPresence, State: supLRPState, } + actualLrpKey2 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") + actualLrpInstanceKey2 := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1") infLRP := &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey("process-guid-0", 0, "domain-0"), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1"), + ActualLrpKey: &actualLrpKey2, + ActualLrpInstanceKey: &actualLrpInstanceKey2, Presence: infLRPPresence, State: infLRPState, } @@ -854,7 +870,8 @@ var _ = Describe("ActualLRP", func() { func itValidatesPresenceOfTheLRPKey(lrp *models.ActualLRP) { Context("when the lrp key is set", func() { BeforeEach(func() { - lrp.ActualLRPKey = models.NewActualLRPKey("some-guid", 1, "domain") + actualLrpKey := models.NewActualLRPKey("some-guid", 1, "domain") + lrp.ActualLrpKey = &actualLrpKey }) It("validate does not return an error", func() { @@ -864,7 +881,7 @@ func itValidatesPresenceOfTheLRPKey(lrp *models.ActualLRP) { Context("when the lrp key is not set", func() { BeforeEach(func() { - lrp.ActualLRPKey = models.ActualLRPKey{} + lrp.ActualLrpKey = &models.ActualLRPKey{} }) It("validate returns an error", func() { @@ -878,7 +895,8 @@ func itValidatesPresenceOfTheLRPKey(lrp *models.ActualLRP) { func itValidatesPresenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is set", func() { BeforeEach(func() { - lrp.ActualLRPInstanceKey = models.NewActualLRPInstanceKey("some-instance", "some-cell") + actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-instance", "some-cell") + lrp.ActualLrpInstanceKey = &actualLrpInstanceKey }) It("validate does not return an error", func() { @@ -888,7 +906,7 @@ func itValidatesPresenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is not set", func() { BeforeEach(func() { - lrp.ActualLRPInstanceKey = models.ActualLRPInstanceKey{} + lrp.ActualLrpInstanceKey = &models.ActualLRPInstanceKey{} }) It("validate returns an error", func() { @@ -902,7 +920,8 @@ func itValidatesPresenceOfTheInstanceKey(lrp *models.ActualLRP) { func itValidatesAbsenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is set", func() { BeforeEach(func() { - lrp.ActualLRPInstanceKey = models.NewActualLRPInstanceKey("some-instance", "some-cell") + actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-instance", "some-cell") + lrp.ActualLrpInstanceKey = &actualLrpInstanceKey }) It("validate returns an error", func() { @@ -914,7 +933,7 @@ func itValidatesAbsenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is not set", func() { BeforeEach(func() { - lrp.ActualLRPInstanceKey = models.ActualLRPInstanceKey{} + lrp.ActualLrpInstanceKey = &models.ActualLRPInstanceKey{} }) It("validate does not return an error", func() { @@ -926,7 +945,8 @@ func itValidatesAbsenceOfTheInstanceKey(lrp *models.ActualLRP) { func itValidatesPresenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is set", func() { BeforeEach(func() { - lrp.ActualLRPNetInfo = models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown) + actualLrpNetInfo := models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown) + lrp.ActualLrpNetInfo = &actualLrpNetInfo }) It("validate does not return an error", func() { @@ -936,7 +956,7 @@ func itValidatesPresenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is not set", func() { BeforeEach(func() { - lrp.ActualLRPNetInfo = models.ActualLRPNetInfo{} + lrp.ActualLrpNetInfo = &models.ActualLRPNetInfo{} }) It("validate returns an error", func() { @@ -950,7 +970,8 @@ func itValidatesPresenceOfNetInfo(lrp *models.ActualLRP) { func itValidatesAbsenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is set", func() { BeforeEach(func() { - lrp.ActualLRPNetInfo = models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown) + actualLrpNetInfo := models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown) + lrp.ActualLrpNetInfo = &actualLrpNetInfo }) It("validate returns an error", func() { @@ -962,7 +983,7 @@ func itValidatesAbsenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is not set", func() { BeforeEach(func() { - lrp.ActualLRPNetInfo = models.ActualLRPNetInfo{} + lrp.ActualLrpNetInfo = &models.ActualLRPNetInfo{} }) It("validate does not return an error", func() { diff --git a/models/desired_lrp_requests_test.go b/models/desired_lrp_requests_test.go index 50c708c8..d2692c28 100644 --- a/models/desired_lrp_requests_test.go +++ b/models/desired_lrp_requests_test.go @@ -103,7 +103,8 @@ var _ = Describe("DesiredLRP Requests", func() { Context("when the Update is invalid", func() { BeforeEach(func() { request.Update = &models.DesiredLRPUpdate{} - request.Update.SetInstances(-1) + instances := int32(-1) + request.Update.SetInstances(&instances) }) It("returns a validation error", func() { diff --git a/models/desired_lrp_test.go b/models/desired_lrp_test.go index 2e37be56..59146828 100644 --- a/models/desired_lrp_test.go +++ b/models/desired_lrp_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/bbs/format" "code.cloudfoundry.org/bbs/models" "code.cloudfoundry.org/bbs/models/test/model_helpers" - "github.com/gogo/protobuf/proto" + "google.golang.org/protobuf/proto" . "code.cloudfoundry.org/bbs/test_helpers" . "github.com/onsi/ginkgo/v2" @@ -343,15 +343,15 @@ var _ = Describe("DesiredLRP", func() { Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(jsonDesiredLRP)) - protoSerialization, err := proto.Marshal(&desiredLRP) + protoSerialization, err := proto.Marshal(desiredLRP.ToProto()) Expect(err).NotTo(HaveOccurred()) - var protoDeserialization models.DesiredLRP + var protoDeserialization models.ProtoDesiredLRP err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) desiredRoutes := *desiredLRP.Routes - deserializedRoutes := *protoDeserialization.Routes + deserializedRoutes := *protoDeserialization.Routes.FromProto() Expect(deserializedRoutes).To(HaveLen(len(desiredRoutes))) for k := range desiredRoutes { @@ -360,7 +360,7 @@ var _ = Describe("DesiredLRP", func() { desiredLRP.Routes = nil protoDeserialization.Routes = nil - Expect(protoDeserialization).To(Equal(desiredLRP)) + Expect(protoDeserialization.FromProto()).To(Equal(desiredLRP)) }) }) @@ -368,7 +368,7 @@ var _ = Describe("DesiredLRP", func() { It("updates instances", func() { instances := int32(100) update := &models.DesiredLRPUpdate{} - update.SetInstances(instances) + update.SetInstances(&instances) schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo @@ -387,7 +387,7 @@ var _ = Describe("DesiredLRP", func() { schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = models.Routes{} + expectedSchedulingInfo.Routes = &models.Routes{} expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -397,7 +397,7 @@ var _ = Describe("DesiredLRP", func() { It("allows annotation to be set", func() { annotation := "new-annotation" update := &models.DesiredLRPUpdate{} - update.SetAnnotation(annotation) + update.SetAnnotation(&annotation) schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() @@ -412,7 +412,7 @@ var _ = Describe("DesiredLRP", func() { It("allows empty annotation to be set", func() { emptyAnnotation := "" update := &models.DesiredLRPUpdate{} - update.SetAnnotation(emptyAnnotation) + update.SetAnnotation(&emptyAnnotation) schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() @@ -435,7 +435,7 @@ var _ = Describe("DesiredLRP", func() { schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = models.Routes{ + expectedSchedulingInfo.Routes = &models.Routes{ "router": &rawMessage, } expectedSchedulingInfo.ModificationTag.Increment() @@ -460,7 +460,8 @@ var _ = Describe("DesiredLRP", func() { Context("when update does not contain routes", func() { BeforeEach(func() { - update.SetInstances(2) + instances := int32(2) + update.SetInstances(&instances) }) It("returns false", func() { @@ -683,17 +684,17 @@ var _ = Describe("DesiredLRP", func() { Name: "dep0", Url: "u0", DestinationPath: "/tmp/0", - LayerType: models.LayerTypeExclusive, - MediaType: models.MediaTypeTgz, - DigestAlgorithm: models.DigestAlgorithmSha256, + LayerType: models.ImageLayer_LayerTypeExclusive, + MediaType: models.ImageLayer_MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-sha", }, { Name: "dep1", Url: "u1", DestinationPath: "/tmp/1", - LayerType: models.LayerTypeShared, - MediaType: models.MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeShared, + MediaType: models.ImageLayer_MediaTypeTgz, }, } desiredLRP.CachedDependencies = []*models.CachedDependency{ @@ -778,17 +779,17 @@ var _ = Describe("DesiredLRP", func() { Name: "dep0", Url: "u0", DestinationPath: "/tmp/0", - LayerType: models.LayerTypeShared, - MediaType: models.MediaTypeTgz, - DigestAlgorithm: models.DigestAlgorithmSha256, + LayerType: models.ImageLayer_LayerTypeShared, + MediaType: models.ImageLayer_MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-sha", }, { Name: "dep1", Url: "u1", DestinationPath: "/tmp/1", - LayerType: models.LayerTypeShared, - MediaType: models.MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeShared, + MediaType: models.ImageLayer_MediaTypeTgz, }, } desiredLRP.CachedDependencies = []*models.CachedDependency{ @@ -848,18 +849,18 @@ var _ = Describe("DesiredLRP", func() { Name: "dep0", Url: "u0", DestinationPath: "/tmp/0", - LayerType: models.LayerTypeExclusive, - MediaType: models.MediaTypeTgz, - DigestAlgorithm: models.DigestAlgorithmSha256, + LayerType: models.ImageLayer_LayerTypeExclusive, + MediaType: models.ImageLayer_MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-sha", }, { Name: "dep1", Url: "u1", DestinationPath: "/tmp/1", - LayerType: models.LayerTypeExclusive, - MediaType: models.MediaTypeTgz, - DigestAlgorithm: models.DigestAlgorithmSha256, + LayerType: models.ImageLayer_LayerTypeExclusive, + MediaType: models.ImageLayer_MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-other-sha", }, } @@ -1210,7 +1211,7 @@ var _ = Describe("DesiredLRP", func() { { Url: "here", DestinationPath: "there", - DigestAlgorithm: models.DigestAlgorithmSha256, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, }, } assertDesiredLRPValidationFailsWithMessage(desiredLRP, "value") @@ -1223,9 +1224,9 @@ var _ = Describe("DesiredLRP", func() { { Url: "here", DestinationPath: "there", - DigestAlgorithm: models.DigestAlgorithmSha256, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "sum value", - LayerType: models.LayerTypeExclusive, + LayerType: models.ImageLayer_LayerTypeExclusive, }, } assertDesiredLRPValidationFailsWithMessage(desiredLRP, "legacy_download_user") @@ -1236,7 +1237,7 @@ var _ = Describe("DesiredLRP", func() { Context("metric tags", func() { It("is invalid when both static and dynamic values are provided", func() { desiredLRP.MetricTags = map[string]*models.MetricTagValue{ - "some_metric": {Static: "some-value", Dynamic: models.MetricTagDynamicValueIndex}, + "some_metric": {Static: "some-value", Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}, } assertDesiredLRPValidationFailsWithMessage(desiredLRP, "metric_tags") assertDesiredLRPValidationFailsWithMessage(desiredLRP, "static") @@ -1301,11 +1302,13 @@ var _ = Describe("DesiredLRPUpdate", func() { var desiredLRPUpdate models.DesiredLRPUpdate BeforeEach(func() { - desiredLRPUpdate.SetInstances(2) + instances := int32(2) + desiredLRPUpdate.SetInstances(&instances) desiredLRPUpdate.Routes = &models.Routes{ "foo": &json.RawMessage{'"', 'b', 'a', 'r', '"'}, } - desiredLRPUpdate.SetAnnotation("some-text") + annotation := "some-text" + desiredLRPUpdate.SetAnnotation(&annotation) desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{ "some-tag": {Static: "some-value"}, } @@ -1319,28 +1322,31 @@ var _ = Describe("DesiredLRPUpdate", func() { } It("requires a positive nonzero number of instances", func() { - desiredLRPUpdate.SetInstances(-1) + invalidInstances := int32(-1) + desiredLRPUpdate.SetInstances(&invalidInstances) assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "instances") - desiredLRPUpdate.SetInstances(0) + zeroInstances := int32(0) + desiredLRPUpdate.SetInstances(&zeroInstances) validationErr := desiredLRPUpdate.Validate() Expect(validationErr).NotTo(HaveOccurred()) - desiredLRPUpdate.SetInstances(1) + oneInstance := int32(1) + desiredLRPUpdate.SetInstances(&oneInstance) validationErr = desiredLRPUpdate.Validate() Expect(validationErr).NotTo(HaveOccurred()) }) It("limits the annotation length", func() { largeString := randStringBytes(50000) - desiredLRPUpdate.SetAnnotation(largeString) + desiredLRPUpdate.SetAnnotation(&largeString) assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "annotation") }) Context("metric tags", func() { It("is invalid when both static and dynamic values are provided for the same key", func() { desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{ - "some_metric": {Static: "some-value", Dynamic: models.MetricTagDynamicValueIndex}, + "some_metric": {Static: "some-value", Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}, } assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "metric_tags") assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "static") @@ -1402,8 +1408,8 @@ var _ = Describe("DesiredLRPUpdate", func() { }) Context("when the metric tags differ in a single dynamic value", func() { It("returns true", func() { - existingTags := map[string]*models.MetricTagValue{"some-tag": {Dynamic: models.MetricTagDynamicValueIndex}} - update := &models.DesiredLRPUpdate{MetricTags: map[string]*models.MetricTagValue{"some-tag": {Dynamic: models.MetricTagDynamicValueInstanceGuid}}} + existingTags := map[string]*models.MetricTagValue{"some-tag": {Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}} + update := &models.DesiredLRPUpdate{MetricTags: map[string]*models.MetricTagValue{"some-tag": {Dynamic: models.MetricTagValue_MetricTagDynamicValueInstanceGuid}}} Expect(update.IsMetricTagsUpdated(existingTags)).To(BeTrue()) }) }) @@ -1572,12 +1578,12 @@ var _ = Describe("DesiredLRPRoutingInfo", func() { Entry("invalid instances", models.NewDesiredLRPRoutingInfo(newValidLRPKey(), -2, &routes, &tag, map[string]*models.MetricTagValue{}), "instances"), Entry("invalid key", models.NewDesiredLRPRoutingInfo(models.DesiredLRPKey{}, instances, &routes, &tag, map[string]*models.MetricTagValue{}), "process_guid"), Entry("invalid routes", models.NewDesiredLRPRoutingInfo(newValidLRPKey(), instances, &largeRoutes, &tag, map[string]*models.MetricTagValue{}), "routes"), - Entry("invalid metricTags", models.NewDesiredLRPRoutingInfo(newValidLRPKey(), instances, &routes, &tag, map[string]*models.MetricTagValue{"foo": {Dynamic: models.DynamicValueInvalid}}), "metric_tags"), + Entry("invalid metricTags", models.NewDesiredLRPRoutingInfo(newValidLRPKey(), instances, &routes, &tag, map[string]*models.MetricTagValue{"foo": {Dynamic: models.MetricTagValue_DynamicValueInvalid}}), "metric_tags"), ) }) var _ = Describe("DesiredLRPRunInfo", func() { - var envVars = []models.EnvironmentVariable{{"FOO", "bar"}} + var envVars = []*models.EnvironmentVariable{{"FOO", "bar"}} var action = model_helpers.NewValidAction() const startTimeoutMs int64 = 12 const privileged = true @@ -1603,14 +1609,14 @@ var _ = Describe("DesiredLRPRunInfo", func() { }, Entry("valid run info", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{{Action: action}}, logRateLimit), ""), Entry("invalid key", models.NewDesiredLRPRunInfo(models.DesiredLRPKey{}, createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "process_guid"), - Entry("invalid env vars", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, append(envVars, models.EnvironmentVariable{}), nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "name"), + Entry("invalid env vars", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, append(envVars, &models.EnvironmentVariable{}), nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "name"), Entry("invalid setup action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, &models.Action{}, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "inner-action"), Entry("invalid run action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, &models.Action{}, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "inner-action"), Entry("invalid monitor action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, &models.Action{}, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "inner-action"), Entry("invalid http check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{Port: 65536}}}, "healthcheck_log_source", []*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{Port: 77777}}}}, nil, []*models.Sidecar{}, logRateLimit), "port"), Entry("invalid tcp check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{TcpCheck: &models.TCPCheck{}}}, "healthcheck_log_source", []*models.Check{&models.Check{TcpCheck: &models.TCPCheck{}}}}, nil, []*models.Sidecar{}, logRateLimit), "port"), Entry("invalid check in check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{}, TcpCheck: &models.TCPCheck{}}}, "healthcheck_log_source", []*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{}, TcpCheck: &models.TCPCheck{}}}}, nil, []*models.Sidecar{}, logRateLimit), "check"), - Entry("invalid legacy download user", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, []*models.ImageLayer{{Url: "url", DestinationPath: "path", MediaType: models.MediaTypeTgz, LayerType: models.LayerTypeExclusive}}, []*models.Sidecar{}, logRateLimit), "legacy_download_user"), + Entry("invalid legacy download user", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, []*models.ImageLayer{{Url: "url", DestinationPath: "path", MediaType: models.ImageLayer_MediaTypeTgz, LayerType: models.ImageLayer_LayerTypeExclusive}}, []*models.Sidecar{}, logRateLimit), "legacy_download_user"), Entry("invalid cached dependency", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, []*models.CachedDependency{{To: "here"}}, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "cached_dependency"), Entry("invalid volume mount", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{{Mode: "lol"}}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "volume_mount"), Entry("invalid image username", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "password", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "image_username"), diff --git a/models/events_test.go b/models/events_test.go index 4acf7441..ed22b1ca 100644 --- a/models/events_test.go +++ b/models/events_test.go @@ -14,12 +14,12 @@ var _ = Describe("Events", func() { Context("when before is set", func() { BeforeEach(func() { before = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: &models.ActualLRPKey{ ProcessGuid: "before-process-guid", Index: 5, Domain: "before-domain", }, - ActualLRPInstanceKey: models.ActualLRPInstanceKey{ + ActualLrpInstanceKey: &models.ActualLRPInstanceKey{ InstanceGuid: "before-instance-guid", CellId: "before-cell-id", }, @@ -29,12 +29,12 @@ var _ = Describe("Events", func() { Context("when after is set", func() { BeforeEach(func() { after = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: &models.ActualLRPKey{ ProcessGuid: "after-process-guid", Index: 7, Domain: "after-domain", }, - ActualLRPInstanceKey: models.ActualLRPInstanceKey{ + ActualLrpInstanceKey: &models.ActualLRPInstanceKey{ InstanceGuid: "after-instance-guid", CellId: "after-cell-id", }, @@ -43,15 +43,15 @@ var _ = Describe("Events", func() { It("returns the after's actual lrp key and instance key", func() { event := models.NewActualLRPInstanceChangedEvent(before, after, "some-trace-id") - Expect(event.ActualLRPKey).To(Equal(after.ActualLRPKey)) - Expect(event.ActualLRPInstanceKey).To(Equal(after.ActualLRPInstanceKey)) + Expect(event.ActualLrpKey).To(Equal(after.ActualLrpKey)) + Expect(event.ActualLrpInstanceKey).To(Equal(after.ActualLrpInstanceKey)) }) }) Context("when after is unclaimed", func() { BeforeEach(func() { after = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: &models.ActualLRPKey{ ProcessGuid: "after-process-guid", Index: 7, Domain: "after-domain", @@ -62,8 +62,8 @@ var _ = Describe("Events", func() { It("returns after's actual lrp key and before's instance key", func() { event := models.NewActualLRPInstanceChangedEvent(before, after, "some-trace-id") - Expect(event.ActualLRPKey).To(Equal(after.ActualLRPKey)) - Expect(event.ActualLRPInstanceKey).To(Equal(before.ActualLRPInstanceKey)) + Expect(event.ActualLrpKey).To(Equal(after.ActualLrpKey)) + Expect(event.ActualLrpInstanceKey).To(Equal(before.ActualLrpInstanceKey)) }) }) @@ -74,8 +74,8 @@ var _ = Describe("Events", func() { It("returns the before's actual lrp key and instance key", func() { event := models.NewActualLRPInstanceChangedEvent(before, after, "some-trace-id") - Expect(event.ActualLRPKey).To(Equal(before.ActualLRPKey)) - Expect(event.ActualLRPInstanceKey).To(Equal(before.ActualLRPInstanceKey)) + Expect(event.ActualLrpKey).To(Equal(before.ActualLrpKey)) + Expect(event.ActualLrpInstanceKey).To(Equal(before.ActualLrpInstanceKey)) }) }) }) @@ -88,12 +88,12 @@ var _ = Describe("Events", func() { Context("when after is set", func() { BeforeEach(func() { after = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: &models.ActualLRPKey{ ProcessGuid: "after-process-guid", Index: 7, Domain: "after-domain", }, - ActualLRPInstanceKey: models.ActualLRPInstanceKey{ + ActualLrpInstanceKey: &models.ActualLRPInstanceKey{ InstanceGuid: "after-instance-guid", CellId: "after-cell-id", }, @@ -102,14 +102,14 @@ var _ = Describe("Events", func() { It("returns the after's actual lrp key and instance key", func() { event := models.NewActualLRPInstanceChangedEvent(before, after, "some-trace-id") - Expect(event.ActualLRPKey).To(Equal(after.ActualLRPKey)) - Expect(event.ActualLRPInstanceKey).To(Equal(after.ActualLRPInstanceKey)) + Expect(event.ActualLrpKey).To(Equal(after.ActualLrpKey)) + Expect(event.ActualLrpInstanceKey).To(Equal(after.ActualLrpInstanceKey)) }) Context("when before is unclaimed", func() { BeforeEach(func() { before = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: &models.ActualLRPKey{ ProcessGuid: "before-process-guid", Index: 5, Domain: "before-domain", @@ -120,8 +120,8 @@ var _ = Describe("Events", func() { It("returns after's actual lrp key and after's instance key", func() { event := models.NewActualLRPInstanceChangedEvent(before, after, "some-trace-id") - Expect(event.ActualLRPKey).To(Equal(after.ActualLRPKey)) - Expect(event.ActualLRPInstanceKey).To(Equal(after.ActualLRPInstanceKey)) + Expect(event.ActualLrpKey).To(Equal(after.ActualLrpKey)) + Expect(event.ActualLrpInstanceKey).To(Equal(after.ActualLrpInstanceKey)) }) }) }) @@ -133,8 +133,8 @@ var _ = Describe("Events", func() { It("returns the empty actual lrp key and instance key", func() { event := models.NewActualLRPInstanceChangedEvent(before, after, "some-trace-id") - Expect(event.ActualLRPKey).To(Equal(models.ActualLRPKey{})) - Expect(event.ActualLRPInstanceKey).To(Equal(models.ActualLRPInstanceKey{})) + Expect(event.ActualLrpKey).To(Equal(models.ActualLRPKey{})) + Expect(event.ActualLrpInstanceKey).To(Equal(models.ActualLRPInstanceKey{})) }) }) }) diff --git a/models/image_layer_test.go b/models/image_layer_test.go index a3f9803c..9add33c6 100644 --- a/models/image_layer_test.go +++ b/models/image_layer_test.go @@ -17,8 +17,8 @@ var _ = Describe("ImageLayer", func() { layer = &models.ImageLayer{ Url: "web_location", DestinationPath: "local_location", - MediaType: models.MediaTypeTgz, - LayerType: models.LayerTypeShared, + MediaType: models.ImageLayer_MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeShared, } err := layer.Validate() @@ -31,9 +31,9 @@ var _ = Describe("ImageLayer", func() { Url: "web_location", DestinationPath: "local_location", DigestValue: "some digest", - DigestAlgorithm: models.DigestAlgorithmSha256, - MediaType: models.MediaTypeTgz, - LayerType: models.LayerTypeExclusive, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, + MediaType: models.ImageLayer_MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeExclusive, } err := layer.Validate() @@ -70,8 +70,8 @@ var _ = Describe("ImageLayer", func() { &models.ImageLayer{ Url: "web_location", DestinationPath: "local_location", - DigestAlgorithm: models.DigestAlgorithmSha256, - MediaType: models.MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, + MediaType: models.ImageLayer_MediaTypeTgz, }, }, { @@ -80,7 +80,7 @@ var _ = Describe("ImageLayer", func() { Url: "web_location", DestinationPath: "local_location", DigestValue: "some digest", - MediaType: models.MediaTypeTgz, + MediaType: models.ImageLayer_MediaTypeTgz, }, }, { @@ -88,8 +88,8 @@ var _ = Describe("ImageLayer", func() { &models.ImageLayer{ Url: "web_location", DestinationPath: "local_location", - MediaType: models.MediaTypeTgz, - LayerType: models.LayerTypeExclusive, + MediaType: models.ImageLayer_MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeExclusive, }, }, { @@ -97,8 +97,8 @@ var _ = Describe("ImageLayer", func() { &models.ImageLayer{ Url: "web_location", DestinationPath: "local_location", - MediaType: models.MediaTypeTgz, - LayerType: models.LayerTypeExclusive, + MediaType: models.ImageLayer_MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeExclusive, }, }, { @@ -108,7 +108,7 @@ var _ = Describe("ImageLayer", func() { DestinationPath: "local_location", DigestAlgorithm: models.ImageLayer_DigestAlgorithm(5), DigestValue: "some digest", - MediaType: models.MediaTypeTgz, + MediaType: models.ImageLayer_MediaTypeTgz, }, }, { @@ -116,7 +116,7 @@ var _ = Describe("ImageLayer", func() { &models.ImageLayer{ Url: "web_location", DestinationPath: "local_location", - DigestAlgorithm: models.DigestAlgorithmSha256, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some digest", }, }, @@ -125,7 +125,7 @@ var _ = Describe("ImageLayer", func() { &models.ImageLayer{ Url: "web_location", DestinationPath: "local_location", - DigestAlgorithm: models.DigestAlgorithmSha256, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some digest", MediaType: models.ImageLayer_MediaType(9), }, @@ -144,9 +144,9 @@ var _ = Describe("ImageLayer", func() { Expect(json.Unmarshal([]byte(expectedJSON), &testV)).To(Succeed()) Expect(testV).To(Equal(v)) }, - Entry("invalid", models.DigestAlgorithmInvalid, `"DigestAlgorithmInvalid"`), - Entry("sha256", models.DigestAlgorithmSha256, `"SHA256"`), - Entry("sha512", models.DigestAlgorithmSha512, `"SHA512"`), + Entry("invalid", models.ImageLayer_DigestAlgorithmInvalid, `"DigestAlgorithmInvalid"`), + Entry("sha256", models.ImageLayer_DigestAlgorithmSha256, `"SHA256"`), + Entry("sha512", models.ImageLayer_DigestAlgorithmSha512, `"SHA512"`), ) }) }) @@ -160,10 +160,10 @@ var _ = Describe("ImageLayer", func() { Expect(json.Unmarshal([]byte(expectedJSON), &testV)).To(Succeed()) Expect(testV).To(Equal(v)) }, - Entry("invalid", models.MediaTypeInvalid, `"MediaTypeInvalid"`), - Entry("tgz", models.MediaTypeTgz, `"TGZ"`), - Entry("tar", models.MediaTypeTar, `"TAR"`), - Entry("zip", models.MediaTypeZip, `"ZIP"`), + Entry("invalid", models.ImageLayer_MediaTypeInvalid, `"MediaTypeInvalid"`), + Entry("tgz", models.ImageLayer_MediaTypeTgz, `"TGZ"`), + Entry("tar", models.ImageLayer_MediaTypeTar, `"TAR"`), + Entry("zip", models.ImageLayer_MediaTypeZip, `"ZIP"`), ) }) }) @@ -177,9 +177,9 @@ var _ = Describe("ImageLayer", func() { Expect(json.Unmarshal([]byte(expectedJSON), &testV)).To(Succeed()) Expect(testV).To(Equal(v)) }, - Entry("invalid", models.LayerTypeInvalid, `"LayerTypeInvalid"`), - Entry("shared", models.LayerTypeShared, `"SHARED"`), - Entry("exclusive", models.LayerTypeExclusive, `"EXCLUSIVE"`), + Entry("invalid", models.ImageLayer_LayerTypeInvalid, `"LayerTypeInvalid"`), + Entry("shared", models.ImageLayer_LayerTypeShared, `"SHARED"`), + Entry("exclusive", models.ImageLayer_LayerTypeExclusive, `"EXCLUSIVE"`), ) }) }) diff --git a/models/metric_tags_test.go b/models/metric_tags_test.go index a4227497..559294c6 100644 --- a/models/metric_tags_test.go +++ b/models/metric_tags_test.go @@ -19,7 +19,7 @@ var _ = Describe("MetricTagValue", func() { It("is valid when there is only a dynamic value specified", func() { value := &models.MetricTagValue{ - Dynamic: models.MetricTagDynamicValueIndex, + Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex, } Expect(value.Validate()).To(Succeed()) }) @@ -34,7 +34,7 @@ var _ = Describe("MetricTagValue", func() { It("is not valid when both static and dynamic values are specified", func() { value := &models.MetricTagValue{ Static: "some-value", - Dynamic: models.MetricTagDynamicValueIndex, + Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex, } err := value.Validate() Expect(err).To(MatchError(ContainSubstring("static"))) @@ -58,9 +58,9 @@ var _ = Describe("MetricTagValue", func() { Expect(json.Unmarshal([]byte(expectedJSON), &testV)).To(Succeed()) Expect(testV).To(Equal(v)) }, - Entry("invalid", models.DynamicValueInvalid, `"DynamicValueInvalid"`), - Entry("index", models.MetricTagDynamicValueIndex, `"INDEX"`), - Entry("instance_guid", models.MetricTagDynamicValueInstanceGuid, `"INSTANCE_GUID"`), + Entry("invalid", models.MetricTagValue_DynamicValueInvalid, `"DynamicValueInvalid"`), + Entry("index", models.MetricTagValue_MetricTagDynamicValueIndex, `"INDEX"`), + Entry("instance_guid", models.MetricTagValue_MetricTagDynamicValueInstanceGuid, `"INSTANCE_GUID"`), ) }) }) @@ -69,11 +69,11 @@ var _ = Describe("MetricTagValue", func() { It("converts a valid maps", func() { tags, err := models.ConvertMetricTags(map[string]*models.MetricTagValue{ "foo": &models.MetricTagValue{Static: "bar"}, - "biz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueIndex}, - "baz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueInstanceGuid}, + "biz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}, + "baz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueInstanceGuid}, }, map[models.MetricTagValue_DynamicValue]interface{}{ - models.MetricTagDynamicValueIndex: int32(4), - models.MetricTagDynamicValueInstanceGuid: "my-guid", + models.MetricTagValue_MetricTagDynamicValueIndex: int32(4), + models.MetricTagValue_MetricTagDynamicValueInstanceGuid: "my-guid", }) Expect(err).To(Succeed()) Expect(tags).To(Equal(map[string]string{ @@ -86,11 +86,11 @@ var _ = Describe("MetricTagValue", func() { It("errors with invalid Index value", func() { _, err := models.ConvertMetricTags(map[string]*models.MetricTagValue{ "foo": &models.MetricTagValue{Static: "bar"}, - "biz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueIndex}, - "baz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueInstanceGuid}, + "biz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}, + "baz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueInstanceGuid}, }, map[models.MetricTagValue_DynamicValue]interface{}{ - models.MetricTagDynamicValueIndex: "$44", - models.MetricTagDynamicValueInstanceGuid: "my-guid", + models.MetricTagValue_MetricTagDynamicValueIndex: "$44", + models.MetricTagValue_MetricTagDynamicValueInstanceGuid: "my-guid", }) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("could not convert value $44 of type string to int32")) @@ -99,11 +99,11 @@ var _ = Describe("MetricTagValue", func() { It("errors with invalid InstanceGuid value", func() { _, err := models.ConvertMetricTags(map[string]*models.MetricTagValue{ "foo": &models.MetricTagValue{Static: "bar"}, - "biz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueIndex}, - "baz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueInstanceGuid}, + "biz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}, + "baz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueInstanceGuid}, }, map[models.MetricTagValue_DynamicValue]interface{}{ - models.MetricTagDynamicValueIndex: int32(33), - models.MetricTagDynamicValueInstanceGuid: 55, + models.MetricTagValue_MetricTagDynamicValueIndex: int32(33), + models.MetricTagValue_MetricTagDynamicValueInstanceGuid: 55, }) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("could not convert value 55 of type int to string")) @@ -112,8 +112,8 @@ var _ = Describe("MetricTagValue", func() { It("errors with nil dynamic value map", func() { _, err := models.ConvertMetricTags(map[string]*models.MetricTagValue{ "foo": &models.MetricTagValue{Static: "bar"}, - "biz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueIndex}, - "baz": &models.MetricTagValue{Dynamic: models.MetricTagDynamicValueInstanceGuid}, + "biz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}, + "baz": &models.MetricTagValue{Dynamic: models.MetricTagValue_MetricTagDynamicValueInstanceGuid}, }, map[models.MetricTagValue_DynamicValue]interface{}{}) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("could not convert value of type ")) diff --git a/models/routes_test.go b/models/routes_test.go index 42a1860d..8710520c 100644 --- a/models/routes_test.go +++ b/models/routes_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "code.cloudfoundry.org/bbs/models" - "github.com/gogo/protobuf/proto" + "google.golang.org/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -26,9 +26,11 @@ var _ = Describe("Routes", func() { err = json.Unmarshal(b, &aJson) Expect(err).NotTo(HaveOccurred()) - b, err = proto.Marshal(&update) + protoUpdate := update.ToProto() + b, err = proto.Marshal(protoUpdate) Expect(err).NotTo(HaveOccurred()) - err = proto.Unmarshal(b, &aProto) + protoA := aProto.ToProto() + err = proto.Unmarshal(b, protoA) Expect(err).NotTo(HaveOccurred()) }) diff --git a/models/security_groups_test.go b/models/security_groups_test.go index 459493d6..5d7f00a7 100644 --- a/models/security_groups_test.go +++ b/models/security_groups_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "code.cloudfoundry.org/bbs/models" - "github.com/gogo/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/proto" ) var _ = Describe("SecurityGroupRule", func() { @@ -393,14 +393,14 @@ var _ = Describe("SecurityGroupRule", func() { Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(securityGroupJson)) - protoSerialization, err := proto.Marshal(&securityGroup) + protoSerialization, err := proto.Marshal(securityGroup.ToProto()) Expect(err).NotTo(HaveOccurred()) - var protoDeserialization models.SecurityGroupRule + var protoDeserialization models.ProtoSecurityGroupRule err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) - Expect(protoDeserialization).To(Equal(securityGroup)) + Expect(protoDeserialization.FromProto()).To(Equal(securityGroup)) }) Context("when annotations are empty", func() { diff --git a/models/task_test.go b/models/task_test.go index 2f9f7f9a..6e8e3799 100644 --- a/models/task_test.go +++ b/models/task_test.go @@ -8,9 +8,9 @@ import ( "code.cloudfoundry.org/bbs/format" "code.cloudfoundry.org/bbs/models" . "code.cloudfoundry.org/bbs/test_helpers" - "github.com/gogo/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/proto" ) var _ = Describe("Task", func() { @@ -123,14 +123,14 @@ var _ = Describe("Task", func() { Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(taskPayload)) - protoSerialization, err := proto.Marshal(&task) + protoSerialization, err := proto.Marshal(task.ToProto()) Expect(err).NotTo(HaveOccurred()) - var protoDeserialization models.Task + var protoDeserialization models.ProtoTask err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) - Expect(protoDeserialization).To(Equal(task)) + Expect(protoDeserialization.FromProto()).To(Equal(task)) }) }) @@ -435,7 +435,7 @@ var _ = Describe("Task", func() { ImageUsername: "jake", ImagePassword: "pass", ImageLayers: []*models.ImageLayer{ - {Url: "some-url", DestinationPath: "", MediaType: models.MediaTypeTgz}, // invalid destination path + {Url: "some-url", DestinationPath: "", MediaType: models.ImageLayer_MediaTypeTgz}, // invalid destination path }, }, }, @@ -454,7 +454,7 @@ var _ = Describe("Task", func() { ImageUsername: "jake", ImagePassword: "pass", ImageLayers: []*models.ImageLayer{ - {Url: "some-url", DestinationPath: "/tmp", MediaType: models.MediaTypeTgz, LayerType: models.LayerTypeExclusive}, // exclusive layers require legacy_download_user to be set + {Url: "some-url", DestinationPath: "/tmp", MediaType: models.ImageLayer_MediaTypeTgz, LayerType: models.ImageLayer_LayerTypeExclusive}, // exclusive layers require legacy_download_user to be set }, }, }, @@ -476,42 +476,42 @@ var _ = Describe("Task", func() { Context("V3->V2", func() { Context("when there are no image layers", func() { BeforeEach(func() { - task.ImageLayers = nil + task.TaskDefinition.ImageLayers = nil }) It("does not add any cached dependencies to the TaskDefinition", func() { convertedTask := task.VersionDownTo(format.V2) - Expect(convertedTask.CachedDependencies).To(BeEmpty()) + Expect(convertedTask.TaskDefinition.CachedDependencies).To(BeEmpty()) }) It("does not add any Download Actions", func() { convertedTask := task.VersionDownTo(format.V2) - Expect(convertedTask.Action).To(Equal(task.Action)) + Expect(convertedTask.TaskDefinition.Action).To(Equal(task.TaskDefinition.Action)) }) }) Context("when there are shared image layers", func() { BeforeEach(func() { - task.ImageLayers = []*models.ImageLayer{ + task.TaskDefinition.ImageLayers = []*models.ImageLayer{ { Name: "dep0", Url: "u0", DestinationPath: "/tmp/0", - LayerType: models.LayerTypeShared, - MediaType: models.MediaTypeTgz, - DigestAlgorithm: models.DigestAlgorithmSha256, + LayerType: models.ImageLayer_LayerTypeShared, + MediaType: models.ImageLayer_MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-sha", }, { Name: "dep1", Url: "u1", DestinationPath: "/tmp/1", - LayerType: models.LayerTypeShared, - MediaType: models.MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeShared, + MediaType: models.ImageLayer_MediaTypeTgz, }, } - task.CachedDependencies = []*models.CachedDependency{ + task.TaskDefinition.CachedDependencies = []*models.CachedDependency{ { Name: "dep2", From: "u2", @@ -524,7 +524,7 @@ var _ = Describe("Task", func() { It("converts them to cached dependencies and prepends them to the list", func() { convertedTask := task.VersionDownTo(format.V2) - Expect(convertedTask.CachedDependencies).To(DeepEqual([]*models.CachedDependency{ + Expect(convertedTask.TaskDefinition.CachedDependencies).To(DeepEqual([]*models.CachedDependency{ { Name: "dep0", From: "u0", @@ -553,7 +553,7 @@ var _ = Describe("Task", func() { It("sets removes the existing image layers", func() { convertedTask := task.VersionDownTo(format.V2) - Expect(convertedTask.ImageLayers).To(BeNil()) + Expect(convertedTask.TaskDefinition.ImageLayers).To(BeNil()) }) }) @@ -563,28 +563,28 @@ var _ = Describe("Task", func() { ) BeforeEach(func() { - task.ImageLayers = []*models.ImageLayer{ + task.TaskDefinition.ImageLayers = []*models.ImageLayer{ { Name: "dep0", Url: "u0", DestinationPath: "/tmp/0", - LayerType: models.LayerTypeExclusive, - MediaType: models.MediaTypeTgz, - DigestAlgorithm: models.DigestAlgorithmSha256, + LayerType: models.ImageLayer_LayerTypeExclusive, + MediaType: models.ImageLayer_MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-sha", }, { Name: "dep1", Url: "u1", DestinationPath: "/tmp/1", - LayerType: models.LayerTypeExclusive, - MediaType: models.MediaTypeTgz, - DigestAlgorithm: models.DigestAlgorithmSha256, + LayerType: models.ImageLayer_LayerTypeExclusive, + MediaType: models.ImageLayer_MediaTypeTgz, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-other-sha", }, } - task.LegacyDownloadUser = "the user" - task.Action = models.WrapAction(models.Timeout( + task.TaskDefinition.LegacyDownloadUser = "the user" + task.TaskDefinition.Action = models.WrapAction(models.Timeout( &models.RunAction{ Path: "/the/path", User: "the user", @@ -617,26 +617,26 @@ var _ = Describe("Task", func() { It("converts them to download actions with the correct user and prepends them to the action", func() { convertedTask := task.VersionDownTo(format.V2) - Expect(convertedTask.Action.GetValue()).To(DeepEqual( + Expect(convertedTask.TaskDefinition.Action.GetValue()).To(DeepEqual( models.Serial( models.Parallel(&downloadAction1, &downloadAction2), - task.Action.GetValue().(models.ActionInterface), + task.TaskDefinition.Action.GetValue().(models.ActionInterface), ))) }) It("sets removes the existing image layers", func() { convertedTask := task.VersionDownTo(format.V2) - Expect(convertedTask.ImageLayers).To(BeNil()) + Expect(convertedTask.TaskDefinition.ImageLayers).To(BeNil()) }) Context("when there is no existing action", func() { BeforeEach(func() { - task.Action = nil + task.TaskDefinition.Action = nil }) It("creates an action with exclusive layers converted to download actions", func() { convertedLRP := task.VersionDownTo(format.V2) - Expect(convertedLRP.Action.GetValue()).To(DeepEqual( + Expect(convertedLRP.TaskDefinition.Action.GetValue()).To(DeepEqual( models.Parallel(&downloadAction1, &downloadAction2), )) }) diff --git a/models/test/model_helpers/constructors.go b/models/test/model_helpers/constructors.go index 037d6f45..c4a4f181 100644 --- a/models/test/model_helpers/constructors.go +++ b/models/test/model_helpers/constructors.go @@ -9,10 +9,13 @@ import ( ) func NewValidActualLRP(guid string, index int32) *models.ActualLRP { + actualLrpKey := models.NewActualLRPKey(guid, index, "some-domain") + actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-guid", "some-cell") + actualLrpNetInfo := models.NewActualLRPNetInfo("some-address", "container-address", models.ActualLRPNetInfo_PreferredAddressUnknown, models.NewPortMapping(2222, 4444)) actualLRP := &models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey(guid, index, "some-domain"), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey("some-guid", "some-cell"), - ActualLRPNetInfo: models.NewActualLRPNetInfo("some-address", "container-address", models.ActualLRPNetInfo_PreferredAddressUnknown, models.NewPortMapping(2222, 4444)), + ActualLrpKey: &actualLrpKey, + ActualLrpInstanceKey: &actualLrpInstanceKey, + ActualLrpNetInfo: &actualLrpNetInfo, ActualLrpInternalRoutes: NewActualLRPInternalRoutes(), MetricTags: NewActualLRPMetricTags(), AvailabilityZone: "some-zone", @@ -20,12 +23,13 @@ func NewValidActualLRP(guid string, index int32) *models.ActualLRP { CrashReason: "badness", State: models.ActualLRPStateRunning, Since: 1138, - ModificationTag: models.ModificationTag{ + ModificationTag: &models.ModificationTag{ Epoch: "some-epoch", Index: 999, }, } - actualLRP.SetRoutable(false) + routable := false + actualLRP.SetRoutable(&routable) err := actualLRP.Validate() Expect(err).NotTo(HaveOccurred()) @@ -47,7 +51,8 @@ func NewActualLRPMetricTags() map[string]string { func NewValidEvacuatingActualLRP(guid string, index int32) *models.ActualLRP { actualLRP := NewValidActualLRP(guid, index) actualLRP.Presence = models.ActualLRP_Evacuating - actualLRP.ActualLRPInstanceKey = models.NewActualLRPInstanceKey("some-guid", "some-evacuating-cell") + actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-guid", "some-evacuating-cell") + actualLRP.ActualLrpInstanceKey = &actualLrpInstanceKey return actualLRP } @@ -127,8 +132,8 @@ func NewValidDesiredLRP(guid string) *models.DesiredLRP { ImageUsername: "image-username", ImagePassword: "image-password", ImageLayers: []*models.ImageLayer{ - {Name: "shared layer", LayerType: models.LayerTypeShared, Url: "some-url", DestinationPath: "/tmp", MediaType: models.MediaTypeTgz}, - {Name: "exclusive layer", LayerType: models.LayerTypeExclusive, Url: "some-url-2", DestinationPath: "/tmp/foo", MediaType: models.MediaTypeZip, DigestAlgorithm: models.DigestAlgorithmSha256, DigestValue: "some-sha256"}, + {Name: "shared layer", LayerType: models.ImageLayer_LayerTypeShared, Url: "some-url", DestinationPath: "/tmp", MediaType: models.ImageLayer_MediaTypeTgz}, + {Name: "exclusive layer", LayerType: models.ImageLayer_LayerTypeExclusive, Url: "some-url-2", DestinationPath: "/tmp/foo", MediaType: models.ImageLayer_MediaTypeZip, DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-sha256"}, }, MetricTags: map[string]*models.MetricTagValue{ "source_id": {Static: "some-metrics-guid"}, @@ -211,8 +216,8 @@ func NewValidTaskDefinition() *models.TaskDefinition { ImageUsername: "image-username", ImagePassword: "image-password", ImageLayers: []*models.ImageLayer{ - {Name: "shared layer", LayerType: models.LayerTypeShared, Url: "some-url", DestinationPath: "/tmp", MediaType: models.MediaTypeTgz}, - {Name: "exclusive layer", LayerType: models.LayerTypeExclusive, Url: "some-url-2", DestinationPath: "/tmp/foo", MediaType: models.MediaTypeZip, DigestAlgorithm: models.DigestAlgorithmSha256, DigestValue: "some-sha256"}, + {Name: "shared layer", LayerType: models.ImageLayer_LayerTypeShared, Url: "some-url", DestinationPath: "/tmp", MediaType: models.ImageLayer_MediaTypeTgz}, + {Name: "exclusive layer", LayerType: models.ImageLayer_LayerTypeExclusive, Url: "some-url-2", DestinationPath: "/tmp/foo", MediaType: models.ImageLayer_MediaTypeZip, DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, DigestValue: "some-sha256"}, }, MetricTags: map[string]*models.MetricTagValue{ "source_id": {Static: "some-metrics-guid"}, @@ -220,8 +225,8 @@ func NewValidTaskDefinition() *models.TaskDefinition { } } -func NewValidEgressRules() []models.SecurityGroupRule { - return []models.SecurityGroupRule{ +func NewValidEgressRules() []*models.SecurityGroupRule { + return []*models.SecurityGroupRule{ { Protocol: "tcp", Destinations: []string{"0.0.0.0/0"}, diff --git a/test_helpers/actual_lrp_group_matcher.go b/test_helpers/actual_lrp_group_matcher.go index b4ebc65d..bba949fe 100644 --- a/test_helpers/actual_lrp_group_matcher.go +++ b/test_helpers/actual_lrp_group_matcher.go @@ -14,12 +14,12 @@ func MatchActualLRPGroup(expected *models.ActualLRPGroup) types.GomegaMatcher { if newLRP.Instance != nil { newLRP.Instance.Since = 0 - newLRP.Instance.ModificationTag = models.ModificationTag{} + newLRP.Instance.ModificationTag = &models.ModificationTag{} } if newLRP.Evacuating != nil { newLRP.Evacuating.Since = 0 - newLRP.Evacuating.ModificationTag = models.ModificationTag{} + newLRP.Evacuating.ModificationTag = &models.ModificationTag{} } return &newLRP } diff --git a/test_helpers/actual_lrp_matcher.go b/test_helpers/actual_lrp_matcher.go index 528c9148..bf070973 100644 --- a/test_helpers/actual_lrp_matcher.go +++ b/test_helpers/actual_lrp_matcher.go @@ -11,7 +11,7 @@ func MatchActualLRP(expected *models.ActualLRP) types.GomegaMatcher { newLRP := *lrp newLRP.Since = 0 - newLRP.ModificationTag = models.ModificationTag{} + newLRP.ModificationTag = &models.ModificationTag{} return &newLRP } From 9e38bf20a8ed0215d6c0243c88353febc83c9cd7 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 10 May 2024 15:18:09 +0000 Subject: [PATCH 064/155] Use copy instead of loop (staticcheck compliance) --- models/desired_lrp.go | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 3ef4464f..6d94f3c1 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -34,14 +34,10 @@ func PreloadedRootFS(stack string) string { func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo, metricTags map[string]*MetricTagValue) DesiredLRP { environmentVariables := make([]*EnvironmentVariable, len(runInfo.EnvironmentVariables)) - for i := range runInfo.EnvironmentVariables { - environmentVariables[i] = runInfo.EnvironmentVariables[i] - } + copy(runInfo.EnvironmentVariables, environmentVariables) egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) - for i := range runInfo.EgressRules { - egressRules[i] = runInfo.EgressRules[i] - } + copy(runInfo.EgressRules, egressRules) desiredLrpKey := schedInfo.GetDesiredLrpKey() desiredLrpResource := schedInfo.GetDesiredLrpResource() @@ -88,14 +84,10 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo func (desiredLRP *DesiredLRP) AddRunInfo(runInfo DesiredLRPRunInfo) { environmentVariables := make([]*EnvironmentVariable, len(runInfo.EnvironmentVariables)) - for i := range runInfo.EnvironmentVariables { - environmentVariables[i] = runInfo.EnvironmentVariables[i] - } + copy(runInfo.EnvironmentVariables, environmentVariables) egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) - for i := range runInfo.EgressRules { - egressRules[i] = runInfo.EgressRules[i] - } + copy(runInfo.EgressRules, egressRules) desiredLRP.EnvironmentVariables = environmentVariables desiredLRP.CachedDependencies = runInfo.CachedDependencies @@ -265,14 +257,10 @@ func (d *DesiredLRP) DesiredLRPRoutingInfo() DesiredLRP { func (d *DesiredLRP) DesiredLRPRunInfo(createdAt time.Time) DesiredLRPRunInfo { environmentVariables := make([]*EnvironmentVariable, len(d.EnvironmentVariables)) - for i := range d.EnvironmentVariables { - environmentVariables[i] = d.EnvironmentVariables[i] - } + copy(d.EnvironmentVariables, environmentVariables) egressRules := make([]*SecurityGroupRule, len(d.EgressRules)) - for i := range d.EgressRules { - egressRules[i] = d.EgressRules[i] - } + copy(d.EgressRules, egressRules) return NewDesiredLRPRunInfo( d.DesiredLRPKey(), From 9a91be0b63717f8e19a37c08beebd80c1636f2d3 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 10 May 2024 15:35:09 +0000 Subject: [PATCH 065/155] Remove old gogoproto generated files --- protomodels/actions.gogoproto.go | 5068 ----------------- protomodels/actual_lrp.gogoproto.go | 3220 ----------- protomodels/actual_lrp_requests.gogoproto.go | 4872 ---------------- protomodels/cached_dependency.gogoproto.go | 723 --- protomodels/cells.gogoproto.go | 1703 ------ .../certificate_properties.gogoproto.go | 385 -- protomodels/check_definition.gogoproto.go | 1453 ----- protomodels/desired_lrp_requests.gogoproto.go | 2806 --------- protomodels/domain.gogoproto.go | 853 --- .../environment_variables.gogoproto.go | 436 -- protomodels/error.gogoproto.go | 515 -- protomodels/evacuation.gogoproto.go | 2503 -------- protomodels/events.gogoproto.go | 4977 ---------------- protomodels/image_layer.gogoproto.go | 788 --- protomodels/log_rate_limit.gogoproto.go | 360 -- protomodels/metric_tags.gogoproto.go | 460 -- protomodels/modification_tag.gogoproto.go | 419 -- protomodels/network.gogoproto.go | 522 -- protomodels/ping.gogoproto.go | 368 -- protomodels/security_group.gogoproto.go | 1282 ----- protomodels/sidecar.gogoproto.go | 472 -- protomodels/task.gogoproto.go | 3018 ---------- protomodels/task_requests.gogoproto.go | 4016 ------------- protomodels/volume_mount.gogoproto.go | 1061 ---- 24 files changed, 42280 deletions(-) delete mode 100644 protomodels/actions.gogoproto.go delete mode 100644 protomodels/actual_lrp.gogoproto.go delete mode 100644 protomodels/actual_lrp_requests.gogoproto.go delete mode 100644 protomodels/cached_dependency.gogoproto.go delete mode 100644 protomodels/cells.gogoproto.go delete mode 100644 protomodels/certificate_properties.gogoproto.go delete mode 100644 protomodels/check_definition.gogoproto.go delete mode 100644 protomodels/desired_lrp_requests.gogoproto.go delete mode 100644 protomodels/domain.gogoproto.go delete mode 100644 protomodels/environment_variables.gogoproto.go delete mode 100644 protomodels/error.gogoproto.go delete mode 100644 protomodels/evacuation.gogoproto.go delete mode 100644 protomodels/events.gogoproto.go delete mode 100644 protomodels/image_layer.gogoproto.go delete mode 100644 protomodels/log_rate_limit.gogoproto.go delete mode 100644 protomodels/metric_tags.gogoproto.go delete mode 100644 protomodels/modification_tag.gogoproto.go delete mode 100644 protomodels/network.gogoproto.go delete mode 100644 protomodels/ping.gogoproto.go delete mode 100644 protomodels/security_group.gogoproto.go delete mode 100644 protomodels/sidecar.gogoproto.go delete mode 100644 protomodels/task.gogoproto.go delete mode 100644 protomodels/task_requests.gogoproto.go delete mode 100644 protomodels/volume_mount.gogoproto.go diff --git a/protomodels/actions.gogoproto.go b/protomodels/actions.gogoproto.go deleted file mode 100644 index 50d66963..00000000 --- a/protomodels/actions.gogoproto.go +++ /dev/null @@ -1,5068 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: actions.proto - -package protomodels - -import ( - fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" - - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Action struct { - DownloadAction *DownloadAction `protobuf:"bytes,1,opt,name=download_action,json=downloadAction,proto3" json:"download,omitempty"` - UploadAction *UploadAction `protobuf:"bytes,2,opt,name=upload_action,json=uploadAction,proto3" json:"upload,omitempty"` - RunAction *RunAction `protobuf:"bytes,3,opt,name=run_action,json=runAction,proto3" json:"run,omitempty"` - TimeoutAction *TimeoutAction `protobuf:"bytes,4,opt,name=timeout_action,json=timeoutAction,proto3" json:"timeout,omitempty"` - EmitProgressAction *EmitProgressAction `protobuf:"bytes,5,opt,name=emit_progress_action,json=emitProgressAction,proto3" json:"emit_progress,omitempty"` - TryAction *TryAction `protobuf:"bytes,6,opt,name=try_action,json=tryAction,proto3" json:"try,omitempty"` - ParallelAction *ParallelAction `protobuf:"bytes,7,opt,name=parallel_action,json=parallelAction,proto3" json:"parallel,omitempty"` - SerialAction *SerialAction `protobuf:"bytes,8,opt,name=serial_action,json=serialAction,proto3" json:"serial,omitempty"` - CodependentAction *CodependentAction `protobuf:"bytes,9,opt,name=codependent_action,json=codependentAction,proto3" json:"codependent,omitempty"` -} - -func (m *Action) Reset() { *m = Action{} } -func (*Action) ProtoMessage() {} -func (*Action) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{0} -} -func (m *Action) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Action) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Action.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Action) XXX_Merge(src proto.Message) { - xxx_messageInfo_Action.Merge(m, src) -} -func (m *Action) XXX_Size() int { - return m.Size() -} -func (m *Action) XXX_DiscardUnknown() { - xxx_messageInfo_Action.DiscardUnknown(m) -} - -var xxx_messageInfo_Action proto.InternalMessageInfo - -func (m *Action) GetDownloadAction() *DownloadAction { - if m != nil { - return m.DownloadAction - } - return nil -} - -func (m *Action) GetUploadAction() *UploadAction { - if m != nil { - return m.UploadAction - } - return nil -} - -func (m *Action) GetRunAction() *RunAction { - if m != nil { - return m.RunAction - } - return nil -} - -func (m *Action) GetTimeoutAction() *TimeoutAction { - if m != nil { - return m.TimeoutAction - } - return nil -} - -func (m *Action) GetEmitProgressAction() *EmitProgressAction { - if m != nil { - return m.EmitProgressAction - } - return nil -} - -func (m *Action) GetTryAction() *TryAction { - if m != nil { - return m.TryAction - } - return nil -} - -func (m *Action) GetParallelAction() *ParallelAction { - if m != nil { - return m.ParallelAction - } - return nil -} - -func (m *Action) GetSerialAction() *SerialAction { - if m != nil { - return m.SerialAction - } - return nil -} - -func (m *Action) GetCodependentAction() *CodependentAction { - if m != nil { - return m.CodependentAction - } - return nil -} - -type DownloadAction struct { - Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to"` - CacheKey string `protobuf:"bytes,4,opt,name=cache_key,json=cacheKey,proto3" json:"cache_key"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` - User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user"` - ChecksumAlgorithm string `protobuf:"bytes,7,opt,name=checksum_algorithm,json=checksumAlgorithm,proto3" json:"checksum_algorithm,omitempty"` - ChecksumValue string `protobuf:"bytes,8,opt,name=checksum_value,json=checksumValue,proto3" json:"checksum_value,omitempty"` -} - -func (m *DownloadAction) Reset() { *m = DownloadAction{} } -func (*DownloadAction) ProtoMessage() {} -func (*DownloadAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{1} -} -func (m *DownloadAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DownloadAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DownloadAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DownloadAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_DownloadAction.Merge(m, src) -} -func (m *DownloadAction) XXX_Size() int { - return m.Size() -} -func (m *DownloadAction) XXX_DiscardUnknown() { - xxx_messageInfo_DownloadAction.DiscardUnknown(m) -} - -var xxx_messageInfo_DownloadAction proto.InternalMessageInfo - -func (m *DownloadAction) GetArtifact() string { - if m != nil { - return m.Artifact - } - return "" -} - -func (m *DownloadAction) GetFrom() string { - if m != nil { - return m.From - } - return "" -} - -func (m *DownloadAction) GetTo() string { - if m != nil { - return m.To - } - return "" -} - -func (m *DownloadAction) GetCacheKey() string { - if m != nil { - return m.CacheKey - } - return "" -} - -func (m *DownloadAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *DownloadAction) GetUser() string { - if m != nil { - return m.User - } - return "" -} - -func (m *DownloadAction) GetChecksumAlgorithm() string { - if m != nil { - return m.ChecksumAlgorithm - } - return "" -} - -func (m *DownloadAction) GetChecksumValue() string { - if m != nil { - return m.ChecksumValue - } - return "" -} - -type UploadAction struct { - Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to"` - LogSource string `protobuf:"bytes,4,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` - User string `protobuf:"bytes,5,opt,name=user,proto3" json:"user"` -} - -func (m *UploadAction) Reset() { *m = UploadAction{} } -func (*UploadAction) ProtoMessage() {} -func (*UploadAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{2} -} -func (m *UploadAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UploadAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_UploadAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *UploadAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_UploadAction.Merge(m, src) -} -func (m *UploadAction) XXX_Size() int { - return m.Size() -} -func (m *UploadAction) XXX_DiscardUnknown() { - xxx_messageInfo_UploadAction.DiscardUnknown(m) -} - -var xxx_messageInfo_UploadAction proto.InternalMessageInfo - -func (m *UploadAction) GetArtifact() string { - if m != nil { - return m.Artifact - } - return "" -} - -func (m *UploadAction) GetFrom() string { - if m != nil { - return m.From - } - return "" -} - -func (m *UploadAction) GetTo() string { - if m != nil { - return m.To - } - return "" -} - -func (m *UploadAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *UploadAction) GetUser() string { - if m != nil { - return m.User - } - return "" -} - -type RunAction struct { - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path"` - Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` - Dir string `protobuf:"bytes,3,opt,name=dir,proto3" json:"dir,omitempty"` - Env []*EnvironmentVariable `protobuf:"bytes,4,rep,name=env,proto3" json:"env,omitempty"` - ResourceLimits *ResourceLimits `protobuf:"bytes,5,opt,name=resource_limits,json=resourceLimits,proto3" json:"resource_limits,omitempty"` - User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user"` - LogSource string `protobuf:"bytes,7,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` - SuppressLogOutput bool `protobuf:"varint,8,opt,name=suppress_log_output,json=suppressLogOutput,proto3" json:"suppress_log_output"` -} - -func (m *RunAction) Reset() { *m = RunAction{} } -func (*RunAction) ProtoMessage() {} -func (*RunAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{3} -} -func (m *RunAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RunAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RunAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RunAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_RunAction.Merge(m, src) -} -func (m *RunAction) XXX_Size() int { - return m.Size() -} -func (m *RunAction) XXX_DiscardUnknown() { - xxx_messageInfo_RunAction.DiscardUnknown(m) -} - -var xxx_messageInfo_RunAction proto.InternalMessageInfo - -func (m *RunAction) GetPath() string { - if m != nil { - return m.Path - } - return "" -} - -func (m *RunAction) GetArgs() []string { - if m != nil { - return m.Args - } - return nil -} - -func (m *RunAction) GetDir() string { - if m != nil { - return m.Dir - } - return "" -} - -func (m *RunAction) GetEnv() []*EnvironmentVariable { - if m != nil { - return m.Env - } - return nil -} - -func (m *RunAction) GetResourceLimits() *ResourceLimits { - if m != nil { - return m.ResourceLimits - } - return nil -} - -func (m *RunAction) GetUser() string { - if m != nil { - return m.User - } - return "" -} - -func (m *RunAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *RunAction) GetSuppressLogOutput() bool { - if m != nil { - return m.SuppressLogOutput - } - return false -} - -type TimeoutAction struct { - Action *Action `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - DeprecatedTimeoutNs int64 `protobuf:"varint,2,opt,name=deprecated_timeout_ns,json=deprecatedTimeoutNs,proto3" json:"timeout,omitempty"` // Deprecated: Do not use. - LogSource string `protobuf:"bytes,3,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` - TimeoutMs int64 `protobuf:"varint,4,opt,name=timeout_ms,json=timeoutMs,proto3" json:"timeout_ms"` -} - -func (m *TimeoutAction) Reset() { *m = TimeoutAction{} } -func (*TimeoutAction) ProtoMessage() {} -func (*TimeoutAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{4} -} -func (m *TimeoutAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TimeoutAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TimeoutAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TimeoutAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_TimeoutAction.Merge(m, src) -} -func (m *TimeoutAction) XXX_Size() int { - return m.Size() -} -func (m *TimeoutAction) XXX_DiscardUnknown() { - xxx_messageInfo_TimeoutAction.DiscardUnknown(m) -} - -var xxx_messageInfo_TimeoutAction proto.InternalMessageInfo - -func (m *TimeoutAction) GetAction() *Action { - if m != nil { - return m.Action - } - return nil -} - -// Deprecated: Do not use. -func (m *TimeoutAction) GetDeprecatedTimeoutNs() int64 { - if m != nil { - return m.DeprecatedTimeoutNs - } - return 0 -} - -func (m *TimeoutAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *TimeoutAction) GetTimeoutMs() int64 { - if m != nil { - return m.TimeoutMs - } - return 0 -} - -type EmitProgressAction struct { - Action *Action `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - StartMessage string `protobuf:"bytes,2,opt,name=start_message,json=startMessage,proto3" json:"start_message"` - SuccessMessage string `protobuf:"bytes,3,opt,name=success_message,json=successMessage,proto3" json:"success_message"` - FailureMessagePrefix string `protobuf:"bytes,4,opt,name=failure_message_prefix,json=failureMessagePrefix,proto3" json:"failure_message_prefix"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` -} - -func (m *EmitProgressAction) Reset() { *m = EmitProgressAction{} } -func (*EmitProgressAction) ProtoMessage() {} -func (*EmitProgressAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{5} -} -func (m *EmitProgressAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EmitProgressAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EmitProgressAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EmitProgressAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_EmitProgressAction.Merge(m, src) -} -func (m *EmitProgressAction) XXX_Size() int { - return m.Size() -} -func (m *EmitProgressAction) XXX_DiscardUnknown() { - xxx_messageInfo_EmitProgressAction.DiscardUnknown(m) -} - -var xxx_messageInfo_EmitProgressAction proto.InternalMessageInfo - -func (m *EmitProgressAction) GetAction() *Action { - if m != nil { - return m.Action - } - return nil -} - -func (m *EmitProgressAction) GetStartMessage() string { - if m != nil { - return m.StartMessage - } - return "" -} - -func (m *EmitProgressAction) GetSuccessMessage() string { - if m != nil { - return m.SuccessMessage - } - return "" -} - -func (m *EmitProgressAction) GetFailureMessagePrefix() string { - if m != nil { - return m.FailureMessagePrefix - } - return "" -} - -func (m *EmitProgressAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -type TryAction struct { - Action *Action `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` -} - -func (m *TryAction) Reset() { *m = TryAction{} } -func (*TryAction) ProtoMessage() {} -func (*TryAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{6} -} -func (m *TryAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TryAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TryAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TryAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_TryAction.Merge(m, src) -} -func (m *TryAction) XXX_Size() int { - return m.Size() -} -func (m *TryAction) XXX_DiscardUnknown() { - xxx_messageInfo_TryAction.DiscardUnknown(m) -} - -var xxx_messageInfo_TryAction proto.InternalMessageInfo - -func (m *TryAction) GetAction() *Action { - if m != nil { - return m.Action - } - return nil -} - -func (m *TryAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -type ParallelAction struct { - Actions []*Action `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` -} - -func (m *ParallelAction) Reset() { *m = ParallelAction{} } -func (*ParallelAction) ProtoMessage() {} -func (*ParallelAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{7} -} -func (m *ParallelAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ParallelAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ParallelAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ParallelAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_ParallelAction.Merge(m, src) -} -func (m *ParallelAction) XXX_Size() int { - return m.Size() -} -func (m *ParallelAction) XXX_DiscardUnknown() { - xxx_messageInfo_ParallelAction.DiscardUnknown(m) -} - -var xxx_messageInfo_ParallelAction proto.InternalMessageInfo - -func (m *ParallelAction) GetActions() []*Action { - if m != nil { - return m.Actions - } - return nil -} - -func (m *ParallelAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -type SerialAction struct { - Actions []*Action `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` -} - -func (m *SerialAction) Reset() { *m = SerialAction{} } -func (*SerialAction) ProtoMessage() {} -func (*SerialAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{8} -} -func (m *SerialAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *SerialAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_SerialAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *SerialAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_SerialAction.Merge(m, src) -} -func (m *SerialAction) XXX_Size() int { - return m.Size() -} -func (m *SerialAction) XXX_DiscardUnknown() { - xxx_messageInfo_SerialAction.DiscardUnknown(m) -} - -var xxx_messageInfo_SerialAction proto.InternalMessageInfo - -func (m *SerialAction) GetActions() []*Action { - if m != nil { - return m.Actions - } - return nil -} - -func (m *SerialAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -type CodependentAction struct { - Actions []*Action `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` -} - -func (m *CodependentAction) Reset() { *m = CodependentAction{} } -func (*CodependentAction) ProtoMessage() {} -func (*CodependentAction) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{9} -} -func (m *CodependentAction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CodependentAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CodependentAction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CodependentAction) XXX_Merge(src proto.Message) { - xxx_messageInfo_CodependentAction.Merge(m, src) -} -func (m *CodependentAction) XXX_Size() int { - return m.Size() -} -func (m *CodependentAction) XXX_DiscardUnknown() { - xxx_messageInfo_CodependentAction.DiscardUnknown(m) -} - -var xxx_messageInfo_CodependentAction proto.InternalMessageInfo - -func (m *CodependentAction) GetActions() []*Action { - if m != nil { - return m.Actions - } - return nil -} - -func (m *CodependentAction) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -type ResourceLimits struct { - // Types that are valid to be assigned to OptionalNofile: - // - // *ResourceLimits_Nofile - OptionalNofile isResourceLimits_OptionalNofile `protobuf_oneof:"optional_nofile"` - // Types that are valid to be assigned to OptionalNproc: - // - // *ResourceLimits_Nproc - OptionalNproc isResourceLimits_OptionalNproc `protobuf_oneof:"optional_nproc"` -} - -func (m *ResourceLimits) Reset() { *m = ResourceLimits{} } -func (*ResourceLimits) ProtoMessage() {} -func (*ResourceLimits) Descriptor() ([]byte, []int) { - return fileDescriptor_eeb49063df94c2b8, []int{10} -} -func (m *ResourceLimits) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ResourceLimits) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ResourceLimits.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ResourceLimits) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResourceLimits.Merge(m, src) -} -func (m *ResourceLimits) XXX_Size() int { - return m.Size() -} -func (m *ResourceLimits) XXX_DiscardUnknown() { - xxx_messageInfo_ResourceLimits.DiscardUnknown(m) -} - -var xxx_messageInfo_ResourceLimits proto.InternalMessageInfo - -type isResourceLimits_OptionalNofile interface { - isResourceLimits_OptionalNofile() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} -type isResourceLimits_OptionalNproc interface { - isResourceLimits_OptionalNproc() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} - -type ResourceLimits_Nofile struct { - Nofile uint64 `protobuf:"varint,1,opt,name=nofile,proto3,oneof" json:"nofile,omitempty"` -} -type ResourceLimits_Nproc struct { - Nproc uint64 `protobuf:"varint,2,opt,name=nproc,proto3,oneof" json:"nproc,omitempty"` -} - -func (*ResourceLimits_Nofile) isResourceLimits_OptionalNofile() {} -func (*ResourceLimits_Nproc) isResourceLimits_OptionalNproc() {} - -func (m *ResourceLimits) GetOptionalNofile() isResourceLimits_OptionalNofile { - if m != nil { - return m.OptionalNofile - } - return nil -} -func (m *ResourceLimits) GetOptionalNproc() isResourceLimits_OptionalNproc { - if m != nil { - return m.OptionalNproc - } - return nil -} - -func (m *ResourceLimits) GetNofile() uint64 { - if x, ok := m.GetOptionalNofile().(*ResourceLimits_Nofile); ok { - return x.Nofile - } - return 0 -} - -// Deprecated: Do not use. -func (m *ResourceLimits) GetNproc() uint64 { - if x, ok := m.GetOptionalNproc().(*ResourceLimits_Nproc); ok { - return x.Nproc - } - return 0 -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*ResourceLimits) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*ResourceLimits_Nofile)(nil), - (*ResourceLimits_Nproc)(nil), - } -} - -func init() { - proto.RegisterType((*Action)(nil), "models.Action") - proto.RegisterType((*DownloadAction)(nil), "models.DownloadAction") - proto.RegisterType((*UploadAction)(nil), "models.UploadAction") - proto.RegisterType((*RunAction)(nil), "models.RunAction") - proto.RegisterType((*TimeoutAction)(nil), "models.TimeoutAction") - proto.RegisterType((*EmitProgressAction)(nil), "models.EmitProgressAction") - proto.RegisterType((*TryAction)(nil), "models.TryAction") - proto.RegisterType((*ParallelAction)(nil), "models.ParallelAction") - proto.RegisterType((*SerialAction)(nil), "models.SerialAction") - proto.RegisterType((*CodependentAction)(nil), "models.CodependentAction") - proto.RegisterType((*ResourceLimits)(nil), "models.ResourceLimits") -} - -func init() { proto.RegisterFile("actions.proto", fileDescriptor_eeb49063df94c2b8) } - -var fileDescriptor_eeb49063df94c2b8 = []byte{ - // 1073 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0x5f, 0xef, 0x6e, 0x36, 0xf1, 0x6b, 0xd6, 0xc9, 0x4e, 0xfe, 0x74, 0xbb, 0x01, 0x3b, 0x5a, - 0x09, 0x14, 0x21, 0x92, 0x4a, 0x05, 0x71, 0x42, 0x42, 0xdd, 0x82, 0xa8, 0xd4, 0x96, 0x46, 0x93, - 0xd2, 0x0a, 0x09, 0xc9, 0x72, 0xbc, 0xb3, 0x8e, 0x15, 0xdb, 0x63, 0x8d, 0xc7, 0x81, 0xbd, 0x71, - 0xe7, 0xc2, 0x17, 0xe0, 0x80, 0xb8, 0xf0, 0x45, 0x90, 0x38, 0x46, 0x9c, 0x7a, 0xb2, 0xc8, 0xe6, - 0x82, 0x7c, 0xea, 0x47, 0x40, 0x1e, 0xcf, 0x6c, 0xec, 0x4d, 0xab, 0xf4, 0x50, 0x2e, 0xd6, 0xbc, - 0xf7, 0x7e, 0xef, 0xf7, 0x66, 0xde, 0x7b, 0xf3, 0xc6, 0xd0, 0x75, 0x5c, 0xee, 0xd3, 0x28, 0x39, - 0x88, 0x19, 0xe5, 0x14, 0x75, 0x42, 0x3a, 0x26, 0x41, 0x32, 0xd8, 0xf7, 0x7c, 0x7e, 0x92, 0x1e, - 0x1f, 0xb8, 0x34, 0xbc, 0xeb, 0x51, 0x8f, 0xde, 0x15, 0xe6, 0xe3, 0x74, 0x22, 0x24, 0x21, 0x88, - 0x55, 0xe9, 0x36, 0xd8, 0x21, 0xd1, 0x99, 0xcf, 0x68, 0x14, 0x92, 0x88, 0xdb, 0x67, 0x0e, 0xf3, - 0x9d, 0xe3, 0x80, 0x48, 0xce, 0xe1, 0xcf, 0x1d, 0xe8, 0xdc, 0x17, 0x51, 0xd0, 0x0b, 0x58, 0x1b, - 0xd3, 0x1f, 0xa2, 0x80, 0x3a, 0x63, 0xbb, 0x0c, 0xdc, 0xd7, 0x76, 0xb5, 0xbd, 0x5b, 0xf7, 0xb6, - 0x0f, 0xca, 0xc0, 0x07, 0x5f, 0x4a, 0x73, 0xe9, 0x30, 0xda, 0xce, 0x33, 0x0b, 0x29, 0x97, 0x8f, - 0x69, 0xe8, 0x73, 0x12, 0xc6, 0x7c, 0x8a, 0x8d, 0x71, 0x0d, 0x87, 0x9e, 0x42, 0x37, 0x8d, 0xab, - 0xb4, 0x4d, 0x41, 0xbb, 0xa9, 0x68, 0xbf, 0x8d, 0x2b, 0xa4, 0x9b, 0x79, 0x66, 0xad, 0x97, 0xf0, - 0x0a, 0xe5, 0x6a, 0x5a, 0xc1, 0xa0, 0x07, 0x00, 0x2c, 0x8d, 0x14, 0x5b, 0x4b, 0xb0, 0xf5, 0x14, - 0x1b, 0x4e, 0x23, 0x49, 0xd5, 0xcb, 0x33, 0xab, 0xcb, 0xd2, 0xa8, 0xc2, 0xa3, 0x33, 0x65, 0x45, - 0x47, 0x60, 0x70, 0x3f, 0x24, 0x34, 0xe5, 0x8a, 0xa8, 0x2d, 0x88, 0xb6, 0x14, 0xd1, 0xb3, 0xd2, - 0x2a, 0xc9, 0xb6, 0xf2, 0xcc, 0xea, 0x49, 0x87, 0x0a, 0x61, 0x97, 0x57, 0x51, 0xc8, 0x87, 0x4d, - 0x12, 0xfa, 0xdc, 0x8e, 0x19, 0xf5, 0x18, 0x49, 0x12, 0x45, 0xbd, 0x24, 0xa8, 0x07, 0x8a, 0xfa, - 0xab, 0xd0, 0xe7, 0x87, 0x12, 0x22, 0xf9, 0x77, 0xf2, 0xcc, 0xba, 0x5d, 0xf3, 0xad, 0x44, 0x41, - 0xe4, 0x9a, 0x43, 0x91, 0x04, 0xce, 0xa6, 0x2a, 0x40, 0xa7, 0x9e, 0x84, 0x67, 0x6c, 0x5a, 0x4d, - 0x02, 0x67, 0xd3, 0x6a, 0x12, 0xb8, 0xb2, 0x16, 0x35, 0x8f, 0x1d, 0xe6, 0x04, 0x01, 0x09, 0x14, - 0xd3, 0x72, 0xbd, 0xe6, 0x87, 0xd2, 0x5c, 0xad, 0xb9, 0x72, 0xa9, 0xd6, 0x3c, 0xae, 0xe1, 0x8a, - 0x9a, 0x27, 0x84, 0xf9, 0xce, 0x9c, 0x76, 0xa5, 0x5e, 0xf3, 0x23, 0x61, 0xac, 0xd6, 0xbc, 0x84, - 0x57, 0x6b, 0x9e, 0x54, 0x30, 0xc8, 0x05, 0xe4, 0xd2, 0x31, 0x89, 0x49, 0x34, 0x2e, 0xfa, 0x58, - 0xb2, 0xea, 0x82, 0xf5, 0x8e, 0x62, 0x7d, 0x70, 0x85, 0x90, 0xd4, 0x77, 0xf2, 0xcc, 0xda, 0xaa, - 0x38, 0x56, 0xf8, 0x7b, 0xee, 0x22, 0x7a, 0xf8, 0x5b, 0x13, 0x8c, 0x7a, 0x93, 0xa3, 0x01, 0xac, - 0x38, 0x8c, 0xfb, 0x13, 0xc7, 0xe5, 0xe2, 0x3a, 0xe8, 0x78, 0x2e, 0xa3, 0xf7, 0xa0, 0x3d, 0x61, - 0x34, 0x14, 0xfd, 0xac, 0x8f, 0x56, 0xf2, 0xcc, 0x12, 0x32, 0x16, 0x5f, 0xb4, 0x0d, 0x4d, 0x4e, - 0x45, 0x77, 0xea, 0xa3, 0x4e, 0x9e, 0x59, 0x4d, 0x4e, 0x71, 0x93, 0x53, 0xf4, 0x11, 0xe8, 0xae, - 0xe3, 0x9e, 0x10, 0xfb, 0x94, 0x4c, 0x45, 0xcf, 0xe9, 0xa3, 0x6e, 0x9e, 0x59, 0x57, 0x4a, 0xbc, - 0x22, 0x96, 0x8f, 0xc8, 0x14, 0xbd, 0x0f, 0x10, 0x50, 0xcf, 0x4e, 0x68, 0xca, 0x5c, 0x22, 0xba, - 0x48, 0xc7, 0x7a, 0x40, 0xbd, 0x23, 0xa1, 0x28, 0x36, 0x90, 0x26, 0x84, 0x89, 0xea, 0xcb, 0x0d, - 0x14, 0x32, 0x16, 0x5f, 0xb4, 0x0f, 0xc8, 0x3d, 0x21, 0xee, 0x69, 0x92, 0x86, 0xb6, 0x13, 0x78, - 0x94, 0xf9, 0xfc, 0x24, 0x14, 0xf5, 0xd5, 0x71, 0x4f, 0x59, 0xee, 0x2b, 0x03, 0xfa, 0x00, 0x8c, - 0x39, 0xfc, 0xcc, 0x09, 0x52, 0x22, 0x6a, 0xa6, 0xe3, 0xae, 0xd2, 0x3e, 0x2f, 0x94, 0xc3, 0x5f, - 0x35, 0x58, 0xad, 0xde, 0xd8, 0xff, 0x21, 0x43, 0xf5, 0x53, 0xb7, 0xdf, 0x74, 0xea, 0xa5, 0xd7, - 0x9d, 0x7a, 0xf8, 0x67, 0x13, 0xf4, 0xf9, 0x0c, 0x28, 0xb0, 0xb1, 0xc3, 0x4f, 0xca, 0x8d, 0x95, - 0xd8, 0x42, 0xc6, 0xe2, 0x8b, 0x10, 0xb4, 0x1d, 0xe6, 0x25, 0xfd, 0xe6, 0x6e, 0x6b, 0x4f, 0xc7, - 0x62, 0x8d, 0xd6, 0xa1, 0x35, 0xf6, 0x59, 0xb9, 0x2b, 0x5c, 0x2c, 0xd1, 0x3e, 0xb4, 0x48, 0x74, - 0xd6, 0x6f, 0xef, 0xb6, 0xf6, 0x6e, 0xdd, 0xdb, 0x99, 0xdf, 0xe1, 0xab, 0xa9, 0xfa, 0x5c, 0x0e, - 0x55, 0x5c, 0xe0, 0xd0, 0x17, 0xb0, 0xc6, 0x48, 0xb9, 0x77, 0x3b, 0xf0, 0x43, 0x9f, 0x27, 0xf2, - 0xfa, 0xcf, 0xef, 0x14, 0x96, 0xe6, 0xc7, 0xc2, 0x8a, 0x0d, 0x56, 0x93, 0x6f, 0xa8, 0x6a, 0x3d, - 0x39, 0xcb, 0x8b, 0xc9, 0xf9, 0x1a, 0x36, 0x92, 0x34, 0x8e, 0xc5, 0xf0, 0x29, 0x70, 0x34, 0xe5, - 0x71, 0xca, 0x45, 0x29, 0x57, 0x46, 0xb7, 0xf3, 0xcc, 0x7a, 0x9d, 0x19, 0xf7, 0x94, 0xf2, 0x31, - 0xf5, 0x9e, 0x0a, 0xd5, 0xf0, 0x6f, 0x0d, 0xba, 0xb5, 0x11, 0x88, 0x3e, 0x84, 0x4e, 0xed, 0x5d, - 0x30, 0xd4, 0x79, 0x4a, 0x3b, 0x96, 0x56, 0xf4, 0x08, 0xb6, 0xc6, 0x24, 0x66, 0xc4, 0x75, 0x38, - 0x19, 0xdb, 0x6a, 0xc8, 0x46, 0x89, 0xe8, 0x82, 0x96, 0xd8, 0xc4, 0xf5, 0x49, 0xda, 0xd7, 0xf0, - 0xc6, 0x95, 0x97, 0x0c, 0xfc, 0x4d, 0xb2, 0x70, 0xdc, 0xd6, 0xe2, 0x71, 0xf7, 0x01, 0x54, 0x80, - 0x30, 0x11, 0xad, 0xd2, 0x1a, 0x19, 0x79, 0x66, 0x55, 0xb4, 0x58, 0x97, 0xeb, 0x27, 0xc9, 0xf0, - 0xf7, 0x26, 0xa0, 0xeb, 0xc3, 0xf7, 0xad, 0x4f, 0xf6, 0x19, 0x74, 0x13, 0xee, 0x30, 0x6e, 0x87, - 0x24, 0x49, 0x1c, 0x8f, 0xc8, 0xbe, 0x16, 0x33, 0xb6, 0x66, 0xc0, 0xab, 0x42, 0x7c, 0x52, 0x4a, - 0xe8, 0x73, 0x58, 0x4b, 0x52, 0xd7, 0x2d, 0x92, 0xae, 0x3c, 0xcb, 0xae, 0xdf, 0xc8, 0x33, 0x6b, - 0xd1, 0x84, 0x0d, 0xa9, 0x50, 0xde, 0x87, 0xb0, 0x3d, 0x71, 0xfc, 0x20, 0x65, 0x44, 0x41, 0xec, - 0x98, 0x91, 0x89, 0xff, 0xa3, 0x9c, 0x1e, 0x83, 0x3c, 0xb3, 0xde, 0x80, 0xc0, 0x9b, 0x52, 0x2f, - 0xb9, 0x0e, 0x85, 0xf6, 0x86, 0xb1, 0x32, 0xc4, 0xa0, 0xcf, 0x1f, 0x90, 0xb7, 0xce, 0x4d, 0x9d, - 0xb3, 0xb9, 0xc8, 0xf9, 0x1d, 0x18, 0xf5, 0xa7, 0x04, 0xed, 0xc1, 0xb2, 0xfc, 0xbf, 0xe9, 0x6b, - 0xe2, 0x6a, 0x2d, 0x32, 0x2b, 0xf3, 0x4d, 0xd4, 0x2f, 0x60, 0xb5, 0xfa, 0x9c, 0xbc, 0x3b, 0xe2, - 0xef, 0xa1, 0x77, 0xed, 0x45, 0x79, 0x77, 0xec, 0xa7, 0x60, 0xd4, 0x07, 0x01, 0xea, 0x43, 0x27, - 0xa2, 0x13, 0x3f, 0x20, 0x22, 0xd5, 0xed, 0x87, 0x0d, 0x2c, 0x65, 0x34, 0x80, 0xa5, 0x28, 0x66, - 0xd4, 0x15, 0x2c, 0xed, 0x51, 0xb3, 0xaf, 0x3d, 0xd4, 0x70, 0xa9, 0x1a, 0xf5, 0x60, 0x8d, 0xc6, - 0x45, 0x44, 0x27, 0xb0, 0x4b, 0xf8, 0x68, 0x1d, 0x8c, 0x2b, 0x95, 0x00, 0x7d, 0x7a, 0x7e, 0x61, - 0x36, 0x5e, 0x5e, 0x98, 0x8d, 0x57, 0x17, 0xa6, 0xf6, 0xd3, 0xcc, 0xd4, 0xfe, 0x98, 0x99, 0xda, - 0x5f, 0x33, 0x53, 0x3b, 0x9f, 0x99, 0xda, 0x3f, 0x33, 0x53, 0xfb, 0x77, 0x66, 0x36, 0x5e, 0xcd, - 0x4c, 0xed, 0x97, 0x4b, 0xb3, 0x71, 0x7e, 0x69, 0x36, 0x5e, 0x5e, 0x9a, 0x8d, 0xe3, 0x8e, 0xf8, - 0x49, 0xfc, 0xe4, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x26, 0xe4, 0x44, 0x5a, 0x89, 0x0a, 0x00, - 0x00, -} - -func (this *Action) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Action) - if !ok { - that2, ok := that.(Action) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.DownloadAction.Equal(that1.DownloadAction) { - return false - } - if !this.UploadAction.Equal(that1.UploadAction) { - return false - } - if !this.RunAction.Equal(that1.RunAction) { - return false - } - if !this.TimeoutAction.Equal(that1.TimeoutAction) { - return false - } - if !this.EmitProgressAction.Equal(that1.EmitProgressAction) { - return false - } - if !this.TryAction.Equal(that1.TryAction) { - return false - } - if !this.ParallelAction.Equal(that1.ParallelAction) { - return false - } - if !this.SerialAction.Equal(that1.SerialAction) { - return false - } - if !this.CodependentAction.Equal(that1.CodependentAction) { - return false - } - return true -} -func (this *DownloadAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DownloadAction) - if !ok { - that2, ok := that.(DownloadAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Artifact != that1.Artifact { - return false - } - if this.From != that1.From { - return false - } - if this.To != that1.To { - return false - } - if this.CacheKey != that1.CacheKey { - return false - } - if this.LogSource != that1.LogSource { - return false - } - if this.User != that1.User { - return false - } - if this.ChecksumAlgorithm != that1.ChecksumAlgorithm { - return false - } - if this.ChecksumValue != that1.ChecksumValue { - return false - } - return true -} -func (this *UploadAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*UploadAction) - if !ok { - that2, ok := that.(UploadAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Artifact != that1.Artifact { - return false - } - if this.From != that1.From { - return false - } - if this.To != that1.To { - return false - } - if this.LogSource != that1.LogSource { - return false - } - if this.User != that1.User { - return false - } - return true -} -func (this *RunAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*RunAction) - if !ok { - that2, ok := that.(RunAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Path != that1.Path { - return false - } - if len(this.Args) != len(that1.Args) { - return false - } - for i := range this.Args { - if this.Args[i] != that1.Args[i] { - return false - } - } - if this.Dir != that1.Dir { - return false - } - if len(this.Env) != len(that1.Env) { - return false - } - for i := range this.Env { - if !this.Env[i].Equal(that1.Env[i]) { - return false - } - } - if !this.ResourceLimits.Equal(that1.ResourceLimits) { - return false - } - if this.User != that1.User { - return false - } - if this.LogSource != that1.LogSource { - return false - } - if this.SuppressLogOutput != that1.SuppressLogOutput { - return false - } - return true -} -func (this *TimeoutAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TimeoutAction) - if !ok { - that2, ok := that.(TimeoutAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Action.Equal(that1.Action) { - return false - } - if this.DeprecatedTimeoutNs != that1.DeprecatedTimeoutNs { - return false - } - if this.LogSource != that1.LogSource { - return false - } - if this.TimeoutMs != that1.TimeoutMs { - return false - } - return true -} -func (this *EmitProgressAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*EmitProgressAction) - if !ok { - that2, ok := that.(EmitProgressAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Action.Equal(that1.Action) { - return false - } - if this.StartMessage != that1.StartMessage { - return false - } - if this.SuccessMessage != that1.SuccessMessage { - return false - } - if this.FailureMessagePrefix != that1.FailureMessagePrefix { - return false - } - if this.LogSource != that1.LogSource { - return false - } - return true -} -func (this *TryAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TryAction) - if !ok { - that2, ok := that.(TryAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Action.Equal(that1.Action) { - return false - } - if this.LogSource != that1.LogSource { - return false - } - return true -} -func (this *ParallelAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ParallelAction) - if !ok { - that2, ok := that.(ParallelAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.Actions) != len(that1.Actions) { - return false - } - for i := range this.Actions { - if !this.Actions[i].Equal(that1.Actions[i]) { - return false - } - } - if this.LogSource != that1.LogSource { - return false - } - return true -} -func (this *SerialAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*SerialAction) - if !ok { - that2, ok := that.(SerialAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.Actions) != len(that1.Actions) { - return false - } - for i := range this.Actions { - if !this.Actions[i].Equal(that1.Actions[i]) { - return false - } - } - if this.LogSource != that1.LogSource { - return false - } - return true -} -func (this *CodependentAction) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CodependentAction) - if !ok { - that2, ok := that.(CodependentAction) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.Actions) != len(that1.Actions) { - return false - } - for i := range this.Actions { - if !this.Actions[i].Equal(that1.Actions[i]) { - return false - } - } - if this.LogSource != that1.LogSource { - return false - } - return true -} -func (this *ResourceLimits) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ResourceLimits) - if !ok { - that2, ok := that.(ResourceLimits) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if that1.OptionalNofile == nil { - if this.OptionalNofile != nil { - return false - } - } else if this.OptionalNofile == nil { - return false - } else if !this.OptionalNofile.Equal(that1.OptionalNofile) { - return false - } - if that1.OptionalNproc == nil { - if this.OptionalNproc != nil { - return false - } - } else if this.OptionalNproc == nil { - return false - } else if !this.OptionalNproc.Equal(that1.OptionalNproc) { - return false - } - return true -} -func (this *ResourceLimits_Nofile) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ResourceLimits_Nofile) - if !ok { - that2, ok := that.(ResourceLimits_Nofile) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Nofile != that1.Nofile { - return false - } - return true -} -func (this *ResourceLimits_Nproc) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ResourceLimits_Nproc) - if !ok { - that2, ok := that.(ResourceLimits_Nproc) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Nproc != that1.Nproc { - return false - } - return true -} -func (this *Action) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 13) - s = append(s, "&models.Action{") - if this.DownloadAction != nil { - s = append(s, "DownloadAction: "+fmt.Sprintf("%#v", this.DownloadAction)+",\n") - } - if this.UploadAction != nil { - s = append(s, "UploadAction: "+fmt.Sprintf("%#v", this.UploadAction)+",\n") - } - if this.RunAction != nil { - s = append(s, "RunAction: "+fmt.Sprintf("%#v", this.RunAction)+",\n") - } - if this.TimeoutAction != nil { - s = append(s, "TimeoutAction: "+fmt.Sprintf("%#v", this.TimeoutAction)+",\n") - } - if this.EmitProgressAction != nil { - s = append(s, "EmitProgressAction: "+fmt.Sprintf("%#v", this.EmitProgressAction)+",\n") - } - if this.TryAction != nil { - s = append(s, "TryAction: "+fmt.Sprintf("%#v", this.TryAction)+",\n") - } - if this.ParallelAction != nil { - s = append(s, "ParallelAction: "+fmt.Sprintf("%#v", this.ParallelAction)+",\n") - } - if this.SerialAction != nil { - s = append(s, "SerialAction: "+fmt.Sprintf("%#v", this.SerialAction)+",\n") - } - if this.CodependentAction != nil { - s = append(s, "CodependentAction: "+fmt.Sprintf("%#v", this.CodependentAction)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DownloadAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 12) - s = append(s, "&models.DownloadAction{") - s = append(s, "Artifact: "+fmt.Sprintf("%#v", this.Artifact)+",\n") - s = append(s, "From: "+fmt.Sprintf("%#v", this.From)+",\n") - s = append(s, "To: "+fmt.Sprintf("%#v", this.To)+",\n") - s = append(s, "CacheKey: "+fmt.Sprintf("%#v", this.CacheKey)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "User: "+fmt.Sprintf("%#v", this.User)+",\n") - s = append(s, "ChecksumAlgorithm: "+fmt.Sprintf("%#v", this.ChecksumAlgorithm)+",\n") - s = append(s, "ChecksumValue: "+fmt.Sprintf("%#v", this.ChecksumValue)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *UploadAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 9) - s = append(s, "&models.UploadAction{") - s = append(s, "Artifact: "+fmt.Sprintf("%#v", this.Artifact)+",\n") - s = append(s, "From: "+fmt.Sprintf("%#v", this.From)+",\n") - s = append(s, "To: "+fmt.Sprintf("%#v", this.To)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "User: "+fmt.Sprintf("%#v", this.User)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *RunAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 12) - s = append(s, "&models.RunAction{") - s = append(s, "Path: "+fmt.Sprintf("%#v", this.Path)+",\n") - s = append(s, "Args: "+fmt.Sprintf("%#v", this.Args)+",\n") - s = append(s, "Dir: "+fmt.Sprintf("%#v", this.Dir)+",\n") - if this.Env != nil { - s = append(s, "Env: "+fmt.Sprintf("%#v", this.Env)+",\n") - } - if this.ResourceLimits != nil { - s = append(s, "ResourceLimits: "+fmt.Sprintf("%#v", this.ResourceLimits)+",\n") - } - s = append(s, "User: "+fmt.Sprintf("%#v", this.User)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "SuppressLogOutput: "+fmt.Sprintf("%#v", this.SuppressLogOutput)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TimeoutAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.TimeoutAction{") - if this.Action != nil { - s = append(s, "Action: "+fmt.Sprintf("%#v", this.Action)+",\n") - } - s = append(s, "DeprecatedTimeoutNs: "+fmt.Sprintf("%#v", this.DeprecatedTimeoutNs)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "TimeoutMs: "+fmt.Sprintf("%#v", this.TimeoutMs)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *EmitProgressAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 9) - s = append(s, "&models.EmitProgressAction{") - if this.Action != nil { - s = append(s, "Action: "+fmt.Sprintf("%#v", this.Action)+",\n") - } - s = append(s, "StartMessage: "+fmt.Sprintf("%#v", this.StartMessage)+",\n") - s = append(s, "SuccessMessage: "+fmt.Sprintf("%#v", this.SuccessMessage)+",\n") - s = append(s, "FailureMessagePrefix: "+fmt.Sprintf("%#v", this.FailureMessagePrefix)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TryAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.TryAction{") - if this.Action != nil { - s = append(s, "Action: "+fmt.Sprintf("%#v", this.Action)+",\n") - } - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ParallelAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ParallelAction{") - if this.Actions != nil { - s = append(s, "Actions: "+fmt.Sprintf("%#v", this.Actions)+",\n") - } - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *SerialAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.SerialAction{") - if this.Actions != nil { - s = append(s, "Actions: "+fmt.Sprintf("%#v", this.Actions)+",\n") - } - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *CodependentAction) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.CodependentAction{") - if this.Actions != nil { - s = append(s, "Actions: "+fmt.Sprintf("%#v", this.Actions)+",\n") - } - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ResourceLimits) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ResourceLimits{") - if this.OptionalNofile != nil { - s = append(s, "OptionalNofile: "+fmt.Sprintf("%#v", this.OptionalNofile)+",\n") - } - if this.OptionalNproc != nil { - s = append(s, "OptionalNproc: "+fmt.Sprintf("%#v", this.OptionalNproc)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ResourceLimits_Nofile) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.ResourceLimits_Nofile{` + - `Nofile:` + fmt.Sprintf("%#v", this.Nofile) + `}`}, ", ") - return s -} -func (this *ResourceLimits_Nproc) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.ResourceLimits_Nproc{` + - `Nproc:` + fmt.Sprintf("%#v", this.Nproc) + `}`}, ", ") - return s -} -func valueToGoStringActions(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *Action) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Action) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Action) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.CodependentAction != nil { - { - size, err := m.CodependentAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - } - if m.SerialAction != nil { - { - size, err := m.SerialAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - } - if m.ParallelAction != nil { - { - size, err := m.ParallelAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } - if m.TryAction != nil { - { - size, err := m.TryAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - if m.EmitProgressAction != nil { - { - size, err := m.EmitProgressAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if m.TimeoutAction != nil { - { - size, err := m.TimeoutAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if m.RunAction != nil { - { - size, err := m.RunAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.UploadAction != nil { - { - size, err := m.UploadAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.DownloadAction != nil { - { - size, err := m.DownloadAction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DownloadAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DownloadAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DownloadAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ChecksumValue) > 0 { - i -= len(m.ChecksumValue) - copy(dAtA[i:], m.ChecksumValue) - i = encodeVarintActions(dAtA, i, uint64(len(m.ChecksumValue))) - i-- - dAtA[i] = 0x42 - } - if len(m.ChecksumAlgorithm) > 0 { - i -= len(m.ChecksumAlgorithm) - copy(dAtA[i:], m.ChecksumAlgorithm) - i = encodeVarintActions(dAtA, i, uint64(len(m.ChecksumAlgorithm))) - i-- - dAtA[i] = 0x3a - } - if len(m.User) > 0 { - i -= len(m.User) - copy(dAtA[i:], m.User) - i = encodeVarintActions(dAtA, i, uint64(len(m.User))) - i-- - dAtA[i] = 0x32 - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x2a - } - if len(m.CacheKey) > 0 { - i -= len(m.CacheKey) - copy(dAtA[i:], m.CacheKey) - i = encodeVarintActions(dAtA, i, uint64(len(m.CacheKey))) - i-- - dAtA[i] = 0x22 - } - if len(m.To) > 0 { - i -= len(m.To) - copy(dAtA[i:], m.To) - i = encodeVarintActions(dAtA, i, uint64(len(m.To))) - i-- - dAtA[i] = 0x1a - } - if len(m.From) > 0 { - i -= len(m.From) - copy(dAtA[i:], m.From) - i = encodeVarintActions(dAtA, i, uint64(len(m.From))) - i-- - dAtA[i] = 0x12 - } - if len(m.Artifact) > 0 { - i -= len(m.Artifact) - copy(dAtA[i:], m.Artifact) - i = encodeVarintActions(dAtA, i, uint64(len(m.Artifact))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *UploadAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UploadAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UploadAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.User) > 0 { - i -= len(m.User) - copy(dAtA[i:], m.User) - i = encodeVarintActions(dAtA, i, uint64(len(m.User))) - i-- - dAtA[i] = 0x2a - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x22 - } - if len(m.To) > 0 { - i -= len(m.To) - copy(dAtA[i:], m.To) - i = encodeVarintActions(dAtA, i, uint64(len(m.To))) - i-- - dAtA[i] = 0x1a - } - if len(m.From) > 0 { - i -= len(m.From) - copy(dAtA[i:], m.From) - i = encodeVarintActions(dAtA, i, uint64(len(m.From))) - i-- - dAtA[i] = 0x12 - } - if len(m.Artifact) > 0 { - i -= len(m.Artifact) - copy(dAtA[i:], m.Artifact) - i = encodeVarintActions(dAtA, i, uint64(len(m.Artifact))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *RunAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RunAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RunAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.SuppressLogOutput { - i-- - if m.SuppressLogOutput { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x40 - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x3a - } - if len(m.User) > 0 { - i -= len(m.User) - copy(dAtA[i:], m.User) - i = encodeVarintActions(dAtA, i, uint64(len(m.User))) - i-- - dAtA[i] = 0x32 - } - if m.ResourceLimits != nil { - { - size, err := m.ResourceLimits.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if len(m.Env) > 0 { - for iNdEx := len(m.Env) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Env[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - } - if len(m.Dir) > 0 { - i -= len(m.Dir) - copy(dAtA[i:], m.Dir) - i = encodeVarintActions(dAtA, i, uint64(len(m.Dir))) - i-- - dAtA[i] = 0x1a - } - if len(m.Args) > 0 { - for iNdEx := len(m.Args) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Args[iNdEx]) - copy(dAtA[i:], m.Args[iNdEx]) - i = encodeVarintActions(dAtA, i, uint64(len(m.Args[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - if len(m.Path) > 0 { - i -= len(m.Path) - copy(dAtA[i:], m.Path) - i = encodeVarintActions(dAtA, i, uint64(len(m.Path))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TimeoutAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TimeoutAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TimeoutAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.TimeoutMs != 0 { - i = encodeVarintActions(dAtA, i, uint64(m.TimeoutMs)) - i-- - dAtA[i] = 0x20 - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x1a - } - if m.DeprecatedTimeoutNs != 0 { - i = encodeVarintActions(dAtA, i, uint64(m.DeprecatedTimeoutNs)) - i-- - dAtA[i] = 0x10 - } - if m.Action != nil { - { - size, err := m.Action.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EmitProgressAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EmitProgressAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EmitProgressAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x2a - } - if len(m.FailureMessagePrefix) > 0 { - i -= len(m.FailureMessagePrefix) - copy(dAtA[i:], m.FailureMessagePrefix) - i = encodeVarintActions(dAtA, i, uint64(len(m.FailureMessagePrefix))) - i-- - dAtA[i] = 0x22 - } - if len(m.SuccessMessage) > 0 { - i -= len(m.SuccessMessage) - copy(dAtA[i:], m.SuccessMessage) - i = encodeVarintActions(dAtA, i, uint64(len(m.SuccessMessage))) - i-- - dAtA[i] = 0x1a - } - if len(m.StartMessage) > 0 { - i -= len(m.StartMessage) - copy(dAtA[i:], m.StartMessage) - i = encodeVarintActions(dAtA, i, uint64(len(m.StartMessage))) - i-- - dAtA[i] = 0x12 - } - if m.Action != nil { - { - size, err := m.Action.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TryAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TryAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TryAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x12 - } - if m.Action != nil { - { - size, err := m.Action.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ParallelAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ParallelAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ParallelAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x12 - } - if len(m.Actions) > 0 { - for iNdEx := len(m.Actions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Actions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *SerialAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *SerialAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SerialAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x12 - } - if len(m.Actions) > 0 { - for iNdEx := len(m.Actions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Actions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *CodependentAction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CodependentAction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CodependentAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintActions(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x12 - } - if len(m.Actions) > 0 { - for iNdEx := len(m.Actions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Actions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActions(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *ResourceLimits) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ResourceLimits) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ResourceLimits) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.OptionalNproc != nil { - { - size := m.OptionalNproc.Size() - i -= size - if _, err := m.OptionalNproc.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if m.OptionalNofile != nil { - { - size := m.OptionalNofile.Size() - i -= size - if _, err := m.OptionalNofile.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - return len(dAtA) - i, nil -} - -func (m *ResourceLimits_Nofile) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ResourceLimits_Nofile) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i = encodeVarintActions(dAtA, i, uint64(m.Nofile)) - i-- - dAtA[i] = 0x8 - return len(dAtA) - i, nil -} -func (m *ResourceLimits_Nproc) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ResourceLimits_Nproc) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i = encodeVarintActions(dAtA, i, uint64(m.Nproc)) - i-- - dAtA[i] = 0x10 - return len(dAtA) - i, nil -} -func encodeVarintActions(dAtA []byte, offset int, v uint64) int { - offset -= sovActions(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Action) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.DownloadAction != nil { - l = m.DownloadAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.UploadAction != nil { - l = m.UploadAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.RunAction != nil { - l = m.RunAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.TimeoutAction != nil { - l = m.TimeoutAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.EmitProgressAction != nil { - l = m.EmitProgressAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.TryAction != nil { - l = m.TryAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.ParallelAction != nil { - l = m.ParallelAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.SerialAction != nil { - l = m.SerialAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.CodependentAction != nil { - l = m.CodependentAction.Size() - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *DownloadAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Artifact) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.From) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.To) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.CacheKey) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.User) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.ChecksumAlgorithm) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.ChecksumValue) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *UploadAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Artifact) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.From) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.To) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.User) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *RunAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Path) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - if len(m.Args) > 0 { - for _, s := range m.Args { - l = len(s) - n += 1 + l + sovActions(uint64(l)) - } - } - l = len(m.Dir) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - if len(m.Env) > 0 { - for _, e := range m.Env { - l = e.Size() - n += 1 + l + sovActions(uint64(l)) - } - } - if m.ResourceLimits != nil { - l = m.ResourceLimits.Size() - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.User) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - if m.SuppressLogOutput { - n += 2 - } - return n -} - -func (m *TimeoutAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Action != nil { - l = m.Action.Size() - n += 1 + l + sovActions(uint64(l)) - } - if m.DeprecatedTimeoutNs != 0 { - n += 1 + sovActions(uint64(m.DeprecatedTimeoutNs)) - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - if m.TimeoutMs != 0 { - n += 1 + sovActions(uint64(m.TimeoutMs)) - } - return n -} - -func (m *EmitProgressAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Action != nil { - l = m.Action.Size() - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.StartMessage) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.SuccessMessage) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.FailureMessagePrefix) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *TryAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Action != nil { - l = m.Action.Size() - n += 1 + l + sovActions(uint64(l)) - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *ParallelAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Actions) > 0 { - for _, e := range m.Actions { - l = e.Size() - n += 1 + l + sovActions(uint64(l)) - } - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *SerialAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Actions) > 0 { - for _, e := range m.Actions { - l = e.Size() - n += 1 + l + sovActions(uint64(l)) - } - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *CodependentAction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Actions) > 0 { - for _, e := range m.Actions { - l = e.Size() - n += 1 + l + sovActions(uint64(l)) - } - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovActions(uint64(l)) - } - return n -} - -func (m *ResourceLimits) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.OptionalNofile != nil { - n += m.OptionalNofile.Size() - } - if m.OptionalNproc != nil { - n += m.OptionalNproc.Size() - } - return n -} - -func (m *ResourceLimits_Nofile) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 1 + sovActions(uint64(m.Nofile)) - return n -} -func (m *ResourceLimits_Nproc) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 1 + sovActions(uint64(m.Nproc)) - return n -} - -func sovActions(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozActions(x uint64) (n int) { - return sovActions(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *Action) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Action{`, - `DownloadAction:` + strings.Replace(this.DownloadAction.String(), "DownloadAction", "DownloadAction", 1) + `,`, - `UploadAction:` + strings.Replace(this.UploadAction.String(), "UploadAction", "UploadAction", 1) + `,`, - `RunAction:` + strings.Replace(this.RunAction.String(), "RunAction", "RunAction", 1) + `,`, - `TimeoutAction:` + strings.Replace(this.TimeoutAction.String(), "TimeoutAction", "TimeoutAction", 1) + `,`, - `EmitProgressAction:` + strings.Replace(this.EmitProgressAction.String(), "EmitProgressAction", "EmitProgressAction", 1) + `,`, - `TryAction:` + strings.Replace(this.TryAction.String(), "TryAction", "TryAction", 1) + `,`, - `ParallelAction:` + strings.Replace(this.ParallelAction.String(), "ParallelAction", "ParallelAction", 1) + `,`, - `SerialAction:` + strings.Replace(this.SerialAction.String(), "SerialAction", "SerialAction", 1) + `,`, - `CodependentAction:` + strings.Replace(this.CodependentAction.String(), "CodependentAction", "CodependentAction", 1) + `,`, - `}`, - }, "") - return s -} -func (this *DownloadAction) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DownloadAction{`, - `Artifact:` + fmt.Sprintf("%v", this.Artifact) + `,`, - `From:` + fmt.Sprintf("%v", this.From) + `,`, - `To:` + fmt.Sprintf("%v", this.To) + `,`, - `CacheKey:` + fmt.Sprintf("%v", this.CacheKey) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `User:` + fmt.Sprintf("%v", this.User) + `,`, - `ChecksumAlgorithm:` + fmt.Sprintf("%v", this.ChecksumAlgorithm) + `,`, - `ChecksumValue:` + fmt.Sprintf("%v", this.ChecksumValue) + `,`, - `}`, - }, "") - return s -} -func (this *UploadAction) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&UploadAction{`, - `Artifact:` + fmt.Sprintf("%v", this.Artifact) + `,`, - `From:` + fmt.Sprintf("%v", this.From) + `,`, - `To:` + fmt.Sprintf("%v", this.To) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `User:` + fmt.Sprintf("%v", this.User) + `,`, - `}`, - }, "") - return s -} -func (this *RunAction) String() string { - if this == nil { - return "nil" - } - repeatedStringForEnv := "[]*EnvironmentVariable{" - for _, f := range this.Env { - repeatedStringForEnv += strings.Replace(fmt.Sprintf("%v", f), "EnvironmentVariable", "EnvironmentVariable", 1) + "," - } - repeatedStringForEnv += "}" - s := strings.Join([]string{`&RunAction{`, - `Path:` + fmt.Sprintf("%v", this.Path) + `,`, - `Args:` + fmt.Sprintf("%v", this.Args) + `,`, - `Dir:` + fmt.Sprintf("%v", this.Dir) + `,`, - `Env:` + repeatedStringForEnv + `,`, - `ResourceLimits:` + strings.Replace(this.ResourceLimits.String(), "ResourceLimits", "ResourceLimits", 1) + `,`, - `User:` + fmt.Sprintf("%v", this.User) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `SuppressLogOutput:` + fmt.Sprintf("%v", this.SuppressLogOutput) + `,`, - `}`, - }, "") - return s -} -func (this *TimeoutAction) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TimeoutAction{`, - `Action:` + strings.Replace(this.Action.String(), "Action", "Action", 1) + `,`, - `DeprecatedTimeoutNs:` + fmt.Sprintf("%v", this.DeprecatedTimeoutNs) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `TimeoutMs:` + fmt.Sprintf("%v", this.TimeoutMs) + `,`, - `}`, - }, "") - return s -} -func (this *EmitProgressAction) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EmitProgressAction{`, - `Action:` + strings.Replace(this.Action.String(), "Action", "Action", 1) + `,`, - `StartMessage:` + fmt.Sprintf("%v", this.StartMessage) + `,`, - `SuccessMessage:` + fmt.Sprintf("%v", this.SuccessMessage) + `,`, - `FailureMessagePrefix:` + fmt.Sprintf("%v", this.FailureMessagePrefix) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `}`, - }, "") - return s -} -func (this *TryAction) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TryAction{`, - `Action:` + strings.Replace(this.Action.String(), "Action", "Action", 1) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `}`, - }, "") - return s -} -func (this *ParallelAction) String() string { - if this == nil { - return "nil" - } - repeatedStringForActions := "[]*Action{" - for _, f := range this.Actions { - repeatedStringForActions += strings.Replace(f.String(), "Action", "Action", 1) + "," - } - repeatedStringForActions += "}" - s := strings.Join([]string{`&ParallelAction{`, - `Actions:` + repeatedStringForActions + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `}`, - }, "") - return s -} -func (this *SerialAction) String() string { - if this == nil { - return "nil" - } - repeatedStringForActions := "[]*Action{" - for _, f := range this.Actions { - repeatedStringForActions += strings.Replace(f.String(), "Action", "Action", 1) + "," - } - repeatedStringForActions += "}" - s := strings.Join([]string{`&SerialAction{`, - `Actions:` + repeatedStringForActions + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `}`, - }, "") - return s -} -func (this *CodependentAction) String() string { - if this == nil { - return "nil" - } - repeatedStringForActions := "[]*Action{" - for _, f := range this.Actions { - repeatedStringForActions += strings.Replace(f.String(), "Action", "Action", 1) + "," - } - repeatedStringForActions += "}" - s := strings.Join([]string{`&CodependentAction{`, - `Actions:` + repeatedStringForActions + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `}`, - }, "") - return s -} -func (this *ResourceLimits) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ResourceLimits{`, - `OptionalNofile:` + fmt.Sprintf("%v", this.OptionalNofile) + `,`, - `OptionalNproc:` + fmt.Sprintf("%v", this.OptionalNproc) + `,`, - `}`, - }, "") - return s -} -func (this *ResourceLimits_Nofile) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ResourceLimits_Nofile{`, - `Nofile:` + fmt.Sprintf("%v", this.Nofile) + `,`, - `}`, - }, "") - return s -} -func (this *ResourceLimits_Nproc) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ResourceLimits_Nproc{`, - `Nproc:` + fmt.Sprintf("%v", this.Nproc) + `,`, - `}`, - }, "") - return s -} -func valueToStringActions(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *Action) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Action: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Action: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DownloadAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DownloadAction == nil { - m.DownloadAction = &DownloadAction{} - } - if err := m.DownloadAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field UploadAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.UploadAction == nil { - m.UploadAction = &UploadAction{} - } - if err := m.UploadAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RunAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.RunAction == nil { - m.RunAction = &RunAction{} - } - if err := m.RunAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TimeoutAction == nil { - m.TimeoutAction = &TimeoutAction{} - } - if err := m.TimeoutAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EmitProgressAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.EmitProgressAction == nil { - m.EmitProgressAction = &EmitProgressAction{} - } - if err := m.EmitProgressAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TryAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TryAction == nil { - m.TryAction = &TryAction{} - } - if err := m.TryAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ParallelAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ParallelAction == nil { - m.ParallelAction = &ParallelAction{} - } - if err := m.ParallelAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SerialAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.SerialAction == nil { - m.SerialAction = &SerialAction{} - } - if err := m.SerialAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CodependentAction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CodependentAction == nil { - m.CodependentAction = &CodependentAction{} - } - if err := m.CodependentAction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DownloadAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DownloadAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DownloadAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Artifact", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Artifact = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field From", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.From = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field To", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.To = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CacheKey", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CacheKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field User", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.User = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChecksumAlgorithm", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChecksumAlgorithm = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChecksumValue", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChecksumValue = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *UploadAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UploadAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UploadAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Artifact", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Artifact = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field From", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.From = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field To", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.To = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field User", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.User = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RunAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RunAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RunAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Path", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Path = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Args", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Args = append(m.Args, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Dir", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Dir = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Env", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Env = append(m.Env, &EnvironmentVariable{}) - if err := m.Env[len(m.Env)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ResourceLimits", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ResourceLimits == nil { - m.ResourceLimits = &ResourceLimits{} - } - if err := m.ResourceLimits.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field User", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.User = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SuppressLogOutput", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SuppressLogOutput = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TimeoutAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TimeoutAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TimeoutAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Action == nil { - m.Action = &Action{} - } - if err := m.Action.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedTimeoutNs", wireType) - } - m.DeprecatedTimeoutNs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedTimeoutNs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutMs", wireType) - } - m.TimeoutMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TimeoutMs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EmitProgressAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EmitProgressAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EmitProgressAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Action == nil { - m.Action = &Action{} - } - if err := m.Action.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StartMessage", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.StartMessage = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SuccessMessage", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SuccessMessage = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FailureMessagePrefix", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FailureMessagePrefix = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TryAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TryAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TryAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Action == nil { - m.Action = &Action{} - } - if err := m.Action.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ParallelAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ParallelAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ParallelAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Actions", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Actions = append(m.Actions, &Action{}) - if err := m.Actions[len(m.Actions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *SerialAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: SerialAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SerialAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Actions", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Actions = append(m.Actions, &Action{}) - if err := m.Actions[len(m.Actions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *CodependentAction) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CodependentAction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CodependentAction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Actions", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Actions = append(m.Actions, &Action{}) - if err := m.Actions[len(m.Actions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActions - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActions - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ResourceLimits) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ResourceLimits: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ResourceLimits: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Nofile", wireType) - } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.OptionalNofile = &ResourceLimits_Nofile{v} - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Nproc", wireType) - } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActions - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.OptionalNproc = &ResourceLimits_Nproc{v} - default: - iNdEx = preIndex - skippy, err := skipActions(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActions - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipActions(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActions - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActions - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActions - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthActions - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupActions - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthActions - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthActions = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowActions = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupActions = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/actual_lrp.gogoproto.go b/protomodels/actual_lrp.gogoproto.go deleted file mode 100644 index 10c22cf5..00000000 --- a/protomodels/actual_lrp.gogoproto.go +++ /dev/null @@ -1,3220 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: actual_lrp.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strconv "strconv" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type ActualLRPNetInfo_PreferredAddress int32 - -const ( - ActualLRPNetInfo_PreferredAddressUnknown ActualLRPNetInfo_PreferredAddress = 0 - ActualLRPNetInfo_PreferredAddressInstance ActualLRPNetInfo_PreferredAddress = 1 - ActualLRPNetInfo_PreferredAddressHost ActualLRPNetInfo_PreferredAddress = 2 -) - -var ActualLRPNetInfo_PreferredAddress_name = map[int32]string{ - 0: "UNKNOWN", - 1: "INSTANCE", - 2: "HOST", -} - -var ActualLRPNetInfo_PreferredAddress_value = map[string]int32{ - "UNKNOWN": 0, - "INSTANCE": 1, - "HOST": 2, -} - -func (ActualLRPNetInfo_PreferredAddress) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{4, 0} -} - -type ActualLRP_Presence int32 - -const ( - ActualLRP_Ordinary ActualLRP_Presence = 0 - ActualLRP_Evacuating ActualLRP_Presence = 1 - ActualLRP_Suspect ActualLRP_Presence = 2 -) - -var ActualLRP_Presence_name = map[int32]string{ - 0: "ORDINARY", - 1: "EVACUATING", - 2: "SUSPECT", -} - -var ActualLRP_Presence_value = map[string]int32{ - "ORDINARY": 0, - "EVACUATING": 1, - "SUSPECT": 2, -} - -func (ActualLRP_Presence) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{6, 0} -} - -// Deprecated: Do not use. -type ActualLRPGroup struct { - Instance *ActualLRP `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"` - Evacuating *ActualLRP `protobuf:"bytes,2,opt,name=evacuating,proto3" json:"evacuating,omitempty"` -} - -func (m *ActualLRPGroup) Reset() { *m = ActualLRPGroup{} } -func (*ActualLRPGroup) ProtoMessage() {} -func (*ActualLRPGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{0} -} -func (m *ActualLRPGroup) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPGroup.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPGroup) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPGroup.Merge(m, src) -} -func (m *ActualLRPGroup) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPGroup) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPGroup.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPGroup proto.InternalMessageInfo - -func (m *ActualLRPGroup) GetInstance() *ActualLRP { - if m != nil { - return m.Instance - } - return nil -} - -func (m *ActualLRPGroup) GetEvacuating() *ActualLRP { - if m != nil { - return m.Evacuating - } - return nil -} - -type PortMapping struct { - ContainerPort uint32 `protobuf:"varint,1,opt,name=container_port,json=containerPort,proto3" json:"container_port"` - HostPort uint32 `protobuf:"varint,2,opt,name=host_port,json=hostPort,proto3" json:"host_port"` - ContainerTlsProxyPort uint32 `protobuf:"varint,3,opt,name=container_tls_proxy_port,json=containerTlsProxyPort,proto3" json:"container_tls_proxy_port"` - HostTlsProxyPort uint32 `protobuf:"varint,4,opt,name=host_tls_proxy_port,json=hostTlsProxyPort,proto3" json:"host_tls_proxy_port"` -} - -func (m *PortMapping) Reset() { *m = PortMapping{} } -func (*PortMapping) ProtoMessage() {} -func (*PortMapping) Descriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{1} -} -func (m *PortMapping) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *PortMapping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_PortMapping.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *PortMapping) XXX_Merge(src proto.Message) { - xxx_messageInfo_PortMapping.Merge(m, src) -} -func (m *PortMapping) XXX_Size() int { - return m.Size() -} -func (m *PortMapping) XXX_DiscardUnknown() { - xxx_messageInfo_PortMapping.DiscardUnknown(m) -} - -var xxx_messageInfo_PortMapping proto.InternalMessageInfo - -func (m *PortMapping) GetContainerPort() uint32 { - if m != nil { - return m.ContainerPort - } - return 0 -} - -func (m *PortMapping) GetHostPort() uint32 { - if m != nil { - return m.HostPort - } - return 0 -} - -func (m *PortMapping) GetContainerTlsProxyPort() uint32 { - if m != nil { - return m.ContainerTlsProxyPort - } - return 0 -} - -func (m *PortMapping) GetHostTlsProxyPort() uint32 { - if m != nil { - return m.HostTlsProxyPort - } - return 0 -} - -type ActualLRPKey struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` - Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain"` -} - -func (m *ActualLRPKey) Reset() { *m = ActualLRPKey{} } -func (*ActualLRPKey) ProtoMessage() {} -func (*ActualLRPKey) Descriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{2} -} -func (m *ActualLRPKey) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPKey.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPKey) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPKey.Merge(m, src) -} -func (m *ActualLRPKey) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPKey) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPKey.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPKey proto.InternalMessageInfo - -func (m *ActualLRPKey) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *ActualLRPKey) GetIndex() int32 { - if m != nil { - return m.Index - } - return 0 -} - -func (m *ActualLRPKey) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -type ActualLRPInstanceKey struct { - InstanceGuid string `protobuf:"bytes,1,opt,name=instance_guid,json=instanceGuid,proto3" json:"instance_guid"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` -} - -func (m *ActualLRPInstanceKey) Reset() { *m = ActualLRPInstanceKey{} } -func (*ActualLRPInstanceKey) ProtoMessage() {} -func (*ActualLRPInstanceKey) Descriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{3} -} -func (m *ActualLRPInstanceKey) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPInstanceKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPInstanceKey.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPInstanceKey) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPInstanceKey.Merge(m, src) -} -func (m *ActualLRPInstanceKey) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPInstanceKey) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPInstanceKey.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPInstanceKey proto.InternalMessageInfo - -func (m *ActualLRPInstanceKey) GetInstanceGuid() string { - if m != nil { - return m.InstanceGuid - } - return "" -} - -func (m *ActualLRPInstanceKey) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -type ActualLRPNetInfo struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address"` - Ports []*PortMapping `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports"` - InstanceAddress string `protobuf:"bytes,3,opt,name=instance_address,json=instanceAddress,proto3" json:"instance_address,omitempty"` - PreferredAddress ActualLRPNetInfo_PreferredAddress `protobuf:"varint,4,opt,name=preferred_address,json=preferredAddress,proto3,enum=models.ActualLRPNetInfo_PreferredAddress" json:"preferred_address"` -} - -func (m *ActualLRPNetInfo) Reset() { *m = ActualLRPNetInfo{} } -func (*ActualLRPNetInfo) ProtoMessage() {} -func (*ActualLRPNetInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{4} -} -func (m *ActualLRPNetInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPNetInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPNetInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPNetInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPNetInfo.Merge(m, src) -} -func (m *ActualLRPNetInfo) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPNetInfo) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPNetInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPNetInfo proto.InternalMessageInfo - -func (m *ActualLRPNetInfo) GetAddress() string { - if m != nil { - return m.Address - } - return "" -} - -func (m *ActualLRPNetInfo) GetPorts() []*PortMapping { - if m != nil { - return m.Ports - } - return nil -} - -func (m *ActualLRPNetInfo) GetInstanceAddress() string { - if m != nil { - return m.InstanceAddress - } - return "" -} - -func (m *ActualLRPNetInfo) GetPreferredAddress() ActualLRPNetInfo_PreferredAddress { - if m != nil { - return m.PreferredAddress - } - return ActualLRPNetInfo_PreferredAddressUnknown -} - -type ActualLRPInternalRoute struct { - Hostname string `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname"` -} - -func (m *ActualLRPInternalRoute) Reset() { *m = ActualLRPInternalRoute{} } -func (*ActualLRPInternalRoute) ProtoMessage() {} -func (*ActualLRPInternalRoute) Descriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{5} -} -func (m *ActualLRPInternalRoute) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPInternalRoute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPInternalRoute.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPInternalRoute) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPInternalRoute.Merge(m, src) -} -func (m *ActualLRPInternalRoute) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPInternalRoute) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPInternalRoute.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPInternalRoute proto.InternalMessageInfo - -func (m *ActualLRPInternalRoute) GetHostname() string { - if m != nil { - return m.Hostname - } - return "" -} - -type ActualLRP struct { - ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3,embedded=actual_lrp_key" json:""` - ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3,embedded=actual_lrp_instance_key" json:""` - ActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3,embedded=actual_lrp_net_info" json:""` - CrashCount int32 `protobuf:"varint,4,opt,name=crash_count,json=crashCount,proto3" json:"crash_count"` - CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` - State string `protobuf:"bytes,6,opt,name=state,proto3" json:"state"` - PlacementError string `protobuf:"bytes,7,opt,name=placement_error,json=placementError,proto3" json:"placement_error,omitempty"` - Since int64 `protobuf:"varint,8,opt,name=since,proto3" json:"since"` - ModificationTag ModificationTag `protobuf:"bytes,9,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag"` - Presence ActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ActualLRP_Presence" json:"presence"` - ActualLrpInternalRoutes []*ActualLRPInternalRoute `protobuf:"bytes,11,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,12,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - // Types that are valid to be assigned to OptionalRoutable: - // *ActualLRP_Routable - OptionalRoutable isActualLRP_OptionalRoutable `protobuf_oneof:"optional_routable"` - AvailabilityZone string `protobuf:"bytes,14,opt,name=availability_zone,json=availabilityZone,proto3" json:"availability_zone"` -} - -func (m *ActualLRP) Reset() { *m = ActualLRP{} } -func (*ActualLRP) ProtoMessage() {} -func (*ActualLRP) Descriptor() ([]byte, []int) { - return fileDescriptor_25e5e77bfca46c1a, []int{6} -} -func (m *ActualLRP) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRP.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRP) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRP.Merge(m, src) -} -func (m *ActualLRP) XXX_Size() int { - return m.Size() -} -func (m *ActualLRP) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRP.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRP proto.InternalMessageInfo - -type isActualLRP_OptionalRoutable interface { - isActualLRP_OptionalRoutable() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} - -type ActualLRP_Routable struct { - Routable bool `protobuf:"varint,13,opt,name=routable,proto3,oneof" json:"routable"` -} - -func (*ActualLRP_Routable) isActualLRP_OptionalRoutable() {} - -func (m *ActualLRP) GetOptionalRoutable() isActualLRP_OptionalRoutable { - if m != nil { - return m.OptionalRoutable - } - return nil -} - -func (m *ActualLRP) GetCrashCount() int32 { - if m != nil { - return m.CrashCount - } - return 0 -} - -func (m *ActualLRP) GetCrashReason() string { - if m != nil { - return m.CrashReason - } - return "" -} - -func (m *ActualLRP) GetState() string { - if m != nil { - return m.State - } - return "" -} - -func (m *ActualLRP) GetPlacementError() string { - if m != nil { - return m.PlacementError - } - return "" -} - -func (m *ActualLRP) GetSince() int64 { - if m != nil { - return m.Since - } - return 0 -} - -func (m *ActualLRP) GetModificationTag() ModificationTag { - if m != nil { - return m.ModificationTag - } - return ModificationTag{} -} - -func (m *ActualLRP) GetPresence() ActualLRP_Presence { - if m != nil { - return m.Presence - } - return ActualLRP_Ordinary -} - -func (m *ActualLRP) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { - if m != nil { - return m.ActualLrpInternalRoutes - } - return nil -} - -func (m *ActualLRP) GetMetricTags() map[string]string { - if m != nil { - return m.MetricTags - } - return nil -} - -func (m *ActualLRP) GetRoutable() bool { - if x, ok := m.GetOptionalRoutable().(*ActualLRP_Routable); ok { - return x.Routable - } - return false -} - -func (m *ActualLRP) GetAvailabilityZone() string { - if m != nil { - return m.AvailabilityZone - } - return "" -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*ActualLRP) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*ActualLRP_Routable)(nil), - } -} - -func init() { - proto.RegisterEnum("models.ActualLRPNetInfo_PreferredAddress", ActualLRPNetInfo_PreferredAddress_name, ActualLRPNetInfo_PreferredAddress_value) - proto.RegisterEnum("models.ActualLRP_Presence", ActualLRP_Presence_name, ActualLRP_Presence_value) - proto.RegisterType((*ActualLRPGroup)(nil), "models.ActualLRPGroup") - proto.RegisterType((*PortMapping)(nil), "models.PortMapping") - proto.RegisterType((*ActualLRPKey)(nil), "models.ActualLRPKey") - proto.RegisterType((*ActualLRPInstanceKey)(nil), "models.ActualLRPInstanceKey") - proto.RegisterType((*ActualLRPNetInfo)(nil), "models.ActualLRPNetInfo") - proto.RegisterType((*ActualLRPInternalRoute)(nil), "models.ActualLRPInternalRoute") - proto.RegisterType((*ActualLRP)(nil), "models.ActualLRP") - proto.RegisterMapType((map[string]string)(nil), "models.ActualLRP.MetricTagsEntry") -} - -func init() { proto.RegisterFile("actual_lrp.proto", fileDescriptor_25e5e77bfca46c1a) } - -var fileDescriptor_25e5e77bfca46c1a = []byte{ - // 1187 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x56, 0x4d, 0x6f, 0xdb, 0x46, - 0x13, 0x16, 0xe5, 0xd8, 0x96, 0x46, 0xb2, 0x4c, 0xaf, 0x9d, 0x98, 0xd0, 0x1b, 0x90, 0x8a, 0xf0, - 0x16, 0x75, 0x02, 0xc4, 0x69, 0x9d, 0xa0, 0x68, 0x03, 0xf4, 0x60, 0x3a, 0x6e, 0x6c, 0x24, 0x91, - 0x8d, 0xb5, 0xdd, 0xa2, 0x1f, 0x80, 0xba, 0xa6, 0xd6, 0x0a, 0x11, 0x8a, 0x4b, 0x2c, 0x57, 0x6e, - 0xd4, 0x53, 0x8f, 0x85, 0xd1, 0x43, 0x81, 0x5e, 0x7a, 0xf1, 0xbd, 0xbf, 0xa1, 0xbf, 0x20, 0x47, - 0x1f, 0x73, 0x22, 0x1a, 0xe5, 0x52, 0xf0, 0x94, 0x9f, 0x50, 0xec, 0xf2, 0x23, 0xb4, 0x14, 0x9f, - 0x76, 0xf7, 0xd9, 0x99, 0x67, 0x86, 0x33, 0xcf, 0x8e, 0x04, 0x3a, 0x71, 0xc4, 0x90, 0x78, 0x5d, - 0x8f, 0x07, 0xeb, 0x01, 0x67, 0x82, 0xa1, 0xb9, 0x01, 0xeb, 0x51, 0x2f, 0x6c, 0xde, 0xed, 0xbb, - 0xe2, 0xf9, 0xf0, 0x78, 0xdd, 0x61, 0x83, 0x7b, 0x7d, 0xd6, 0x67, 0xf7, 0xd4, 0xf5, 0xf1, 0xf0, - 0x44, 0x9d, 0xd4, 0x41, 0xed, 0x12, 0xb7, 0xe6, 0x8d, 0x01, 0xeb, 0xb9, 0x27, 0xae, 0x43, 0x84, - 0xcb, 0xfc, 0xae, 0x20, 0xfd, 0x04, 0x6f, 0x9f, 0x42, 0x63, 0x53, 0x85, 0x78, 0x8a, 0xf7, 0x1f, - 0x73, 0x36, 0x0c, 0xd0, 0x5d, 0xa8, 0xb8, 0x7e, 0x28, 0x88, 0xef, 0x50, 0x43, 0x6b, 0x69, 0x6b, - 0xb5, 0x8d, 0xa5, 0xf5, 0x24, 0xe6, 0x7a, 0x6e, 0x89, 0x73, 0x13, 0xf4, 0x29, 0x00, 0x3d, 0x25, - 0xce, 0x90, 0x08, 0xd7, 0xef, 0x1b, 0xe5, 0xab, 0x1c, 0x0a, 0x46, 0x0f, 0xcb, 0x86, 0xd6, 0xfe, - 0xa3, 0x0c, 0xb5, 0x7d, 0xc6, 0xc5, 0x33, 0x12, 0x04, 0xae, 0xdf, 0x47, 0x5f, 0x40, 0xc3, 0x61, - 0xbe, 0x20, 0xae, 0x4f, 0x79, 0x37, 0x60, 0x5c, 0xa8, 0xd8, 0x0b, 0x36, 0x8a, 0x23, 0x6b, 0xe2, - 0x06, 0x2f, 0xe4, 0x67, 0xc9, 0x80, 0xee, 0x40, 0xf5, 0x39, 0x0b, 0x45, 0xe2, 0x55, 0x56, 0x5e, - 0x0b, 0x71, 0x64, 0xbd, 0x07, 0x71, 0x45, 0x6e, 0x95, 0xed, 0x11, 0x18, 0xef, 0xc9, 0x84, 0x17, - 0x76, 0x03, 0xce, 0x5e, 0x8e, 0x12, 0xd7, 0x19, 0xe5, 0x7a, 0x33, 0x8e, 0xac, 0x2b, 0x6d, 0xf0, - 0xf5, 0xfc, 0xe6, 0xd0, 0x0b, 0xf7, 0x25, 0xae, 0x68, 0xbf, 0x82, 0x65, 0x15, 0x6d, 0x82, 0xf1, - 0x9a, 0x62, 0x5c, 0x8d, 0x23, 0xeb, 0x43, 0xd7, 0x58, 0x97, 0x60, 0x91, 0xa7, 0xfd, 0xab, 0x06, - 0xf5, 0xbc, 0x66, 0x4f, 0xe8, 0x08, 0xdd, 0x87, 0x7a, 0xc0, 0x99, 0x43, 0xc3, 0xb0, 0xdb, 0x1f, - 0xba, 0x3d, 0x55, 0x94, 0xaa, 0xad, 0xc7, 0x91, 0x75, 0x09, 0xc7, 0xb5, 0xf4, 0xf4, 0x78, 0xe8, - 0xf6, 0x90, 0x05, 0xb3, 0xae, 0xdf, 0xa3, 0x2f, 0x55, 0x31, 0x66, 0xed, 0x6a, 0x1c, 0x59, 0x09, - 0x80, 0x93, 0x05, 0xb5, 0x61, 0xae, 0xc7, 0x06, 0xc4, 0xf5, 0xd5, 0x37, 0x57, 0x6d, 0x88, 0x23, - 0x2b, 0x45, 0x70, 0xba, 0xb6, 0x05, 0xac, 0xe4, 0x99, 0xec, 0xa6, 0xcd, 0x96, 0x19, 0x7d, 0x06, - 0x0b, 0x59, 0xef, 0x8b, 0x29, 0x2d, 0xc5, 0x91, 0x75, 0xf9, 0x02, 0xd7, 0xb3, 0xa3, 0x4a, 0xea, - 0xff, 0x30, 0xef, 0x50, 0xcf, 0xeb, 0xba, 0x3d, 0x95, 0x56, 0xd5, 0xae, 0xc5, 0x91, 0x95, 0x41, - 0x78, 0x4e, 0x6e, 0x76, 0x7b, 0xed, 0x3f, 0x67, 0x40, 0xcf, 0xc3, 0x76, 0xa8, 0xd8, 0xf5, 0x4f, - 0x18, 0xfa, 0x08, 0xe6, 0x49, 0xaf, 0xc7, 0x69, 0x18, 0xa6, 0xc1, 0x94, 0x6b, 0x0a, 0xe1, 0x6c, - 0x83, 0x1e, 0xc0, 0xac, 0x2c, 0x6b, 0x68, 0x94, 0x5b, 0x33, 0x6b, 0xb5, 0x8d, 0xe5, 0x4c, 0x84, - 0x05, 0x99, 0x25, 0xb5, 0x50, 0x56, 0x38, 0x59, 0xd0, 0x6d, 0xd0, 0xf3, 0xb4, 0xb3, 0x28, 0xaa, - 0x2a, 0x78, 0x31, 0xc3, 0x37, 0xd3, 0x00, 0x03, 0x58, 0x0a, 0x38, 0x3d, 0xa1, 0x9c, 0xd3, 0x5e, - 0x6e, 0x2b, 0x7b, 0xdc, 0xd8, 0xb8, 0x3d, 0xa5, 0xf8, 0x34, 0xf9, 0xf5, 0xfd, 0xcc, 0x23, 0x65, - 0xb1, 0xaf, 0xc7, 0x91, 0x35, 0xcd, 0x83, 0xf5, 0x60, 0xc2, 0xb0, 0xfd, 0x9b, 0x06, 0xfa, 0xa4, - 0x37, 0x5a, 0x83, 0xf9, 0xa3, 0xce, 0x93, 0xce, 0xde, 0x37, 0x1d, 0xbd, 0xd4, 0xfc, 0xdf, 0xd9, - 0x79, 0x6b, 0x75, 0xd2, 0xe4, 0xc8, 0x7f, 0xe1, 0xb3, 0x9f, 0x7c, 0x74, 0x07, 0x2a, 0xbb, 0x9d, - 0x83, 0xc3, 0xcd, 0xce, 0xd6, 0xb6, 0xae, 0x35, 0x6f, 0x9e, 0x9d, 0xb7, 0x8c, 0x49, 0xd3, 0xac, - 0xaf, 0xa8, 0x0d, 0xd7, 0x76, 0xf6, 0x0e, 0x0e, 0xf5, 0x72, 0xd3, 0x38, 0x3b, 0x6f, 0xad, 0x4c, - 0xda, 0xed, 0xb0, 0x50, 0xb4, 0x6d, 0xb8, 0x51, 0x10, 0x84, 0xa0, 0xdc, 0x27, 0x1e, 0x66, 0x43, - 0x41, 0xd1, 0x1a, 0xa8, 0x07, 0xe6, 0x93, 0x01, 0x4d, 0x1b, 0x54, 0x8f, 0x23, 0x2b, 0xc7, 0x70, - 0xbe, 0x6b, 0xff, 0x5d, 0x81, 0x6a, 0x4e, 0x82, 0x76, 0xa0, 0xf1, 0x7e, 0xbc, 0x75, 0x5f, 0xd0, - 0x51, 0x3a, 0x6f, 0x56, 0xa6, 0x8a, 0xf9, 0x84, 0x8e, 0xec, 0xfa, 0xab, 0xc8, 0x2a, 0x5d, 0x44, - 0x96, 0x16, 0x47, 0x56, 0x09, 0xd7, 0x13, 0xcf, 0xa7, 0x3c, 0x90, 0xa2, 0x24, 0xb0, 0x5a, 0x60, - 0xca, 0xfb, 0x29, 0x29, 0x93, 0x89, 0x74, 0x73, 0x8a, 0xb2, 0xa0, 0xe9, 0x09, 0xea, 0x95, 0x9c, - 0xba, 0xa8, 0xfb, 0x23, 0x58, 0x2e, 0x84, 0xf0, 0xa9, 0xe8, 0xba, 0xfe, 0x09, 0x53, 0x52, 0xa9, - 0x6d, 0x18, 0x57, 0xb5, 0x7f, 0x82, 0x5a, 0xcf, 0xa9, 0x33, 0x6d, 0x7f, 0x02, 0x35, 0x87, 0x93, - 0xf0, 0x79, 0xd7, 0x61, 0x43, 0x3f, 0x99, 0x18, 0xb3, 0xf6, 0x62, 0x1c, 0x59, 0x45, 0x18, 0x83, - 0x3a, 0x6c, 0xc9, 0x3d, 0xba, 0x05, 0xf5, 0xe4, 0x8a, 0x53, 0x12, 0x32, 0xdf, 0x98, 0x55, 0x62, - 0x4d, 0xcc, 0xb1, 0x82, 0xe4, 0x00, 0x08, 0x05, 0x11, 0xd4, 0x98, 0x53, 0xdd, 0x50, 0xa2, 0x57, - 0x00, 0x4e, 0x16, 0xf4, 0x31, 0x2c, 0x06, 0x1e, 0x71, 0xe8, 0x80, 0xfa, 0xa2, 0x4b, 0x39, 0x67, - 0xdc, 0x98, 0x57, 0x34, 0x8d, 0x1c, 0xde, 0x96, 0xa8, 0x62, 0x72, 0xe5, 0x2f, 0x41, 0xa5, 0xa5, - 0xad, 0xcd, 0xa4, 0x4c, 0x12, 0xc0, 0xc9, 0x82, 0x7e, 0x00, 0x7d, 0xf2, 0x97, 0xc5, 0xa8, 0xaa, - 0x9a, 0xac, 0x66, 0x35, 0x79, 0x56, 0xb8, 0x3f, 0x24, 0x7d, 0xdb, 0x90, 0x25, 0x89, 0x23, 0x6b, - 0xca, 0x11, 0x2f, 0x0e, 0x2e, 0x9b, 0xa2, 0x47, 0x50, 0x09, 0x38, 0x0d, 0xa9, 0xcc, 0x00, 0xd4, - 0x43, 0x6b, 0x4e, 0x55, 0x5a, 0xbe, 0x30, 0x65, 0x91, 0xa8, 0x2e, 0xb3, 0xc7, 0xf9, 0x0e, 0x7d, - 0x0f, 0xcd, 0x4b, 0xea, 0x48, 0xb4, 0xdb, 0xe5, 0x52, 0xbc, 0xa1, 0x51, 0x53, 0xd3, 0xc2, 0xfc, - 0x80, 0x40, 0x0a, 0x1a, 0xc7, 0xab, 0x05, 0x51, 0x14, 0xf0, 0x10, 0xd9, 0x50, 0x1b, 0x50, 0xc1, - 0x5d, 0x47, 0x7e, 0x41, 0x68, 0xd4, 0x15, 0xdb, 0xad, 0xe9, 0x2c, 0x9f, 0x29, 0xa3, 0x43, 0xd2, - 0x0f, 0xb7, 0x7d, 0xc1, 0x47, 0x18, 0x06, 0x39, 0x20, 0x9f, 0xaa, 0x4c, 0x86, 0x1c, 0x7b, 0xd4, - 0x58, 0x68, 0x69, 0x6b, 0x95, 0xe4, 0x53, 0x32, 0x6c, 0xa7, 0x84, 0xf3, 0x3d, 0xb2, 0x61, 0x89, - 0x9c, 0x12, 0xd7, 0x23, 0xc7, 0xae, 0xe7, 0x8a, 0x51, 0xf7, 0x67, 0xe6, 0x53, 0xa3, 0xa1, 0xfa, - 0xac, 0x26, 0xcb, 0xd4, 0x25, 0xd6, 0x8b, 0xd0, 0x77, 0xcc, 0xa7, 0xcd, 0x2f, 0x61, 0x71, 0x22, - 0x1d, 0xa4, 0xc3, 0x4c, 0xf6, 0x00, 0xab, 0x58, 0x6e, 0xd1, 0x0a, 0xcc, 0x9e, 0x12, 0x6f, 0x48, - 0x93, 0x71, 0x8d, 0x93, 0xc3, 0xc3, 0xf2, 0xe7, 0x5a, 0xfb, 0x47, 0xa8, 0x64, 0x35, 0x47, 0x4d, - 0xa8, 0xec, 0xe1, 0x47, 0xbb, 0x9d, 0x4d, 0xfc, 0xad, 0x5e, 0x6a, 0xd6, 0xcf, 0xce, 0x5b, 0x95, - 0x3d, 0xde, 0x73, 0x7d, 0xc2, 0x47, 0xc8, 0x04, 0xd8, 0xfe, 0x7a, 0x73, 0xeb, 0x68, 0xf3, 0x70, - 0xb7, 0xf3, 0x58, 0xd7, 0x9a, 0x8d, 0xb3, 0xf3, 0x16, 0x6c, 0xe7, 0xff, 0x03, 0x90, 0x01, 0xf3, - 0x07, 0x47, 0x07, 0xfb, 0xdb, 0x5b, 0x72, 0xf0, 0xd4, 0xce, 0xce, 0x5b, 0xf3, 0x07, 0xc3, 0x30, - 0xa0, 0x8e, 0xb0, 0x97, 0x61, 0x89, 0x05, 0x52, 0x04, 0x69, 0x9b, 0xe4, 0x97, 0xdb, 0x0f, 0x2e, - 0xde, 0x98, 0xda, 0xeb, 0x37, 0x66, 0xe9, 0xdd, 0x1b, 0x53, 0xfb, 0x65, 0x6c, 0x6a, 0x7f, 0x8d, - 0x4d, 0xed, 0xd5, 0xd8, 0xd4, 0x2e, 0xc6, 0xa6, 0xf6, 0xcf, 0xd8, 0xd4, 0xfe, 0x1d, 0x9b, 0xa5, - 0x77, 0x63, 0x53, 0xfb, 0xfd, 0xad, 0x59, 0xba, 0x78, 0x6b, 0x96, 0x5e, 0xbf, 0x35, 0x4b, 0xc7, - 0x73, 0xea, 0x7f, 0xce, 0xfd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xf8, 0x7a, 0x0a, 0x4a, - 0x09, 0x00, 0x00, -} - -func (x ActualLRPNetInfo_PreferredAddress) String() string { - s, ok := ActualLRPNetInfo_PreferredAddress_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (x ActualLRP_Presence) String() string { - s, ok := ActualLRP_Presence_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (this *ActualLRPGroup) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPGroup) - if !ok { - that2, ok := that.(ActualLRPGroup) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Instance.Equal(that1.Instance) { - return false - } - if !this.Evacuating.Equal(that1.Evacuating) { - return false - } - return true -} -func (this *PortMapping) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*PortMapping) - if !ok { - that2, ok := that.(PortMapping) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ContainerPort != that1.ContainerPort { - return false - } - if this.HostPort != that1.HostPort { - return false - } - if this.ContainerTlsProxyPort != that1.ContainerTlsProxyPort { - return false - } - if this.HostTlsProxyPort != that1.HostTlsProxyPort { - return false - } - return true -} -func (this *ActualLRPKey) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPKey) - if !ok { - that2, ok := that.(ActualLRPKey) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if this.Index != that1.Index { - return false - } - if this.Domain != that1.Domain { - return false - } - return true -} -func (this *ActualLRPInstanceKey) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPInstanceKey) - if !ok { - that2, ok := that.(ActualLRPInstanceKey) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.InstanceGuid != that1.InstanceGuid { - return false - } - if this.CellId != that1.CellId { - return false - } - return true -} -func (this *ActualLRPNetInfo) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPNetInfo) - if !ok { - that2, ok := that.(ActualLRPNetInfo) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Address != that1.Address { - return false - } - if len(this.Ports) != len(that1.Ports) { - return false - } - for i := range this.Ports { - if !this.Ports[i].Equal(that1.Ports[i]) { - return false - } - } - if this.InstanceAddress != that1.InstanceAddress { - return false - } - if this.PreferredAddress != that1.PreferredAddress { - return false - } - return true -} -func (this *ActualLRPInternalRoute) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPInternalRoute) - if !ok { - that2, ok := that.(ActualLRPInternalRoute) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Hostname != that1.Hostname { - return false - } - return true -} -func (this *ActualLRP) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRP) - if !ok { - that2, ok := that.(ActualLRP) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLRPKey.Equal(&that1.ActualLRPKey) { - return false - } - if !this.ActualLRPInstanceKey.Equal(&that1.ActualLRPInstanceKey) { - return false - } - if !this.ActualLRPNetInfo.Equal(&that1.ActualLRPNetInfo) { - return false - } - if this.CrashCount != that1.CrashCount { - return false - } - if this.CrashReason != that1.CrashReason { - return false - } - if this.State != that1.State { - return false - } - if this.PlacementError != that1.PlacementError { - return false - } - if this.Since != that1.Since { - return false - } - if !this.ModificationTag.Equal(&that1.ModificationTag) { - return false - } - if this.Presence != that1.Presence { - return false - } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { - return false - } - for i := range this.ActualLrpInternalRoutes { - if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { - return false - } - } - if len(this.MetricTags) != len(that1.MetricTags) { - return false - } - for i := range this.MetricTags { - if this.MetricTags[i] != that1.MetricTags[i] { - return false - } - } - if that1.OptionalRoutable == nil { - if this.OptionalRoutable != nil { - return false - } - } else if this.OptionalRoutable == nil { - return false - } else if !this.OptionalRoutable.Equal(that1.OptionalRoutable) { - return false - } - if this.AvailabilityZone != that1.AvailabilityZone { - return false - } - return true -} -func (this *ActualLRP_Routable) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRP_Routable) - if !ok { - that2, ok := that.(ActualLRP_Routable) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Routable != that1.Routable { - return false - } - return true -} -func (this *ActualLRPGroup) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPGroup{") - if this.Instance != nil { - s = append(s, "Instance: "+fmt.Sprintf("%#v", this.Instance)+",\n") - } - if this.Evacuating != nil { - s = append(s, "Evacuating: "+fmt.Sprintf("%#v", this.Evacuating)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *PortMapping) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.PortMapping{") - s = append(s, "ContainerPort: "+fmt.Sprintf("%#v", this.ContainerPort)+",\n") - s = append(s, "HostPort: "+fmt.Sprintf("%#v", this.HostPort)+",\n") - s = append(s, "ContainerTlsProxyPort: "+fmt.Sprintf("%#v", this.ContainerTlsProxyPort)+",\n") - s = append(s, "HostTlsProxyPort: "+fmt.Sprintf("%#v", this.HostTlsProxyPort)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPKey) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.ActualLRPKey{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "Index: "+fmt.Sprintf("%#v", this.Index)+",\n") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPInstanceKey) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPInstanceKey{") - s = append(s, "InstanceGuid: "+fmt.Sprintf("%#v", this.InstanceGuid)+",\n") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPNetInfo) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.ActualLRPNetInfo{") - s = append(s, "Address: "+fmt.Sprintf("%#v", this.Address)+",\n") - if this.Ports != nil { - s = append(s, "Ports: "+fmt.Sprintf("%#v", this.Ports)+",\n") - } - s = append(s, "InstanceAddress: "+fmt.Sprintf("%#v", this.InstanceAddress)+",\n") - s = append(s, "PreferredAddress: "+fmt.Sprintf("%#v", this.PreferredAddress)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPInternalRoute) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.ActualLRPInternalRoute{") - s = append(s, "Hostname: "+fmt.Sprintf("%#v", this.Hostname)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRP) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 18) - s = append(s, "&models.ActualLRP{") - s = append(s, "ActualLRPKey: "+strings.Replace(this.ActualLRPKey.GoString(), `&`, ``, 1)+",\n") - s = append(s, "ActualLRPInstanceKey: "+strings.Replace(this.ActualLRPInstanceKey.GoString(), `&`, ``, 1)+",\n") - s = append(s, "ActualLRPNetInfo: "+strings.Replace(this.ActualLRPNetInfo.GoString(), `&`, ``, 1)+",\n") - s = append(s, "CrashCount: "+fmt.Sprintf("%#v", this.CrashCount)+",\n") - s = append(s, "CrashReason: "+fmt.Sprintf("%#v", this.CrashReason)+",\n") - s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n") - s = append(s, "PlacementError: "+fmt.Sprintf("%#v", this.PlacementError)+",\n") - s = append(s, "Since: "+fmt.Sprintf("%#v", this.Since)+",\n") - s = append(s, "ModificationTag: "+strings.Replace(this.ModificationTag.GoString(), `&`, ``, 1)+",\n") - s = append(s, "Presence: "+fmt.Sprintf("%#v", this.Presence)+",\n") - if this.ActualLrpInternalRoutes != nil { - s = append(s, "ActualLrpInternalRoutes: "+fmt.Sprintf("%#v", this.ActualLrpInternalRoutes)+",\n") - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]string{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%#v: %#v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - if this.MetricTags != nil { - s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") - } - if this.OptionalRoutable != nil { - s = append(s, "OptionalRoutable: "+fmt.Sprintf("%#v", this.OptionalRoutable)+",\n") - } - s = append(s, "AvailabilityZone: "+fmt.Sprintf("%#v", this.AvailabilityZone)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRP_Routable) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.ActualLRP_Routable{` + - `Routable:` + fmt.Sprintf("%#v", this.Routable) + `}`}, ", ") - return s -} -func valueToGoStringActualLrp(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *ActualLRPGroup) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPGroup) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Evacuating != nil { - { - size, err := m.Evacuating.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Instance != nil { - { - size, err := m.Instance.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *PortMapping) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *PortMapping) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *PortMapping) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.HostTlsProxyPort != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.HostTlsProxyPort)) - i-- - dAtA[i] = 0x20 - } - if m.ContainerTlsProxyPort != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.ContainerTlsProxyPort)) - i-- - dAtA[i] = 0x18 - } - if m.HostPort != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.HostPort)) - i-- - dAtA[i] = 0x10 - } - if m.ContainerPort != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.ContainerPort)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPKey) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPKey) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0x1a - } - if m.Index != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.Index)) - i-- - dAtA[i] = 0x10 - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPInstanceKey) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPInstanceKey) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPInstanceKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0x12 - } - if len(m.InstanceGuid) > 0 { - i -= len(m.InstanceGuid) - copy(dAtA[i:], m.InstanceGuid) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.InstanceGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPNetInfo) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPNetInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPNetInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.PreferredAddress != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.PreferredAddress)) - i-- - dAtA[i] = 0x20 - } - if len(m.InstanceAddress) > 0 { - i -= len(m.InstanceAddress) - copy(dAtA[i:], m.InstanceAddress) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.InstanceAddress))) - i-- - dAtA[i] = 0x1a - } - if len(m.Ports) > 0 { - for iNdEx := len(m.Ports) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Ports[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPInternalRoute) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPInternalRoute) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPInternalRoute) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Hostname) > 0 { - i -= len(m.Hostname) - copy(dAtA[i:], m.Hostname) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.Hostname))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRP) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRP) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRP) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.AvailabilityZone) > 0 { - i -= len(m.AvailabilityZone) - copy(dAtA[i:], m.AvailabilityZone) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.AvailabilityZone))) - i-- - dAtA[i] = 0x72 - } - if m.OptionalRoutable != nil { - { - size := m.OptionalRoutable.Size() - i -= size - if _, err := m.OptionalRoutable.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if len(m.MetricTags) > 0 { - for k := range m.MetricTags { - v := m.MetricTags[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintActualLrp(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintActualLrp(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintActualLrp(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x62 - } - } - if len(m.ActualLrpInternalRoutes) > 0 { - for iNdEx := len(m.ActualLrpInternalRoutes) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ActualLrpInternalRoutes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x5a - } - } - if m.Presence != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.Presence)) - i-- - dAtA[i] = 0x50 - } - { - size, err := m.ModificationTag.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - if m.Since != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.Since)) - i-- - dAtA[i] = 0x40 - } - if len(m.PlacementError) > 0 { - i -= len(m.PlacementError) - copy(dAtA[i:], m.PlacementError) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.PlacementError))) - i-- - dAtA[i] = 0x3a - } - if len(m.State) > 0 { - i -= len(m.State) - copy(dAtA[i:], m.State) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.State))) - i-- - dAtA[i] = 0x32 - } - if len(m.CrashReason) > 0 { - i -= len(m.CrashReason) - copy(dAtA[i:], m.CrashReason) - i = encodeVarintActualLrp(dAtA, i, uint64(len(m.CrashReason))) - i-- - dAtA[i] = 0x2a - } - if m.CrashCount != 0 { - i = encodeVarintActualLrp(dAtA, i, uint64(m.CrashCount)) - i-- - dAtA[i] = 0x20 - } - { - size, err := m.ActualLRPNetInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - { - size, err := m.ActualLRPInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size, err := m.ActualLRPKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *ActualLRP_Routable) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRP_Routable) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i-- - if m.Routable { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x68 - return len(dAtA) - i, nil -} -func encodeVarintActualLrp(dAtA []byte, offset int, v uint64) int { - offset -= sovActualLrp(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *ActualLRPGroup) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Instance != nil { - l = m.Instance.Size() - n += 1 + l + sovActualLrp(uint64(l)) - } - if m.Evacuating != nil { - l = m.Evacuating.Size() - n += 1 + l + sovActualLrp(uint64(l)) - } - return n -} - -func (m *PortMapping) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ContainerPort != 0 { - n += 1 + sovActualLrp(uint64(m.ContainerPort)) - } - if m.HostPort != 0 { - n += 1 + sovActualLrp(uint64(m.HostPort)) - } - if m.ContainerTlsProxyPort != 0 { - n += 1 + sovActualLrp(uint64(m.ContainerTlsProxyPort)) - } - if m.HostTlsProxyPort != 0 { - n += 1 + sovActualLrp(uint64(m.HostTlsProxyPort)) - } - return n -} - -func (m *ActualLRPKey) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - if m.Index != 0 { - n += 1 + sovActualLrp(uint64(m.Index)) - } - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - return n -} - -func (m *ActualLRPInstanceKey) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.InstanceGuid) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - return n -} - -func (m *ActualLRPNetInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Address) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - if len(m.Ports) > 0 { - for _, e := range m.Ports { - l = e.Size() - n += 1 + l + sovActualLrp(uint64(l)) - } - } - l = len(m.InstanceAddress) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - if m.PreferredAddress != 0 { - n += 1 + sovActualLrp(uint64(m.PreferredAddress)) - } - return n -} - -func (m *ActualLRPInternalRoute) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Hostname) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - return n -} - -func (m *ActualLRP) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.ActualLRPKey.Size() - n += 1 + l + sovActualLrp(uint64(l)) - l = m.ActualLRPInstanceKey.Size() - n += 1 + l + sovActualLrp(uint64(l)) - l = m.ActualLRPNetInfo.Size() - n += 1 + l + sovActualLrp(uint64(l)) - if m.CrashCount != 0 { - n += 1 + sovActualLrp(uint64(m.CrashCount)) - } - l = len(m.CrashReason) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - l = len(m.State) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - l = len(m.PlacementError) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - if m.Since != 0 { - n += 1 + sovActualLrp(uint64(m.Since)) - } - l = m.ModificationTag.Size() - n += 1 + l + sovActualLrp(uint64(l)) - if m.Presence != 0 { - n += 1 + sovActualLrp(uint64(m.Presence)) - } - if len(m.ActualLrpInternalRoutes) > 0 { - for _, e := range m.ActualLrpInternalRoutes { - l = e.Size() - n += 1 + l + sovActualLrp(uint64(l)) - } - } - if len(m.MetricTags) > 0 { - for k, v := range m.MetricTags { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovActualLrp(uint64(len(k))) + 1 + len(v) + sovActualLrp(uint64(len(v))) - n += mapEntrySize + 1 + sovActualLrp(uint64(mapEntrySize)) - } - } - if m.OptionalRoutable != nil { - n += m.OptionalRoutable.Size() - } - l = len(m.AvailabilityZone) - if l > 0 { - n += 1 + l + sovActualLrp(uint64(l)) - } - return n -} - -func (m *ActualLRP_Routable) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 2 - return n -} - -func sovActualLrp(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozActualLrp(x uint64) (n int) { - return sovActualLrp(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *ActualLRPGroup) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPGroup{`, - `Instance:` + strings.Replace(this.Instance.String(), "ActualLRP", "ActualLRP", 1) + `,`, - `Evacuating:` + strings.Replace(this.Evacuating.String(), "ActualLRP", "ActualLRP", 1) + `,`, - `}`, - }, "") - return s -} -func (this *PortMapping) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&PortMapping{`, - `ContainerPort:` + fmt.Sprintf("%v", this.ContainerPort) + `,`, - `HostPort:` + fmt.Sprintf("%v", this.HostPort) + `,`, - `ContainerTlsProxyPort:` + fmt.Sprintf("%v", this.ContainerTlsProxyPort) + `,`, - `HostTlsProxyPort:` + fmt.Sprintf("%v", this.HostTlsProxyPort) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPKey) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPKey{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `Index:` + fmt.Sprintf("%v", this.Index) + `,`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPInstanceKey) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPInstanceKey{`, - `InstanceGuid:` + fmt.Sprintf("%v", this.InstanceGuid) + `,`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPNetInfo) String() string { - if this == nil { - return "nil" - } - repeatedStringForPorts := "[]*PortMapping{" - for _, f := range this.Ports { - repeatedStringForPorts += strings.Replace(f.String(), "PortMapping", "PortMapping", 1) + "," - } - repeatedStringForPorts += "}" - s := strings.Join([]string{`&ActualLRPNetInfo{`, - `Address:` + fmt.Sprintf("%v", this.Address) + `,`, - `Ports:` + repeatedStringForPorts + `,`, - `InstanceAddress:` + fmt.Sprintf("%v", this.InstanceAddress) + `,`, - `PreferredAddress:` + fmt.Sprintf("%v", this.PreferredAddress) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPInternalRoute) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPInternalRoute{`, - `Hostname:` + fmt.Sprintf("%v", this.Hostname) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRP) String() string { - if this == nil { - return "nil" - } - repeatedStringForActualLrpInternalRoutes := "[]*ActualLRPInternalRoute{" - for _, f := range this.ActualLrpInternalRoutes { - repeatedStringForActualLrpInternalRoutes += strings.Replace(f.String(), "ActualLRPInternalRoute", "ActualLRPInternalRoute", 1) + "," - } - repeatedStringForActualLrpInternalRoutes += "}" - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]string{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%v: %v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - s := strings.Join([]string{`&ActualLRP{`, - `ActualLRPKey:` + strings.Replace(strings.Replace(this.ActualLRPKey.String(), "ActualLRPKey", "ActualLRPKey", 1), `&`, ``, 1) + `,`, - `ActualLRPInstanceKey:` + strings.Replace(strings.Replace(this.ActualLRPInstanceKey.String(), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1), `&`, ``, 1) + `,`, - `ActualLRPNetInfo:` + strings.Replace(strings.Replace(this.ActualLRPNetInfo.String(), "ActualLRPNetInfo", "ActualLRPNetInfo", 1), `&`, ``, 1) + `,`, - `CrashCount:` + fmt.Sprintf("%v", this.CrashCount) + `,`, - `CrashReason:` + fmt.Sprintf("%v", this.CrashReason) + `,`, - `State:` + fmt.Sprintf("%v", this.State) + `,`, - `PlacementError:` + fmt.Sprintf("%v", this.PlacementError) + `,`, - `Since:` + fmt.Sprintf("%v", this.Since) + `,`, - `ModificationTag:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ModificationTag), "ModificationTag", "ModificationTag", 1), `&`, ``, 1) + `,`, - `Presence:` + fmt.Sprintf("%v", this.Presence) + `,`, - `ActualLrpInternalRoutes:` + repeatedStringForActualLrpInternalRoutes + `,`, - `MetricTags:` + mapStringForMetricTags + `,`, - `OptionalRoutable:` + fmt.Sprintf("%v", this.OptionalRoutable) + `,`, - `AvailabilityZone:` + fmt.Sprintf("%v", this.AvailabilityZone) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRP_Routable) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRP_Routable{`, - `Routable:` + fmt.Sprintf("%v", this.Routable) + `,`, - `}`, - }, "") - return s -} -func valueToStringActualLrp(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *ActualLRPGroup) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPGroup: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPGroup: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Instance", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Instance == nil { - m.Instance = &ActualLRP{} - } - if err := m.Instance.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Evacuating", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Evacuating == nil { - m.Evacuating = &ActualLRP{} - } - if err := m.Evacuating.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *PortMapping) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: PortMapping: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: PortMapping: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ContainerPort", wireType) - } - m.ContainerPort = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ContainerPort |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field HostPort", wireType) - } - m.HostPort = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.HostPort |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ContainerTlsProxyPort", wireType) - } - m.ContainerTlsProxyPort = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ContainerTlsProxyPort |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field HostTlsProxyPort", wireType) - } - m.HostTlsProxyPort = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.HostTlsProxyPort |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPKey) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPKey: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPKey: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - m.Index = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Index |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPInstanceKey) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPInstanceKey: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPInstanceKey: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InstanceGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.InstanceGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPNetInfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPNetInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPNetInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ports", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Ports = append(m.Ports, &PortMapping{}) - if err := m.Ports[len(m.Ports)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InstanceAddress", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.InstanceAddress = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PreferredAddress", wireType) - } - m.PreferredAddress = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PreferredAddress |= ActualLRPNetInfo_PreferredAddress(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPInternalRoute) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPInternalRoute: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPInternalRoute: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hostname", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Hostname = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRP) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRP: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRP: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPNetInfo", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPNetInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CrashCount", wireType) - } - m.CrashCount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CrashCount |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CrashReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CrashReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field State", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.State = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PlacementError", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PlacementError = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Since", wireType) - } - m.Since = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Since |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ModificationTag", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ModificationTag.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Presence", wireType) - } - m.Presence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Presence |= ActualLRP_Presence(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInternalRoutes", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ActualLrpInternalRoutes = append(m.ActualLrpInternalRoutes, &ActualLRPInternalRoute{}) - if err := m.ActualLrpInternalRoutes[len(m.ActualLrpInternalRoutes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 12: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricTags", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MetricTags == nil { - m.MetricTags = make(map[string]string) - } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthActualLrp - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthActualLrp - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthActualLrp - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthActualLrp - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.MetricTags[mapkey] = mapvalue - iNdEx = postIndex - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Routable", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - b := bool(v != 0) - m.OptionalRoutable = &ActualLRP_Routable{b} - case 14: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AvailabilityZone", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AvailabilityZone = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipActualLrp(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActualLrp - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActualLrp - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActualLrp - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthActualLrp - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupActualLrp - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthActualLrp - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthActualLrp = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowActualLrp = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupActualLrp = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/actual_lrp_requests.gogoproto.go b/protomodels/actual_lrp_requests.gogoproto.go deleted file mode 100644 index 48b9f7dc..00000000 --- a/protomodels/actual_lrp_requests.gogoproto.go +++ /dev/null @@ -1,4872 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: actual_lrp_requests.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type ActualLRPLifecycleResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` -} - -func (m *ActualLRPLifecycleResponse) Reset() { *m = ActualLRPLifecycleResponse{} } -func (*ActualLRPLifecycleResponse) ProtoMessage() {} -func (*ActualLRPLifecycleResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{0} -} -func (m *ActualLRPLifecycleResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPLifecycleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPLifecycleResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPLifecycleResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPLifecycleResponse.Merge(m, src) -} -func (m *ActualLRPLifecycleResponse) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPLifecycleResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPLifecycleResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPLifecycleResponse proto.InternalMessageInfo - -func (m *ActualLRPLifecycleResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -// Deprecated: Do not use. -type ActualLRPGroupsResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrpGroups []*ActualLRPGroup `protobuf:"bytes,2,rep,name=actual_lrp_groups,json=actualLrpGroups,proto3" json:"actual_lrp_groups,omitempty"` -} - -func (m *ActualLRPGroupsResponse) Reset() { *m = ActualLRPGroupsResponse{} } -func (*ActualLRPGroupsResponse) ProtoMessage() {} -func (*ActualLRPGroupsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{1} -} -func (m *ActualLRPGroupsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPGroupsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPGroupsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPGroupsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPGroupsResponse.Merge(m, src) -} -func (m *ActualLRPGroupsResponse) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPGroupsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPGroupsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPGroupsResponse proto.InternalMessageInfo - -func (m *ActualLRPGroupsResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *ActualLRPGroupsResponse) GetActualLrpGroups() []*ActualLRPGroup { - if m != nil { - return m.ActualLrpGroups - } - return nil -} - -// Deprecated: Do not use. -type ActualLRPGroupResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrpGroup *ActualLRPGroup `protobuf:"bytes,2,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` -} - -func (m *ActualLRPGroupResponse) Reset() { *m = ActualLRPGroupResponse{} } -func (*ActualLRPGroupResponse) ProtoMessage() {} -func (*ActualLRPGroupResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{2} -} -func (m *ActualLRPGroupResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPGroupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPGroupResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPGroupResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPGroupResponse.Merge(m, src) -} -func (m *ActualLRPGroupResponse) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPGroupResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPGroupResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPGroupResponse proto.InternalMessageInfo - -func (m *ActualLRPGroupResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *ActualLRPGroupResponse) GetActualLrpGroup() *ActualLRPGroup { - if m != nil { - return m.ActualLrpGroup - } - return nil -} - -// Deprecated: Do not use. -type ActualLRPGroupsRequest struct { - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` -} - -func (m *ActualLRPGroupsRequest) Reset() { *m = ActualLRPGroupsRequest{} } -func (*ActualLRPGroupsRequest) ProtoMessage() {} -func (*ActualLRPGroupsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{3} -} -func (m *ActualLRPGroupsRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPGroupsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPGroupsRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPGroupsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPGroupsRequest.Merge(m, src) -} -func (m *ActualLRPGroupsRequest) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPGroupsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPGroupsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPGroupsRequest proto.InternalMessageInfo - -func (m *ActualLRPGroupsRequest) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *ActualLRPGroupsRequest) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -// Deprecated: Do not use. -type ActualLRPGroupsByProcessGuidRequest struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` -} - -func (m *ActualLRPGroupsByProcessGuidRequest) Reset() { *m = ActualLRPGroupsByProcessGuidRequest{} } -func (*ActualLRPGroupsByProcessGuidRequest) ProtoMessage() {} -func (*ActualLRPGroupsByProcessGuidRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{4} -} -func (m *ActualLRPGroupsByProcessGuidRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPGroupsByProcessGuidRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPGroupsByProcessGuidRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPGroupsByProcessGuidRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPGroupsByProcessGuidRequest.Merge(m, src) -} -func (m *ActualLRPGroupsByProcessGuidRequest) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPGroupsByProcessGuidRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPGroupsByProcessGuidRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPGroupsByProcessGuidRequest proto.InternalMessageInfo - -func (m *ActualLRPGroupsByProcessGuidRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -// Deprecated: Do not use. -type ActualLRPGroupByProcessGuidAndIndexRequest struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` -} - -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) Reset() { - *m = ActualLRPGroupByProcessGuidAndIndexRequest{} -} -func (*ActualLRPGroupByProcessGuidAndIndexRequest) ProtoMessage() {} -func (*ActualLRPGroupByProcessGuidAndIndexRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{5} -} -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPGroupByProcessGuidAndIndexRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPGroupByProcessGuidAndIndexRequest.Merge(m, src) -} -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPGroupByProcessGuidAndIndexRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPGroupByProcessGuidAndIndexRequest proto.InternalMessageInfo - -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) GetIndex() int32 { - if m != nil { - return m.Index - } - return 0 -} - -type ClaimActualLRPRequest struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` -} - -func (m *ClaimActualLRPRequest) Reset() { *m = ClaimActualLRPRequest{} } -func (*ClaimActualLRPRequest) ProtoMessage() {} -func (*ClaimActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{6} -} -func (m *ClaimActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ClaimActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ClaimActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ClaimActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClaimActualLRPRequest.Merge(m, src) -} -func (m *ClaimActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *ClaimActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ClaimActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ClaimActualLRPRequest proto.InternalMessageInfo - -func (m *ClaimActualLRPRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *ClaimActualLRPRequest) GetIndex() int32 { - if m != nil { - return m.Index - } - return 0 -} - -func (m *ClaimActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -type StartActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` - ActualLrpNetInfo *ActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` - ActualLrpInternalRoutes []*ActualLRPInternalRoute `protobuf:"bytes,4,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,5,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - // Types that are valid to be assigned to OptionalRoutable: - // *StartActualLRPRequest_Routable - OptionalRoutable isStartActualLRPRequest_OptionalRoutable `protobuf_oneof:"optional_routable"` - AvailabilityZone string `protobuf:"bytes,7,opt,name=availability_zone,json=availabilityZone,proto3" json:"availability_zone"` -} - -func (m *StartActualLRPRequest) Reset() { *m = StartActualLRPRequest{} } -func (*StartActualLRPRequest) ProtoMessage() {} -func (*StartActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{7} -} -func (m *StartActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *StartActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_StartActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *StartActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartActualLRPRequest.Merge(m, src) -} -func (m *StartActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *StartActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_StartActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_StartActualLRPRequest proto.InternalMessageInfo - -type isStartActualLRPRequest_OptionalRoutable interface { - isStartActualLRPRequest_OptionalRoutable() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} - -type StartActualLRPRequest_Routable struct { - Routable bool `protobuf:"varint,6,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` -} - -func (*StartActualLRPRequest_Routable) isStartActualLRPRequest_OptionalRoutable() {} - -func (m *StartActualLRPRequest) GetOptionalRoutable() isStartActualLRPRequest_OptionalRoutable { - if m != nil { - return m.OptionalRoutable - } - return nil -} - -func (m *StartActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *StartActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -func (m *StartActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { - if m != nil { - return m.ActualLrpNetInfo - } - return nil -} - -func (m *StartActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { - if m != nil { - return m.ActualLrpInternalRoutes - } - return nil -} - -func (m *StartActualLRPRequest) GetMetricTags() map[string]string { - if m != nil { - return m.MetricTags - } - return nil -} - -func (m *StartActualLRPRequest) GetRoutable() bool { - if x, ok := m.GetOptionalRoutable().(*StartActualLRPRequest_Routable); ok { - return x.Routable - } - return false -} - -func (m *StartActualLRPRequest) GetAvailabilityZone() string { - if m != nil { - return m.AvailabilityZone - } - return "" -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*StartActualLRPRequest) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*StartActualLRPRequest_Routable)(nil), - } -} - -type CrashActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` - ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,json=errorMessage,proto3" json:"error_message"` -} - -func (m *CrashActualLRPRequest) Reset() { *m = CrashActualLRPRequest{} } -func (*CrashActualLRPRequest) ProtoMessage() {} -func (*CrashActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{8} -} -func (m *CrashActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CrashActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CrashActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CrashActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CrashActualLRPRequest.Merge(m, src) -} -func (m *CrashActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *CrashActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_CrashActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_CrashActualLRPRequest proto.InternalMessageInfo - -func (m *CrashActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *CrashActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -func (m *CrashActualLRPRequest) GetErrorMessage() string { - if m != nil { - return m.ErrorMessage - } - return "" -} - -type FailActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,json=errorMessage,proto3" json:"error_message"` -} - -func (m *FailActualLRPRequest) Reset() { *m = FailActualLRPRequest{} } -func (*FailActualLRPRequest) ProtoMessage() {} -func (*FailActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{9} -} -func (m *FailActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FailActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FailActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FailActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_FailActualLRPRequest.Merge(m, src) -} -func (m *FailActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *FailActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_FailActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_FailActualLRPRequest proto.InternalMessageInfo - -func (m *FailActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *FailActualLRPRequest) GetErrorMessage() string { - if m != nil { - return m.ErrorMessage - } - return "" -} - -type RetireActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` -} - -func (m *RetireActualLRPRequest) Reset() { *m = RetireActualLRPRequest{} } -func (*RetireActualLRPRequest) ProtoMessage() {} -func (*RetireActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{10} -} -func (m *RetireActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RetireActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RetireActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RetireActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RetireActualLRPRequest.Merge(m, src) -} -func (m *RetireActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *RetireActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_RetireActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_RetireActualLRPRequest proto.InternalMessageInfo - -func (m *RetireActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -type RemoveActualLRPRequest struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` -} - -func (m *RemoveActualLRPRequest) Reset() { *m = RemoveActualLRPRequest{} } -func (*RemoveActualLRPRequest) ProtoMessage() {} -func (*RemoveActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{11} -} -func (m *RemoveActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RemoveActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RemoveActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RemoveActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveActualLRPRequest.Merge(m, src) -} -func (m *RemoveActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *RemoveActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_RemoveActualLRPRequest proto.InternalMessageInfo - -func (m *RemoveActualLRPRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *RemoveActualLRPRequest) GetIndex() int32 { - if m != nil { - return m.Index - } - return 0 -} - -func (m *RemoveActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -type ActualLRPsResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrps []*ActualLRP `protobuf:"bytes,2,rep,name=actual_lrps,json=actualLrps,proto3" json:"actual_lrps,omitempty"` -} - -func (m *ActualLRPsResponse) Reset() { *m = ActualLRPsResponse{} } -func (*ActualLRPsResponse) ProtoMessage() {} -func (*ActualLRPsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{12} -} -func (m *ActualLRPsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPsResponse.Merge(m, src) -} -func (m *ActualLRPsResponse) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPsResponse proto.InternalMessageInfo - -func (m *ActualLRPsResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *ActualLRPsResponse) GetActualLrps() []*ActualLRP { - if m != nil { - return m.ActualLrps - } - return nil -} - -type ActualLRPsRequest struct { - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` - ProcessGuid string `protobuf:"bytes,3,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - // Types that are valid to be assigned to OptionalIndex: - // *ActualLRPsRequest_Index - OptionalIndex isActualLRPsRequest_OptionalIndex `protobuf_oneof:"optional_index"` -} - -func (m *ActualLRPsRequest) Reset() { *m = ActualLRPsRequest{} } -func (*ActualLRPsRequest) ProtoMessage() {} -func (*ActualLRPsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a7753fd8557db809, []int{13} -} -func (m *ActualLRPsRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPsRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPsRequest.Merge(m, src) -} -func (m *ActualLRPsRequest) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPsRequest proto.InternalMessageInfo - -type isActualLRPsRequest_OptionalIndex interface { - isActualLRPsRequest_OptionalIndex() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} - -type ActualLRPsRequest_Index struct { - Index int32 `protobuf:"varint,4,opt,name=index,proto3,oneof" json:"index"` -} - -func (*ActualLRPsRequest_Index) isActualLRPsRequest_OptionalIndex() {} - -func (m *ActualLRPsRequest) GetOptionalIndex() isActualLRPsRequest_OptionalIndex { - if m != nil { - return m.OptionalIndex - } - return nil -} - -func (m *ActualLRPsRequest) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *ActualLRPsRequest) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -func (m *ActualLRPsRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *ActualLRPsRequest) GetIndex() int32 { - if x, ok := m.GetOptionalIndex().(*ActualLRPsRequest_Index); ok { - return x.Index - } - return 0 -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*ActualLRPsRequest) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*ActualLRPsRequest_Index)(nil), - } -} - -func init() { - proto.RegisterType((*ActualLRPLifecycleResponse)(nil), "models.ActualLRPLifecycleResponse") - proto.RegisterType((*ActualLRPGroupsResponse)(nil), "models.ActualLRPGroupsResponse") - proto.RegisterType((*ActualLRPGroupResponse)(nil), "models.ActualLRPGroupResponse") - proto.RegisterType((*ActualLRPGroupsRequest)(nil), "models.ActualLRPGroupsRequest") - proto.RegisterType((*ActualLRPGroupsByProcessGuidRequest)(nil), "models.ActualLRPGroupsByProcessGuidRequest") - proto.RegisterType((*ActualLRPGroupByProcessGuidAndIndexRequest)(nil), "models.ActualLRPGroupByProcessGuidAndIndexRequest") - proto.RegisterType((*ClaimActualLRPRequest)(nil), "models.ClaimActualLRPRequest") - proto.RegisterType((*StartActualLRPRequest)(nil), "models.StartActualLRPRequest") - proto.RegisterMapType((map[string]string)(nil), "models.StartActualLRPRequest.MetricTagsEntry") - proto.RegisterType((*CrashActualLRPRequest)(nil), "models.CrashActualLRPRequest") - proto.RegisterType((*FailActualLRPRequest)(nil), "models.FailActualLRPRequest") - proto.RegisterType((*RetireActualLRPRequest)(nil), "models.RetireActualLRPRequest") - proto.RegisterType((*RemoveActualLRPRequest)(nil), "models.RemoveActualLRPRequest") - proto.RegisterType((*ActualLRPsResponse)(nil), "models.ActualLRPsResponse") - proto.RegisterType((*ActualLRPsRequest)(nil), "models.ActualLRPsRequest") -} - -func init() { proto.RegisterFile("actual_lrp_requests.proto", fileDescriptor_a7753fd8557db809) } - -var fileDescriptor_a7753fd8557db809 = []byte{ - // 851 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0x38, 0xb1, 0x5b, 0x3f, 0xa7, 0xa9, 0xbd, 0xcd, 0x8f, 0xc5, 0xaa, 0xd6, 0x61, 0xcb, - 0x21, 0x42, 0xaa, 0x2b, 0xa5, 0x08, 0xa1, 0x48, 0x48, 0xc4, 0xa8, 0xa4, 0x56, 0xd3, 0xaa, 0x9a, - 0xf6, 0x04, 0x12, 0xab, 0xb1, 0x3d, 0x76, 0x47, 0xec, 0xee, 0x98, 0x99, 0xd9, 0x08, 0x73, 0x42, - 0x42, 0xea, 0x81, 0x13, 0x7f, 0x06, 0x7f, 0x07, 0x1c, 0xe0, 0x98, 0x03, 0x87, 0x9e, 0xac, 0xc6, - 0xb9, 0x20, 0x9f, 0xfa, 0x27, 0xa0, 0x9d, 0xf1, 0x6e, 0xd6, 0xde, 0x82, 0x1a, 0x08, 0x12, 0x3d, - 0xed, 0xbc, 0x6f, 0xde, 0x7c, 0xdf, 0x37, 0x6f, 0xdf, 0xcc, 0x2e, 0xbc, 0x43, 0x7a, 0x2a, 0x22, - 0xbe, 0xe7, 0x8b, 0x91, 0x27, 0xe8, 0xd7, 0x11, 0x95, 0x4a, 0xb6, 0x46, 0x82, 0x2b, 0x6e, 0x95, - 0x03, 0xde, 0xa7, 0xbe, 0x6c, 0xdc, 0x1e, 0x32, 0xf5, 0x2c, 0xea, 0xb6, 0x7a, 0x3c, 0xb8, 0x33, - 0xe4, 0x43, 0x7e, 0x47, 0x4f, 0x77, 0xa3, 0x81, 0x8e, 0x74, 0xa0, 0x47, 0x66, 0x59, 0xa3, 0x76, - 0xce, 0x38, 0x47, 0xaa, 0x54, 0x08, 0x2e, 0x4c, 0xe0, 0x1e, 0x40, 0xe3, 0x40, 0x27, 0x1c, 0xe1, - 0xc7, 0x47, 0x6c, 0x40, 0x7b, 0xe3, 0x9e, 0x4f, 0x31, 0x95, 0x23, 0x1e, 0x4a, 0x6a, 0xdd, 0x82, - 0x92, 0x4e, 0xb6, 0xd1, 0x0e, 0xda, 0xad, 0xee, 0x5d, 0x6b, 0x19, 0x0f, 0xad, 0x7b, 0x31, 0x88, - 0xcd, 0x9c, 0xfb, 0x1c, 0xc1, 0x76, 0xca, 0x71, 0x28, 0x78, 0x34, 0x92, 0x17, 0x22, 0xb0, 0xda, - 0x50, 0xcf, 0x6c, 0x7b, 0xa8, 0x19, 0xec, 0xe2, 0xce, 0xca, 0x6e, 0x75, 0x6f, 0x2b, 0x59, 0xb0, - 0x28, 0x80, 0xaf, 0x9b, 0x05, 0x47, 0x62, 0x64, 0x04, 0xf7, 0x8b, 0x36, 0x72, 0xbf, 0x47, 0xb0, - 0xb5, 0x94, 0x77, 0x21, 0x1f, 0x9f, 0x40, 0x6d, 0xd9, 0x87, 0x5d, 0xd4, 0xf9, 0x7f, 0x65, 0x63, - 0x7d, 0xd1, 0x86, 0x76, 0x31, 0x58, 0x36, 0x21, 0xb1, 0x79, 0x91, 0x96, 0x0b, 0xe5, 0x3e, 0x0f, - 0x08, 0x0b, 0xb5, 0x8b, 0x4a, 0x1b, 0x66, 0x93, 0xe6, 0x1c, 0xc1, 0xf3, 0xa7, 0xf5, 0x1e, 0x5c, - 0xe9, 0x51, 0xdf, 0xf7, 0x58, 0x5f, 0x4b, 0x57, 0xda, 0xd5, 0xd9, 0xa4, 0x99, 0x40, 0xb8, 0x1c, - 0x0f, 0x3a, 0x7d, 0xad, 0xf3, 0x25, 0xdc, 0x5a, 0xd2, 0x69, 0x8f, 0x1f, 0x0b, 0xde, 0xa3, 0x52, - 0x1e, 0x46, 0xac, 0x9f, 0x88, 0xde, 0x85, 0xb5, 0x91, 0x41, 0xbd, 0x61, 0xc4, 0xfa, 0x73, 0xe9, - 0xda, 0x6c, 0xd2, 0x5c, 0xc0, 0x71, 0x75, 0x74, 0xbe, 0x56, 0xf3, 0x3f, 0x47, 0xf0, 0xfe, 0xa2, - 0xc0, 0x02, 0xff, 0x41, 0xd8, 0xef, 0x84, 0x7d, 0xfa, 0xcd, 0xbf, 0xd1, 0xb1, 0x9a, 0x50, 0x62, - 0x31, 0x89, 0xde, 0x6b, 0xa9, 0x5d, 0x99, 0x4d, 0x9a, 0x06, 0xc0, 0xe6, 0xa1, 0x8d, 0xfc, 0x8c, - 0x60, 0xf3, 0x53, 0x9f, 0xb0, 0x20, 0x75, 0xf3, 0x9f, 0x6a, 0x5a, 0x4f, 0x60, 0x3b, 0xd3, 0x06, - 0x2c, 0x94, 0x8a, 0x84, 0x3d, 0xea, 0x7d, 0x45, 0xc7, 0xf6, 0x8a, 0xee, 0x86, 0x9b, 0xb9, 0x6e, - 0xe8, 0xcc, 0x93, 0x1e, 0xd0, 0x31, 0xde, 0x48, 0x7b, 0x22, 0x83, 0xba, 0xbf, 0xaf, 0xc2, 0xe6, - 0x13, 0x45, 0x84, 0xca, 0x6d, 0x62, 0x1f, 0xd6, 0x33, 0x72, 0xb1, 0x8a, 0xe9, 0xd1, 0x8d, 0x9c, - 0x4a, 0xcc, 0xbe, 0x96, 0xb2, 0x3f, 0xa0, 0xe3, 0xbf, 0xb3, 0x5a, 0xfc, 0xa7, 0x56, 0xad, 0x43, - 0xb8, 0x91, 0x21, 0x0d, 0xa9, 0xf2, 0x58, 0x38, 0xe0, 0xf3, 0xbd, 0xdb, 0x39, 0xc2, 0x47, 0x54, - 0x75, 0xc2, 0x01, 0xc7, 0xb5, 0x94, 0x6c, 0x8e, 0x58, 0x5f, 0x40, 0x63, 0xc1, 0x9d, 0xa2, 0x22, - 0x24, 0xbe, 0x27, 0x78, 0xa4, 0xa8, 0xb4, 0x57, 0xf5, 0x01, 0x77, 0x5e, 0x63, 0xd0, 0xe4, 0xe1, - 0x38, 0x0d, 0x6f, 0x67, 0x2c, 0x66, 0x70, 0x69, 0x3d, 0x82, 0x6a, 0x40, 0x95, 0x60, 0x3d, 0x4f, - 0x91, 0xa1, 0xb4, 0x4b, 0x9a, 0xed, 0x76, 0xc2, 0xf6, 0xda, 0x52, 0xb7, 0x1e, 0xea, 0x05, 0x4f, - 0xc9, 0x50, 0xde, 0x0b, 0x95, 0x18, 0x63, 0x08, 0x52, 0xc0, 0xba, 0x09, 0x57, 0x63, 0x66, 0xd2, - 0xf5, 0xa9, 0x5d, 0xde, 0x41, 0xbb, 0x57, 0xef, 0x17, 0x70, 0x8a, 0xe8, 0x2b, 0xea, 0x98, 0x30, - 0x9f, 0x74, 0x99, 0xcf, 0xd4, 0xd8, 0xfb, 0x96, 0x87, 0xd4, 0xbe, 0xa2, 0xdb, 0x6d, 0x73, 0x36, - 0x69, 0xe6, 0x27, 0x71, 0x2d, 0x0b, 0x7d, 0xce, 0x43, 0xda, 0xf8, 0x18, 0xae, 0x2f, 0x19, 0xb0, - 0x6a, 0xb0, 0x92, 0xbc, 0xf0, 0x0a, 0x8e, 0x87, 0xd6, 0x06, 0x94, 0x8e, 0x89, 0x1f, 0x51, 0x73, - 0xfa, 0xb1, 0x09, 0xf6, 0x8b, 0x1f, 0xa1, 0xf6, 0x0d, 0xa8, 0xf3, 0x91, 0x62, 0x3c, 0x29, 0x61, - 0xec, 0xcb, 0x7d, 0x19, 0x9f, 0x0d, 0x41, 0xe4, 0xb3, 0xff, 0x7f, 0x5b, 0x7d, 0x08, 0xd7, 0xf4, - 0x35, 0xeb, 0x05, 0x54, 0x4a, 0x32, 0xa4, 0xba, 0xa1, 0x2a, 0xed, 0xfa, 0x6c, 0xd2, 0x5c, 0x9c, - 0xc0, 0x6b, 0x3a, 0x7c, 0x68, 0x22, 0xf7, 0x07, 0x04, 0x1b, 0x9f, 0x11, 0xe6, 0x5f, 0xea, 0x0e, - 0x73, 0x66, 0x8a, 0x6f, 0x66, 0xe6, 0x29, 0x6c, 0x61, 0xaa, 0x98, 0xa0, 0x97, 0xe9, 0xc6, 0xfd, - 0x05, 0xc5, 0xb4, 0x01, 0x3f, 0xa6, 0x6f, 0xf3, 0x15, 0x17, 0x80, 0x95, 0x66, 0x5f, 0xf0, 0x0f, - 0x60, 0x0f, 0xaa, 0xe7, 0x7e, 0x92, 0x6f, 0x7f, 0x3d, 0xe7, 0x01, 0x43, 0x2a, 0x2c, 0xdd, 0x5f, - 0x11, 0xd4, 0xb3, 0x7a, 0x97, 0xfc, 0x8d, 0xcd, 0x55, 0x7e, 0xe5, 0x4d, 0x2a, 0xff, 0x6e, 0x52, - 0xf9, 0xd5, 0xa5, 0xca, 0xdf, 0x2f, 0xcc, 0x6b, 0xdf, 0xae, 0xc1, 0x7a, 0x7a, 0x8e, 0x0d, 0xf2, - 0xc1, 0xc9, 0xa9, 0x53, 0x78, 0x71, 0xea, 0x14, 0x5e, 0x9d, 0x3a, 0xe8, 0xbb, 0xa9, 0x83, 0x7e, - 0x9a, 0x3a, 0xe8, 0xb7, 0xa9, 0x83, 0x4e, 0xa6, 0x0e, 0x7a, 0x39, 0x75, 0xd0, 0x1f, 0x53, 0xa7, - 0xf0, 0x6a, 0xea, 0xa0, 0x1f, 0xcf, 0x9c, 0xc2, 0xc9, 0x99, 0x53, 0x78, 0x71, 0xe6, 0x14, 0xba, - 0x65, 0xfd, 0x03, 0x77, 0xf7, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0x85, 0x3a, 0xee, 0x33, - 0x0a, 0x00, 0x00, -} - -func (this *ActualLRPLifecycleResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPLifecycleResponse) - if !ok { - that2, ok := that.(ActualLRPLifecycleResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - return true -} -func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPGroupsResponse) - if !ok { - that2, ok := that.(ActualLRPGroupsResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if len(this.ActualLrpGroups) != len(that1.ActualLrpGroups) { - return false - } - for i := range this.ActualLrpGroups { - if !this.ActualLrpGroups[i].Equal(that1.ActualLrpGroups[i]) { - return false - } - } - return true -} -func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPGroupResponse) - if !ok { - that2, ok := that.(ActualLRPGroupResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { - return false - } - return true -} -func (this *ActualLRPGroupsRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPGroupsRequest) - if !ok { - that2, ok := that.(ActualLRPGroupsRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Domain != that1.Domain { - return false - } - if this.CellId != that1.CellId { - return false - } - return true -} -func (this *ActualLRPGroupsByProcessGuidRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPGroupsByProcessGuidRequest) - if !ok { - that2, ok := that.(ActualLRPGroupsByProcessGuidRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - return true -} -func (this *ActualLRPGroupByProcessGuidAndIndexRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPGroupByProcessGuidAndIndexRequest) - if !ok { - that2, ok := that.(ActualLRPGroupByProcessGuidAndIndexRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if this.Index != that1.Index { - return false - } - return true -} -func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ClaimActualLRPRequest) - if !ok { - that2, ok := that.(ClaimActualLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if this.Index != that1.Index { - return false - } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { - return false - } - return true -} -func (this *StartActualLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*StartActualLRPRequest) - if !ok { - that2, ok := that.(StartActualLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { - return false - } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { - return false - } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { - return false - } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { - return false - } - for i := range this.ActualLrpInternalRoutes { - if !this.ActualLrpInternalRoutes[i].Equal(that1.ActualLrpInternalRoutes[i]) { - return false - } - } - if len(this.MetricTags) != len(that1.MetricTags) { - return false - } - for i := range this.MetricTags { - if this.MetricTags[i] != that1.MetricTags[i] { - return false - } - } - if that1.OptionalRoutable == nil { - if this.OptionalRoutable != nil { - return false - } - } else if this.OptionalRoutable == nil { - return false - } else if !this.OptionalRoutable.Equal(that1.OptionalRoutable) { - return false - } - if this.AvailabilityZone != that1.AvailabilityZone { - return false - } - return true -} -func (this *StartActualLRPRequest_Routable) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*StartActualLRPRequest_Routable) - if !ok { - that2, ok := that.(StartActualLRPRequest_Routable) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Routable != that1.Routable { - return false - } - return true -} -func (this *CrashActualLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CrashActualLRPRequest) - if !ok { - that2, ok := that.(CrashActualLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { - return false - } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { - return false - } - if this.ErrorMessage != that1.ErrorMessage { - return false - } - return true -} -func (this *FailActualLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*FailActualLRPRequest) - if !ok { - that2, ok := that.(FailActualLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { - return false - } - if this.ErrorMessage != that1.ErrorMessage { - return false - } - return true -} -func (this *RetireActualLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*RetireActualLRPRequest) - if !ok { - that2, ok := that.(RetireActualLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { - return false - } - return true -} -func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*RemoveActualLRPRequest) - if !ok { - that2, ok := that.(RemoveActualLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if this.Index != that1.Index { - return false - } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { - return false - } - return true -} -func (this *ActualLRPsResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPsResponse) - if !ok { - that2, ok := that.(ActualLRPsResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if len(this.ActualLrps) != len(that1.ActualLrps) { - return false - } - for i := range this.ActualLrps { - if !this.ActualLrps[i].Equal(that1.ActualLrps[i]) { - return false - } - } - return true -} -func (this *ActualLRPsRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPsRequest) - if !ok { - that2, ok := that.(ActualLRPsRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Domain != that1.Domain { - return false - } - if this.CellId != that1.CellId { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if that1.OptionalIndex == nil { - if this.OptionalIndex != nil { - return false - } - } else if this.OptionalIndex == nil { - return false - } else if !this.OptionalIndex.Equal(that1.OptionalIndex) { - return false - } - return true -} -func (this *ActualLRPsRequest_Index) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPsRequest_Index) - if !ok { - that2, ok := that.(ActualLRPsRequest_Index) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Index != that1.Index { - return false - } - return true -} -func (this *ActualLRPLifecycleResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.ActualLRPLifecycleResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPGroupsResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPGroupsResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.ActualLrpGroups != nil { - s = append(s, "ActualLrpGroups: "+fmt.Sprintf("%#v", this.ActualLrpGroups)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPGroupResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPGroupResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.ActualLrpGroup != nil { - s = append(s, "ActualLrpGroup: "+fmt.Sprintf("%#v", this.ActualLrpGroup)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPGroupsRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPGroupsRequest{") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPGroupsByProcessGuidRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.ActualLRPGroupsByProcessGuidRequest{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPGroupByProcessGuidAndIndexRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPGroupByProcessGuidAndIndexRequest{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "Index: "+fmt.Sprintf("%#v", this.Index)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ClaimActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.ClaimActualLRPRequest{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "Index: "+fmt.Sprintf("%#v", this.Index)+",\n") - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *StartActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 11) - s = append(s, "&models.StartActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - if this.ActualLrpNetInfo != nil { - s = append(s, "ActualLrpNetInfo: "+fmt.Sprintf("%#v", this.ActualLrpNetInfo)+",\n") - } - if this.ActualLrpInternalRoutes != nil { - s = append(s, "ActualLrpInternalRoutes: "+fmt.Sprintf("%#v", this.ActualLrpInternalRoutes)+",\n") - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]string{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%#v: %#v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - if this.MetricTags != nil { - s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") - } - if this.OptionalRoutable != nil { - s = append(s, "OptionalRoutable: "+fmt.Sprintf("%#v", this.OptionalRoutable)+",\n") - } - s = append(s, "AvailabilityZone: "+fmt.Sprintf("%#v", this.AvailabilityZone)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *StartActualLRPRequest_Routable) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.StartActualLRPRequest_Routable{` + - `Routable:` + fmt.Sprintf("%#v", this.Routable) + `}`}, ", ") - return s -} -func (this *CrashActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.CrashActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - s = append(s, "ErrorMessage: "+fmt.Sprintf("%#v", this.ErrorMessage)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *FailActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.FailActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - s = append(s, "ErrorMessage: "+fmt.Sprintf("%#v", this.ErrorMessage)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *RetireActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.RetireActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *RemoveActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.RemoveActualLRPRequest{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "Index: "+fmt.Sprintf("%#v", this.Index)+",\n") - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPsResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPsResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.ActualLrps != nil { - s = append(s, "ActualLrps: "+fmt.Sprintf("%#v", this.ActualLrps)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPsRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.ActualLRPsRequest{") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - if this.OptionalIndex != nil { - s = append(s, "OptionalIndex: "+fmt.Sprintf("%#v", this.OptionalIndex)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPsRequest_Index) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.ActualLRPsRequest_Index{` + - `Index:` + fmt.Sprintf("%#v", this.Index) + `}`}, ", ") - return s -} -func valueToGoStringActualLrpRequests(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *ActualLRPLifecycleResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPLifecycleResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPLifecycleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPGroupsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPGroupsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPGroupsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ActualLrpGroups) > 0 { - for iNdEx := len(m.ActualLrpGroups) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ActualLrpGroups[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPGroupResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPGroupResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPGroupResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpGroup != nil { - { - size, err := m.ActualLrpGroup.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPGroupsRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPGroupsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPGroupsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0x12 - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPGroupsByProcessGuidRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPGroupsByProcessGuidRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPGroupsByProcessGuidRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Index != 0 { - i = encodeVarintActualLrpRequests(dAtA, i, uint64(m.Index)) - i-- - dAtA[i] = 0x10 - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ClaimActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ClaimActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ClaimActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.Index != 0 { - i = encodeVarintActualLrpRequests(dAtA, i, uint64(m.Index)) - i-- - dAtA[i] = 0x10 - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *StartActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *StartActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StartActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.AvailabilityZone) > 0 { - i -= len(m.AvailabilityZone) - copy(dAtA[i:], m.AvailabilityZone) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.AvailabilityZone))) - i-- - dAtA[i] = 0x3a - } - if m.OptionalRoutable != nil { - { - size := m.OptionalRoutable.Size() - i -= size - if _, err := m.OptionalRoutable.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if len(m.MetricTags) > 0 { - for k := range m.MetricTags { - v := m.MetricTags[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintActualLrpRequests(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x2a - } - } - if len(m.ActualLrpInternalRoutes) > 0 { - for iNdEx := len(m.ActualLrpInternalRoutes) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ActualLrpInternalRoutes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - } - if m.ActualLrpNetInfo != nil { - { - size, err := m.ActualLrpNetInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *StartActualLRPRequest_Routable) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StartActualLRPRequest_Routable) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i-- - if m.Routable { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - return len(dAtA) - i, nil -} -func (m *CrashActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CrashActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CrashActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ErrorMessage) > 0 { - i -= len(m.ErrorMessage) - copy(dAtA[i:], m.ErrorMessage) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.ErrorMessage))) - i-- - dAtA[i] = 0x1a - } - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *FailActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FailActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FailActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ErrorMessage) > 0 { - i -= len(m.ErrorMessage) - copy(dAtA[i:], m.ErrorMessage) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.ErrorMessage))) - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *RetireActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RetireActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RetireActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *RemoveActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RemoveActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RemoveActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.Index != 0 { - i = encodeVarintActualLrpRequests(dAtA, i, uint64(m.Index)) - i-- - dAtA[i] = 0x10 - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ActualLrps) > 0 { - for iNdEx := len(m.ActualLrps) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ActualLrps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintActualLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPsRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.OptionalIndex != nil { - { - size := m.OptionalIndex.Size() - i -= size - if _, err := m.OptionalIndex.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0x1a - } - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0x12 - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPsRequest_Index) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPsRequest_Index) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i = encodeVarintActualLrpRequests(dAtA, i, uint64(m.Index)) - i-- - dAtA[i] = 0x20 - return len(dAtA) - i, nil -} -func encodeVarintActualLrpRequests(dAtA []byte, offset int, v uint64) int { - offset -= sovActualLrpRequests(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *ActualLRPLifecycleResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *ActualLRPGroupsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if len(m.ActualLrpGroups) > 0 { - for _, e := range m.ActualLrpGroups { - l = e.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - } - return n -} - -func (m *ActualLRPGroupResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.ActualLrpGroup != nil { - l = m.ActualLrpGroup.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *ActualLRPGroupsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *ActualLRPGroupsByProcessGuidRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.Index != 0 { - n += 1 + sovActualLrpRequests(uint64(m.Index)) - } - return n -} - -func (m *ClaimActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.Index != 0 { - n += 1 + sovActualLrpRequests(uint64(m.Index)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *StartActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.ActualLrpNetInfo != nil { - l = m.ActualLrpNetInfo.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if len(m.ActualLrpInternalRoutes) > 0 { - for _, e := range m.ActualLrpInternalRoutes { - l = e.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - } - if len(m.MetricTags) > 0 { - for k, v := range m.MetricTags { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovActualLrpRequests(uint64(len(k))) + 1 + len(v) + sovActualLrpRequests(uint64(len(v))) - n += mapEntrySize + 1 + sovActualLrpRequests(uint64(mapEntrySize)) - } - } - if m.OptionalRoutable != nil { - n += m.OptionalRoutable.Size() - } - l = len(m.AvailabilityZone) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *StartActualLRPRequest_Routable) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 2 - return n -} -func (m *CrashActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - l = len(m.ErrorMessage) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *FailActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - l = len(m.ErrorMessage) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *RetireActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *RemoveActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.Index != 0 { - n += 1 + sovActualLrpRequests(uint64(m.Index)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - return n -} - -func (m *ActualLRPsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if len(m.ActualLrps) > 0 { - for _, e := range m.ActualLrps { - l = e.Size() - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - } - return n -} - -func (m *ActualLRPsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovActualLrpRequests(uint64(l)) - } - if m.OptionalIndex != nil { - n += m.OptionalIndex.Size() - } - return n -} - -func (m *ActualLRPsRequest_Index) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 1 + sovActualLrpRequests(uint64(m.Index)) - return n -} - -func sovActualLrpRequests(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozActualLrpRequests(x uint64) (n int) { - return sovActualLrpRequests(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *ActualLRPLifecycleResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPLifecycleResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPGroupsResponse) String() string { - if this == nil { - return "nil" - } - repeatedStringForActualLrpGroups := "[]*ActualLRPGroup{" - for _, f := range this.ActualLrpGroups { - repeatedStringForActualLrpGroups += strings.Replace(fmt.Sprintf("%v", f), "ActualLRPGroup", "ActualLRPGroup", 1) + "," - } - repeatedStringForActualLrpGroups += "}" - s := strings.Join([]string{`&ActualLRPGroupsResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `ActualLrpGroups:` + repeatedStringForActualLrpGroups + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPGroupResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPGroupResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `ActualLrpGroup:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpGroup), "ActualLRPGroup", "ActualLRPGroup", 1) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPGroupsRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPGroupsRequest{`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPGroupsByProcessGuidRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPGroupsByProcessGuidRequest{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPGroupByProcessGuidAndIndexRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPGroupByProcessGuidAndIndexRequest{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `Index:` + fmt.Sprintf("%v", this.Index) + `,`, - `}`, - }, "") - return s -} -func (this *ClaimActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ClaimActualLRPRequest{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `Index:` + fmt.Sprintf("%v", this.Index) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `}`, - }, "") - return s -} -func (this *StartActualLRPRequest) String() string { - if this == nil { - return "nil" - } - repeatedStringForActualLrpInternalRoutes := "[]*ActualLRPInternalRoute{" - for _, f := range this.ActualLrpInternalRoutes { - repeatedStringForActualLrpInternalRoutes += strings.Replace(fmt.Sprintf("%v", f), "ActualLRPInternalRoute", "ActualLRPInternalRoute", 1) + "," - } - repeatedStringForActualLrpInternalRoutes += "}" - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]string{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%v: %v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - s := strings.Join([]string{`&StartActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `ActualLrpNetInfo:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpNetInfo), "ActualLRPNetInfo", "ActualLRPNetInfo", 1) + `,`, - `ActualLrpInternalRoutes:` + repeatedStringForActualLrpInternalRoutes + `,`, - `MetricTags:` + mapStringForMetricTags + `,`, - `OptionalRoutable:` + fmt.Sprintf("%v", this.OptionalRoutable) + `,`, - `AvailabilityZone:` + fmt.Sprintf("%v", this.AvailabilityZone) + `,`, - `}`, - }, "") - return s -} -func (this *StartActualLRPRequest_Routable) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&StartActualLRPRequest_Routable{`, - `Routable:` + fmt.Sprintf("%v", this.Routable) + `,`, - `}`, - }, "") - return s -} -func (this *CrashActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&CrashActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `ErrorMessage:` + fmt.Sprintf("%v", this.ErrorMessage) + `,`, - `}`, - }, "") - return s -} -func (this *FailActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&FailActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ErrorMessage:` + fmt.Sprintf("%v", this.ErrorMessage) + `,`, - `}`, - }, "") - return s -} -func (this *RetireActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&RetireActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `}`, - }, "") - return s -} -func (this *RemoveActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&RemoveActualLRPRequest{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `Index:` + fmt.Sprintf("%v", this.Index) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPsResponse) String() string { - if this == nil { - return "nil" - } - repeatedStringForActualLrps := "[]*ActualLRP{" - for _, f := range this.ActualLrps { - repeatedStringForActualLrps += strings.Replace(fmt.Sprintf("%v", f), "ActualLRP", "ActualLRP", 1) + "," - } - repeatedStringForActualLrps += "}" - s := strings.Join([]string{`&ActualLRPsResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `ActualLrps:` + repeatedStringForActualLrps + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPsRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPsRequest{`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `OptionalIndex:` + fmt.Sprintf("%v", this.OptionalIndex) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPsRequest_Index) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPsRequest_Index{`, - `Index:` + fmt.Sprintf("%v", this.Index) + `,`, - `}`, - }, "") - return s -} -func valueToStringActualLrpRequests(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *ActualLRPLifecycleResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPLifecycleResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPLifecycleResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPGroupsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPGroupsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPGroupsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpGroups", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ActualLrpGroups = append(m.ActualLrpGroups, &ActualLRPGroup{}) - if err := m.ActualLrpGroups[len(m.ActualLrpGroups)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPGroupResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPGroupResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPGroupResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpGroup", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpGroup == nil { - m.ActualLrpGroup = &ActualLRPGroup{} - } - if err := m.ActualLrpGroup.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPGroupsRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPGroupsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPGroupsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPGroupsByProcessGuidRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPGroupsByProcessGuidRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPGroupsByProcessGuidRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPGroupByProcessGuidAndIndexRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPGroupByProcessGuidAndIndexRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPGroupByProcessGuidAndIndexRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - m.Index = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Index |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ClaimActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ClaimActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ClaimActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - m.Index = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Index |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *StartActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: StartActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: StartActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpNetInfo", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpNetInfo == nil { - m.ActualLrpNetInfo = &ActualLRPNetInfo{} - } - if err := m.ActualLrpNetInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInternalRoutes", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ActualLrpInternalRoutes = append(m.ActualLrpInternalRoutes, &ActualLRPInternalRoute{}) - if err := m.ActualLrpInternalRoutes[len(m.ActualLrpInternalRoutes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricTags", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MetricTags == nil { - m.MetricTags = make(map[string]string) - } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthActualLrpRequests - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthActualLrpRequests - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.MetricTags[mapkey] = mapvalue - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Routable", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - b := bool(v != 0) - m.OptionalRoutable = &StartActualLRPRequest_Routable{b} - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AvailabilityZone", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AvailabilityZone = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *CrashActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CrashActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CrashActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ErrorMessage", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ErrorMessage = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *FailActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FailActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FailActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ErrorMessage", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ErrorMessage = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RetireActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RetireActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RetireActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RemoveActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RemoveActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RemoveActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - m.Index = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Index |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrps", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ActualLrps = append(m.ActualLrps, &ActualLRP{}) - if err := m.ActualLrps[len(m.ActualLrps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPsRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthActualLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthActualLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - var v int32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.OptionalIndex = &ActualLRPsRequest_Index{v} - default: - iNdEx = preIndex - skippy, err := skipActualLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthActualLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipActualLrpRequests(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowActualLrpRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthActualLrpRequests - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupActualLrpRequests - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthActualLrpRequests - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthActualLrpRequests = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowActualLrpRequests = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupActualLrpRequests = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/cached_dependency.gogoproto.go b/protomodels/cached_dependency.gogoproto.go deleted file mode 100644 index 0dcb7d86..00000000 --- a/protomodels/cached_dependency.gogoproto.go +++ /dev/null @@ -1,723 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cached_dependency.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type CachedDependency struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to"` - CacheKey string `protobuf:"bytes,4,opt,name=cache_key,json=cacheKey,proto3" json:"cache_key"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source"` - ChecksumAlgorithm string `protobuf:"bytes,6,opt,name=checksum_algorithm,json=checksumAlgorithm,proto3" json:"checksum_algorithm,omitempty"` - ChecksumValue string `protobuf:"bytes,7,opt,name=checksum_value,json=checksumValue,proto3" json:"checksum_value,omitempty"` -} - -func (m *CachedDependency) Reset() { *m = CachedDependency{} } -func (*CachedDependency) ProtoMessage() {} -func (*CachedDependency) Descriptor() ([]byte, []int) { - return fileDescriptor_936e0e6e1c3697fa, []int{0} -} -func (m *CachedDependency) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CachedDependency) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CachedDependency.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CachedDependency) XXX_Merge(src proto.Message) { - xxx_messageInfo_CachedDependency.Merge(m, src) -} -func (m *CachedDependency) XXX_Size() int { - return m.Size() -} -func (m *CachedDependency) XXX_DiscardUnknown() { - xxx_messageInfo_CachedDependency.DiscardUnknown(m) -} - -var xxx_messageInfo_CachedDependency proto.InternalMessageInfo - -func (m *CachedDependency) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *CachedDependency) GetFrom() string { - if m != nil { - return m.From - } - return "" -} - -func (m *CachedDependency) GetTo() string { - if m != nil { - return m.To - } - return "" -} - -func (m *CachedDependency) GetCacheKey() string { - if m != nil { - return m.CacheKey - } - return "" -} - -func (m *CachedDependency) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *CachedDependency) GetChecksumAlgorithm() string { - if m != nil { - return m.ChecksumAlgorithm - } - return "" -} - -func (m *CachedDependency) GetChecksumValue() string { - if m != nil { - return m.ChecksumValue - } - return "" -} - -func init() { - proto.RegisterType((*CachedDependency)(nil), "models.CachedDependency") -} - -func init() { proto.RegisterFile("cached_dependency.proto", fileDescriptor_936e0e6e1c3697fa) } - -var fileDescriptor_936e0e6e1c3697fa = []byte{ - // 326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xc1, 0x4a, 0xeb, 0x40, - 0x14, 0x86, 0x33, 0xb9, 0xbd, 0xb9, 0xed, 0x40, 0xcb, 0xbd, 0xb3, 0xb8, 0x0e, 0x22, 0x27, 0x22, - 0x08, 0x22, 0xb4, 0x5d, 0xe8, 0x0b, 0x58, 0xdd, 0xb9, 0x8b, 0xe0, 0x36, 0xa4, 0x93, 0x69, 0x52, - 0x9a, 0xf4, 0x94, 0x34, 0x11, 0xba, 0xf3, 0x11, 0xdc, 0xf9, 0x0a, 0x3e, 0x8a, 0xcb, 0x2e, 0xbb, - 0x0a, 0x76, 0xba, 0x91, 0xac, 0xfa, 0x08, 0x92, 0x23, 0x6d, 0xdd, 0x1c, 0xfe, 0xff, 0xff, 0xfe, - 0x73, 0x18, 0x86, 0x1f, 0xa9, 0x40, 0xc5, 0x3a, 0xf4, 0x43, 0x3d, 0xd3, 0xd3, 0x50, 0x4f, 0xd5, - 0xa2, 0x37, 0xcb, 0x30, 0x47, 0xe1, 0xa4, 0x18, 0xea, 0x64, 0x7e, 0xdc, 0x8d, 0xc6, 0x79, 0x5c, - 0x0c, 0x7b, 0x0a, 0xd3, 0x7e, 0x84, 0x11, 0xf6, 0x09, 0x0f, 0x8b, 0x11, 0x39, 0x32, 0xa4, 0xbe, - 0xd7, 0xce, 0x5e, 0x6d, 0xfe, 0xf7, 0x96, 0x4e, 0xde, 0xed, 0x2f, 0x8a, 0x13, 0xde, 0x98, 0x06, - 0xa9, 0x96, 0xec, 0x94, 0x5d, 0xb4, 0x06, 0xcd, 0xaa, 0x74, 0xc9, 0x7b, 0x34, 0x6b, 0x3a, 0xca, - 0x30, 0x95, 0xf6, 0x81, 0xd6, 0xde, 0xa3, 0x29, 0xfe, 0x73, 0x3b, 0x47, 0xf9, 0x8b, 0x98, 0x53, - 0x95, 0xae, 0x9d, 0xa3, 0x67, 0xe7, 0x28, 0x2e, 0x79, 0x8b, 0x9e, 0xee, 0x4f, 0xf4, 0x42, 0x36, - 0x08, 0xb7, 0xab, 0xd2, 0x3d, 0x84, 0x5e, 0x93, 0xe4, 0xbd, 0x5e, 0x88, 0x2e, 0xe7, 0x09, 0x46, - 0xfe, 0x1c, 0x8b, 0x4c, 0x69, 0xf9, 0x9b, 0xca, 0x9d, 0xaa, 0x74, 0x7f, 0xa4, 0x5e, 0x2b, 0xc1, - 0xe8, 0x81, 0xa4, 0xe8, 0x72, 0xa1, 0x62, 0xad, 0x26, 0xf3, 0x22, 0xf5, 0x83, 0x24, 0xc2, 0x6c, - 0x9c, 0xc7, 0xa9, 0x74, 0xea, 0x35, 0xef, 0xdf, 0x8e, 0xdc, 0xec, 0x80, 0x38, 0xe7, 0x9d, 0x7d, - 0xfd, 0x29, 0x48, 0x0a, 0x2d, 0xff, 0x50, 0xb5, 0xbd, 0x4b, 0x1f, 0xeb, 0x70, 0x70, 0xbd, 0x5c, - 0x03, 0x5b, 0xad, 0xc1, 0xda, 0xae, 0x81, 0x3d, 0x1b, 0x60, 0x6f, 0x06, 0xd8, 0xbb, 0x01, 0xb6, - 0x34, 0xc0, 0x3e, 0x0c, 0xb0, 0x4f, 0x03, 0xd6, 0xd6, 0x00, 0x7b, 0xd9, 0x80, 0xb5, 0xdc, 0x80, - 0xb5, 0xda, 0x80, 0x35, 0x74, 0xe8, 0x5b, 0xaf, 0xbe, 0x02, 0x00, 0x00, 0xff, 0xff, 0x10, 0xce, - 0x51, 0x13, 0xa8, 0x01, 0x00, 0x00, -} - -func (this *CachedDependency) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CachedDependency) - if !ok { - that2, ok := that.(CachedDependency) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Name != that1.Name { - return false - } - if this.From != that1.From { - return false - } - if this.To != that1.To { - return false - } - if this.CacheKey != that1.CacheKey { - return false - } - if this.LogSource != that1.LogSource { - return false - } - if this.ChecksumAlgorithm != that1.ChecksumAlgorithm { - return false - } - if this.ChecksumValue != that1.ChecksumValue { - return false - } - return true -} -func (this *CachedDependency) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 11) - s = append(s, "&models.CachedDependency{") - s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n") - s = append(s, "From: "+fmt.Sprintf("%#v", this.From)+",\n") - s = append(s, "To: "+fmt.Sprintf("%#v", this.To)+",\n") - s = append(s, "CacheKey: "+fmt.Sprintf("%#v", this.CacheKey)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "ChecksumAlgorithm: "+fmt.Sprintf("%#v", this.ChecksumAlgorithm)+",\n") - s = append(s, "ChecksumValue: "+fmt.Sprintf("%#v", this.ChecksumValue)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringCachedDependency(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *CachedDependency) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CachedDependency) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CachedDependency) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ChecksumValue) > 0 { - i -= len(m.ChecksumValue) - copy(dAtA[i:], m.ChecksumValue) - i = encodeVarintCachedDependency(dAtA, i, uint64(len(m.ChecksumValue))) - i-- - dAtA[i] = 0x3a - } - if len(m.ChecksumAlgorithm) > 0 { - i -= len(m.ChecksumAlgorithm) - copy(dAtA[i:], m.ChecksumAlgorithm) - i = encodeVarintCachedDependency(dAtA, i, uint64(len(m.ChecksumAlgorithm))) - i-- - dAtA[i] = 0x32 - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintCachedDependency(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x2a - } - if len(m.CacheKey) > 0 { - i -= len(m.CacheKey) - copy(dAtA[i:], m.CacheKey) - i = encodeVarintCachedDependency(dAtA, i, uint64(len(m.CacheKey))) - i-- - dAtA[i] = 0x22 - } - if len(m.To) > 0 { - i -= len(m.To) - copy(dAtA[i:], m.To) - i = encodeVarintCachedDependency(dAtA, i, uint64(len(m.To))) - i-- - dAtA[i] = 0x1a - } - if len(m.From) > 0 { - i -= len(m.From) - copy(dAtA[i:], m.From) - i = encodeVarintCachedDependency(dAtA, i, uint64(len(m.From))) - i-- - dAtA[i] = 0x12 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintCachedDependency(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintCachedDependency(dAtA []byte, offset int, v uint64) int { - offset -= sovCachedDependency(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *CachedDependency) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovCachedDependency(uint64(l)) - } - l = len(m.From) - if l > 0 { - n += 1 + l + sovCachedDependency(uint64(l)) - } - l = len(m.To) - if l > 0 { - n += 1 + l + sovCachedDependency(uint64(l)) - } - l = len(m.CacheKey) - if l > 0 { - n += 1 + l + sovCachedDependency(uint64(l)) - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovCachedDependency(uint64(l)) - } - l = len(m.ChecksumAlgorithm) - if l > 0 { - n += 1 + l + sovCachedDependency(uint64(l)) - } - l = len(m.ChecksumValue) - if l > 0 { - n += 1 + l + sovCachedDependency(uint64(l)) - } - return n -} - -func sovCachedDependency(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozCachedDependency(x uint64) (n int) { - return sovCachedDependency(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *CachedDependency) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&CachedDependency{`, - `Name:` + fmt.Sprintf("%v", this.Name) + `,`, - `From:` + fmt.Sprintf("%v", this.From) + `,`, - `To:` + fmt.Sprintf("%v", this.To) + `,`, - `CacheKey:` + fmt.Sprintf("%v", this.CacheKey) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `ChecksumAlgorithm:` + fmt.Sprintf("%v", this.ChecksumAlgorithm) + `,`, - `ChecksumValue:` + fmt.Sprintf("%v", this.ChecksumValue) + `,`, - `}`, - }, "") - return s -} -func valueToStringCachedDependency(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *CachedDependency) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CachedDependency: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CachedDependency: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCachedDependency - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCachedDependency - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field From", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCachedDependency - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCachedDependency - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.From = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field To", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCachedDependency - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCachedDependency - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.To = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CacheKey", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCachedDependency - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCachedDependency - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CacheKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCachedDependency - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCachedDependency - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChecksumAlgorithm", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCachedDependency - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCachedDependency - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChecksumAlgorithm = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChecksumValue", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCachedDependency - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCachedDependency - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChecksumValue = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCachedDependency(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCachedDependency - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipCachedDependency(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCachedDependency - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthCachedDependency - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupCachedDependency - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthCachedDependency - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthCachedDependency = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCachedDependency = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupCachedDependency = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/cells.gogoproto.go b/protomodels/cells.gogoproto.go deleted file mode 100644 index 88aecd20..00000000 --- a/protomodels/cells.gogoproto.go +++ /dev/null @@ -1,1703 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cells.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type CellCapacity struct { - MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,json=memoryMb,proto3" json:"memory_mb"` - DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,json=diskMb,proto3" json:"disk_mb"` - Containers int32 `protobuf:"varint,3,opt,name=containers,proto3" json:"containers"` -} - -func (m *CellCapacity) Reset() { *m = CellCapacity{} } -func (*CellCapacity) ProtoMessage() {} -func (*CellCapacity) Descriptor() ([]byte, []int) { - return fileDescriptor_842e821272d22ff7, []int{0} -} -func (m *CellCapacity) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CellCapacity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CellCapacity.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CellCapacity) XXX_Merge(src proto.Message) { - xxx_messageInfo_CellCapacity.Merge(m, src) -} -func (m *CellCapacity) XXX_Size() int { - return m.Size() -} -func (m *CellCapacity) XXX_DiscardUnknown() { - xxx_messageInfo_CellCapacity.DiscardUnknown(m) -} - -var xxx_messageInfo_CellCapacity proto.InternalMessageInfo - -func (m *CellCapacity) GetMemoryMb() int32 { - if m != nil { - return m.MemoryMb - } - return 0 -} - -func (m *CellCapacity) GetDiskMb() int32 { - if m != nil { - return m.DiskMb - } - return 0 -} - -func (m *CellCapacity) GetContainers() int32 { - if m != nil { - return m.Containers - } - return 0 -} - -type CellPresence struct { - CellId string `protobuf:"bytes,1,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` - RepAddress string `protobuf:"bytes,2,opt,name=rep_address,json=repAddress,proto3" json:"rep_address"` - Zone string `protobuf:"bytes,3,opt,name=zone,proto3" json:"zone"` - Capacity *CellCapacity `protobuf:"bytes,4,opt,name=capacity,proto3" json:"capacity,omitempty"` - RootfsProviders []*Provider `protobuf:"bytes,5,rep,name=rootfs_providers,json=rootfsProviders,proto3" json:"rootfs_provider_list,omitempty"` - PlacementTags []string `protobuf:"bytes,6,rep,name=placement_tags,json=placementTags,proto3" json:"placement_tags,omitempty"` - OptionalPlacementTags []string `protobuf:"bytes,7,rep,name=optional_placement_tags,json=optionalPlacementTags,proto3" json:"optional_placement_tags,omitempty"` - RepUrl string `protobuf:"bytes,8,opt,name=rep_url,json=repUrl,proto3" json:"rep_url"` -} - -func (m *CellPresence) Reset() { *m = CellPresence{} } -func (*CellPresence) ProtoMessage() {} -func (*CellPresence) Descriptor() ([]byte, []int) { - return fileDescriptor_842e821272d22ff7, []int{1} -} -func (m *CellPresence) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CellPresence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CellPresence.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CellPresence) XXX_Merge(src proto.Message) { - xxx_messageInfo_CellPresence.Merge(m, src) -} -func (m *CellPresence) XXX_Size() int { - return m.Size() -} -func (m *CellPresence) XXX_DiscardUnknown() { - xxx_messageInfo_CellPresence.DiscardUnknown(m) -} - -var xxx_messageInfo_CellPresence proto.InternalMessageInfo - -func (m *CellPresence) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -func (m *CellPresence) GetRepAddress() string { - if m != nil { - return m.RepAddress - } - return "" -} - -func (m *CellPresence) GetZone() string { - if m != nil { - return m.Zone - } - return "" -} - -func (m *CellPresence) GetCapacity() *CellCapacity { - if m != nil { - return m.Capacity - } - return nil -} - -func (m *CellPresence) GetRootfsProviders() []*Provider { - if m != nil { - return m.RootfsProviders - } - return nil -} - -func (m *CellPresence) GetPlacementTags() []string { - if m != nil { - return m.PlacementTags - } - return nil -} - -func (m *CellPresence) GetOptionalPlacementTags() []string { - if m != nil { - return m.OptionalPlacementTags - } - return nil -} - -func (m *CellPresence) GetRepUrl() string { - if m != nil { - return m.RepUrl - } - return "" -} - -type Provider struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` - Properties []string `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty"` -} - -func (m *Provider) Reset() { *m = Provider{} } -func (*Provider) ProtoMessage() {} -func (*Provider) Descriptor() ([]byte, []int) { - return fileDescriptor_842e821272d22ff7, []int{2} -} -func (m *Provider) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Provider) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Provider.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Provider) XXX_Merge(src proto.Message) { - xxx_messageInfo_Provider.Merge(m, src) -} -func (m *Provider) XXX_Size() int { - return m.Size() -} -func (m *Provider) XXX_DiscardUnknown() { - xxx_messageInfo_Provider.DiscardUnknown(m) -} - -var xxx_messageInfo_Provider proto.InternalMessageInfo - -func (m *Provider) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *Provider) GetProperties() []string { - if m != nil { - return m.Properties - } - return nil -} - -type CellsResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Cells []*CellPresence `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"` -} - -func (m *CellsResponse) Reset() { *m = CellsResponse{} } -func (*CellsResponse) ProtoMessage() {} -func (*CellsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_842e821272d22ff7, []int{3} -} -func (m *CellsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CellsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CellsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CellsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CellsResponse.Merge(m, src) -} -func (m *CellsResponse) XXX_Size() int { - return m.Size() -} -func (m *CellsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_CellsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_CellsResponse proto.InternalMessageInfo - -func (m *CellsResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *CellsResponse) GetCells() []*CellPresence { - if m != nil { - return m.Cells - } - return nil -} - -func init() { - proto.RegisterType((*CellCapacity)(nil), "models.CellCapacity") - proto.RegisterType((*CellPresence)(nil), "models.CellPresence") - proto.RegisterType((*Provider)(nil), "models.Provider") - proto.RegisterType((*CellsResponse)(nil), "models.CellsResponse") -} - -func init() { proto.RegisterFile("cells.proto", fileDescriptor_842e821272d22ff7) } - -var fileDescriptor_842e821272d22ff7 = []byte{ - // 548 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x53, 0x4f, 0x6f, 0xd3, 0x30, - 0x14, 0x4f, 0xe8, 0x9a, 0xb5, 0x0e, 0xdd, 0x26, 0x0b, 0x44, 0x35, 0x21, 0xa7, 0x2a, 0x43, 0xaa, - 0x26, 0xe8, 0xa6, 0x81, 0xb8, 0xd3, 0x09, 0x09, 0x0e, 0x93, 0x26, 0x0b, 0xce, 0x21, 0x7f, 0xde, - 0x4a, 0x44, 0x12, 0x5b, 0xb6, 0x8b, 0x54, 0x4e, 0x7c, 0x84, 0x7d, 0x00, 0x3e, 0x00, 0x1f, 0x85, - 0x63, 0x8f, 0x3b, 0x45, 0x34, 0xbd, 0xa0, 0x9c, 0xf6, 0x11, 0x90, 0x9d, 0x66, 0x2b, 0xbd, 0x58, - 0xbf, 0xf7, 0x7b, 0xbf, 0x67, 0x3f, 0xff, 0x9e, 0x8d, 0xdc, 0x08, 0xd2, 0x54, 0x8e, 0xb9, 0x60, - 0x8a, 0x61, 0x27, 0x63, 0x31, 0xa4, 0xf2, 0xf0, 0xe5, 0x34, 0x51, 0x5f, 0x66, 0xe1, 0x38, 0x62, - 0xd9, 0xc9, 0x94, 0x4d, 0xd9, 0x89, 0x49, 0x87, 0xb3, 0x2b, 0x13, 0x99, 0xc0, 0xa0, 0xba, 0xec, - 0xd0, 0x05, 0x21, 0x98, 0xa8, 0x83, 0xe1, 0xb5, 0x8d, 0x1e, 0x9e, 0x43, 0x9a, 0x9e, 0x07, 0x3c, - 0x88, 0x12, 0x35, 0xc7, 0xc7, 0xa8, 0x9b, 0x41, 0xc6, 0xc4, 0xdc, 0xcf, 0xc2, 0xbe, 0x3d, 0xb0, - 0x47, 0xed, 0x49, 0xaf, 0x2a, 0xbc, 0x7b, 0x92, 0x76, 0x6a, 0x78, 0x11, 0xe2, 0x23, 0xb4, 0x1b, - 0x27, 0xf2, 0xab, 0x56, 0x3e, 0x30, 0x4a, 0xb7, 0x2a, 0xbc, 0x86, 0xa2, 0x8e, 0x06, 0x17, 0x21, - 0x1e, 0x23, 0x14, 0xb1, 0x5c, 0x05, 0x49, 0x0e, 0x42, 0xf6, 0x5b, 0x46, 0xb8, 0x57, 0x15, 0xde, - 0x06, 0x4b, 0x37, 0xf0, 0xf0, 0x67, 0xab, 0x6e, 0xe9, 0x52, 0x80, 0x84, 0x3c, 0x02, 0x7d, 0x8c, - 0xbe, 0xb6, 0x9f, 0xc4, 0xa6, 0xa1, 0x6e, 0x7d, 0xcc, 0x9a, 0xa2, 0x8e, 0x06, 0x1f, 0x62, 0x7c, - 0x8a, 0x5c, 0x01, 0xdc, 0x0f, 0xe2, 0x58, 0x80, 0x94, 0xa6, 0xa1, 0xee, 0x64, 0xbf, 0x2a, 0xbc, - 0x4d, 0x9a, 0x22, 0x01, 0xfc, 0x6d, 0x8d, 0xf1, 0x53, 0xb4, 0xf3, 0x9d, 0xe5, 0x60, 0x5a, 0xea, - 0x4e, 0x3a, 0x55, 0xe1, 0x99, 0x98, 0x9a, 0x15, 0x9f, 0xa2, 0x4e, 0xb4, 0x36, 0xa5, 0xbf, 0x33, - 0xb0, 0x47, 0xee, 0xd9, 0xa3, 0x71, 0x6d, 0xf8, 0x78, 0xd3, 0x30, 0x7a, 0xa7, 0xc2, 0x3e, 0x3a, - 0x10, 0x8c, 0xa9, 0x2b, 0xe9, 0x73, 0xc1, 0xbe, 0x25, 0xb1, 0xbe, 0x6e, 0x7b, 0xd0, 0x1a, 0xb9, - 0x67, 0x07, 0x4d, 0xe5, 0xe5, 0x3a, 0x31, 0x19, 0x56, 0x85, 0x47, 0xb6, 0xd4, 0x7e, 0x9a, 0x48, - 0xf5, 0x82, 0x65, 0x89, 0x82, 0x8c, 0xab, 0x39, 0xdd, 0xaf, 0xf3, 0x4d, 0x8d, 0xc4, 0xcf, 0xd1, - 0x1e, 0x4f, 0x83, 0x08, 0x32, 0xc8, 0x95, 0xaf, 0x82, 0xa9, 0xec, 0x3b, 0x83, 0xd6, 0xa8, 0x4b, - 0x7b, 0x77, 0xec, 0xc7, 0x60, 0x2a, 0xf1, 0x1b, 0xf4, 0x84, 0x71, 0x95, 0xb0, 0x3c, 0x48, 0xfd, - 0x2d, 0xfd, 0xae, 0xd1, 0x3f, 0x6e, 0xd2, 0x97, 0xff, 0xd5, 0x1d, 0xa1, 0x5d, 0x6d, 0xd5, 0x4c, - 0xa4, 0xfd, 0xce, 0xbd, 0xcf, 0x6b, 0x8a, 0x3a, 0x02, 0xf8, 0x27, 0x91, 0x0e, 0xdf, 0xa3, 0x4e, - 0xd3, 0x91, 0x76, 0x30, 0x0f, 0x32, 0x58, 0x8f, 0xc5, 0x38, 0xa8, 0x63, 0x6a, 0x56, 0x4c, 0x10, - 0xe2, 0x82, 0x71, 0x10, 0x2a, 0x01, 0x3d, 0x10, 0x7d, 0xf4, 0x06, 0x33, 0xfc, 0x8c, 0x7a, 0xda, - 0x49, 0x49, 0x41, 0x72, 0x96, 0x4b, 0xc0, 0xcf, 0x50, 0xdb, 0xbc, 0x4d, 0xb3, 0x9f, 0x7b, 0xd6, - 0x6b, 0x5c, 0x7b, 0xa7, 0x49, 0x5a, 0xe7, 0xf0, 0x31, 0x6a, 0x9b, 0x4f, 0x60, 0x36, 0xdc, 0x1a, - 0x4a, 0xf3, 0x64, 0x68, 0x2d, 0x99, 0xbc, 0x5e, 0x2c, 0x89, 0x75, 0xb3, 0x24, 0xd6, 0xed, 0x92, - 0xd8, 0x3f, 0x4a, 0x62, 0xff, 0x2a, 0x89, 0xfd, 0xbb, 0x24, 0xf6, 0xa2, 0x24, 0xf6, 0x9f, 0x92, - 0xd8, 0x7f, 0x4b, 0x62, 0xdd, 0x96, 0xc4, 0xbe, 0x5e, 0x11, 0x6b, 0xb1, 0x22, 0xd6, 0xcd, 0x8a, - 0x58, 0xa1, 0x63, 0xbe, 0xc6, 0xab, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x12, 0x8c, 0x77, 0x8d, - 0x6d, 0x03, 0x00, 0x00, -} - -func (this *CellCapacity) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CellCapacity) - if !ok { - that2, ok := that.(CellCapacity) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.MemoryMb != that1.MemoryMb { - return false - } - if this.DiskMb != that1.DiskMb { - return false - } - if this.Containers != that1.Containers { - return false - } - return true -} -func (this *CellPresence) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CellPresence) - if !ok { - that2, ok := that.(CellPresence) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.CellId != that1.CellId { - return false - } - if this.RepAddress != that1.RepAddress { - return false - } - if this.Zone != that1.Zone { - return false - } - if !this.Capacity.Equal(that1.Capacity) { - return false - } - if len(this.RootfsProviders) != len(that1.RootfsProviders) { - return false - } - for i := range this.RootfsProviders { - if !this.RootfsProviders[i].Equal(that1.RootfsProviders[i]) { - return false - } - } - if len(this.PlacementTags) != len(that1.PlacementTags) { - return false - } - for i := range this.PlacementTags { - if this.PlacementTags[i] != that1.PlacementTags[i] { - return false - } - } - if len(this.OptionalPlacementTags) != len(that1.OptionalPlacementTags) { - return false - } - for i := range this.OptionalPlacementTags { - if this.OptionalPlacementTags[i] != that1.OptionalPlacementTags[i] { - return false - } - } - if this.RepUrl != that1.RepUrl { - return false - } - return true -} -func (this *Provider) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Provider) - if !ok { - that2, ok := that.(Provider) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Name != that1.Name { - return false - } - if len(this.Properties) != len(that1.Properties) { - return false - } - for i := range this.Properties { - if this.Properties[i] != that1.Properties[i] { - return false - } - } - return true -} -func (this *CellsResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CellsResponse) - if !ok { - that2, ok := that.(CellsResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if len(this.Cells) != len(that1.Cells) { - return false - } - for i := range this.Cells { - if !this.Cells[i].Equal(that1.Cells[i]) { - return false - } - } - return true -} -func (this *CellCapacity) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.CellCapacity{") - s = append(s, "MemoryMb: "+fmt.Sprintf("%#v", this.MemoryMb)+",\n") - s = append(s, "DiskMb: "+fmt.Sprintf("%#v", this.DiskMb)+",\n") - s = append(s, "Containers: "+fmt.Sprintf("%#v", this.Containers)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *CellPresence) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 12) - s = append(s, "&models.CellPresence{") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "RepAddress: "+fmt.Sprintf("%#v", this.RepAddress)+",\n") - s = append(s, "Zone: "+fmt.Sprintf("%#v", this.Zone)+",\n") - if this.Capacity != nil { - s = append(s, "Capacity: "+fmt.Sprintf("%#v", this.Capacity)+",\n") - } - if this.RootfsProviders != nil { - s = append(s, "RootfsProviders: "+fmt.Sprintf("%#v", this.RootfsProviders)+",\n") - } - s = append(s, "PlacementTags: "+fmt.Sprintf("%#v", this.PlacementTags)+",\n") - s = append(s, "OptionalPlacementTags: "+fmt.Sprintf("%#v", this.OptionalPlacementTags)+",\n") - s = append(s, "RepUrl: "+fmt.Sprintf("%#v", this.RepUrl)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *Provider) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.Provider{") - s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n") - s = append(s, "Properties: "+fmt.Sprintf("%#v", this.Properties)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *CellsResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.CellsResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.Cells != nil { - s = append(s, "Cells: "+fmt.Sprintf("%#v", this.Cells)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringCells(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *CellCapacity) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CellCapacity) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CellCapacity) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Containers != 0 { - i = encodeVarintCells(dAtA, i, uint64(m.Containers)) - i-- - dAtA[i] = 0x18 - } - if m.DiskMb != 0 { - i = encodeVarintCells(dAtA, i, uint64(m.DiskMb)) - i-- - dAtA[i] = 0x10 - } - if m.MemoryMb != 0 { - i = encodeVarintCells(dAtA, i, uint64(m.MemoryMb)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *CellPresence) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CellPresence) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CellPresence) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.RepUrl) > 0 { - i -= len(m.RepUrl) - copy(dAtA[i:], m.RepUrl) - i = encodeVarintCells(dAtA, i, uint64(len(m.RepUrl))) - i-- - dAtA[i] = 0x42 - } - if len(m.OptionalPlacementTags) > 0 { - for iNdEx := len(m.OptionalPlacementTags) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.OptionalPlacementTags[iNdEx]) - copy(dAtA[i:], m.OptionalPlacementTags[iNdEx]) - i = encodeVarintCells(dAtA, i, uint64(len(m.OptionalPlacementTags[iNdEx]))) - i-- - dAtA[i] = 0x3a - } - } - if len(m.PlacementTags) > 0 { - for iNdEx := len(m.PlacementTags) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.PlacementTags[iNdEx]) - copy(dAtA[i:], m.PlacementTags[iNdEx]) - i = encodeVarintCells(dAtA, i, uint64(len(m.PlacementTags[iNdEx]))) - i-- - dAtA[i] = 0x32 - } - } - if len(m.RootfsProviders) > 0 { - for iNdEx := len(m.RootfsProviders) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.RootfsProviders[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCells(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - } - if m.Capacity != nil { - { - size, err := m.Capacity.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCells(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if len(m.Zone) > 0 { - i -= len(m.Zone) - copy(dAtA[i:], m.Zone) - i = encodeVarintCells(dAtA, i, uint64(len(m.Zone))) - i-- - dAtA[i] = 0x1a - } - if len(m.RepAddress) > 0 { - i -= len(m.RepAddress) - copy(dAtA[i:], m.RepAddress) - i = encodeVarintCells(dAtA, i, uint64(len(m.RepAddress))) - i-- - dAtA[i] = 0x12 - } - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintCells(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *Provider) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Provider) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Provider) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Properties) > 0 { - for iNdEx := len(m.Properties) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Properties[iNdEx]) - copy(dAtA[i:], m.Properties[iNdEx]) - i = encodeVarintCells(dAtA, i, uint64(len(m.Properties[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintCells(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *CellsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CellsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CellsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Cells) > 0 { - for iNdEx := len(m.Cells) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Cells[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCells(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCells(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintCells(dAtA []byte, offset int, v uint64) int { - offset -= sovCells(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *CellCapacity) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.MemoryMb != 0 { - n += 1 + sovCells(uint64(m.MemoryMb)) - } - if m.DiskMb != 0 { - n += 1 + sovCells(uint64(m.DiskMb)) - } - if m.Containers != 0 { - n += 1 + sovCells(uint64(m.Containers)) - } - return n -} - -func (m *CellPresence) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovCells(uint64(l)) - } - l = len(m.RepAddress) - if l > 0 { - n += 1 + l + sovCells(uint64(l)) - } - l = len(m.Zone) - if l > 0 { - n += 1 + l + sovCells(uint64(l)) - } - if m.Capacity != nil { - l = m.Capacity.Size() - n += 1 + l + sovCells(uint64(l)) - } - if len(m.RootfsProviders) > 0 { - for _, e := range m.RootfsProviders { - l = e.Size() - n += 1 + l + sovCells(uint64(l)) - } - } - if len(m.PlacementTags) > 0 { - for _, s := range m.PlacementTags { - l = len(s) - n += 1 + l + sovCells(uint64(l)) - } - } - if len(m.OptionalPlacementTags) > 0 { - for _, s := range m.OptionalPlacementTags { - l = len(s) - n += 1 + l + sovCells(uint64(l)) - } - } - l = len(m.RepUrl) - if l > 0 { - n += 1 + l + sovCells(uint64(l)) - } - return n -} - -func (m *Provider) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovCells(uint64(l)) - } - if len(m.Properties) > 0 { - for _, s := range m.Properties { - l = len(s) - n += 1 + l + sovCells(uint64(l)) - } - } - return n -} - -func (m *CellsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovCells(uint64(l)) - } - if len(m.Cells) > 0 { - for _, e := range m.Cells { - l = e.Size() - n += 1 + l + sovCells(uint64(l)) - } - } - return n -} - -func sovCells(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozCells(x uint64) (n int) { - return sovCells(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *CellCapacity) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&CellCapacity{`, - `MemoryMb:` + fmt.Sprintf("%v", this.MemoryMb) + `,`, - `DiskMb:` + fmt.Sprintf("%v", this.DiskMb) + `,`, - `Containers:` + fmt.Sprintf("%v", this.Containers) + `,`, - `}`, - }, "") - return s -} -func (this *CellPresence) String() string { - if this == nil { - return "nil" - } - repeatedStringForRootfsProviders := "[]*Provider{" - for _, f := range this.RootfsProviders { - repeatedStringForRootfsProviders += strings.Replace(f.String(), "Provider", "Provider", 1) + "," - } - repeatedStringForRootfsProviders += "}" - s := strings.Join([]string{`&CellPresence{`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `RepAddress:` + fmt.Sprintf("%v", this.RepAddress) + `,`, - `Zone:` + fmt.Sprintf("%v", this.Zone) + `,`, - `Capacity:` + strings.Replace(this.Capacity.String(), "CellCapacity", "CellCapacity", 1) + `,`, - `RootfsProviders:` + repeatedStringForRootfsProviders + `,`, - `PlacementTags:` + fmt.Sprintf("%v", this.PlacementTags) + `,`, - `OptionalPlacementTags:` + fmt.Sprintf("%v", this.OptionalPlacementTags) + `,`, - `RepUrl:` + fmt.Sprintf("%v", this.RepUrl) + `,`, - `}`, - }, "") - return s -} -func (this *Provider) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Provider{`, - `Name:` + fmt.Sprintf("%v", this.Name) + `,`, - `Properties:` + fmt.Sprintf("%v", this.Properties) + `,`, - `}`, - }, "") - return s -} -func (this *CellsResponse) String() string { - if this == nil { - return "nil" - } - repeatedStringForCells := "[]*CellPresence{" - for _, f := range this.Cells { - repeatedStringForCells += strings.Replace(f.String(), "CellPresence", "CellPresence", 1) + "," - } - repeatedStringForCells += "}" - s := strings.Join([]string{`&CellsResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `Cells:` + repeatedStringForCells + `,`, - `}`, - }, "") - return s -} -func valueToStringCells(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *CellCapacity) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CellCapacity: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CellCapacity: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MemoryMb", wireType) - } - m.MemoryMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MemoryMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DiskMb", wireType) - } - m.DiskMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DiskMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Containers", wireType) - } - m.Containers = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Containers |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipCells(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCells - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *CellPresence) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CellPresence: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CellPresence: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RepAddress", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RepAddress = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Zone", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Zone = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Capacity", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Capacity == nil { - m.Capacity = &CellCapacity{} - } - if err := m.Capacity.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RootfsProviders", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RootfsProviders = append(m.RootfsProviders, &Provider{}) - if err := m.RootfsProviders[len(m.RootfsProviders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PlacementTags", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PlacementTags = append(m.PlacementTags, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OptionalPlacementTags", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OptionalPlacementTags = append(m.OptionalPlacementTags, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RepUrl", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RepUrl = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCells(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCells - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Provider) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Provider: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Provider: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Properties", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Properties = append(m.Properties, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCells(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCells - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *CellsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CellsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CellsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Cells", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCells - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCells - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCells - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Cells = append(m.Cells, &CellPresence{}) - if err := m.Cells[len(m.Cells)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCells(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCells - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipCells(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCells - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCells - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCells - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthCells - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupCells - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthCells - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthCells = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCells = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupCells = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/certificate_properties.gogoproto.go b/protomodels/certificate_properties.gogoproto.go deleted file mode 100644 index d19a0960..00000000 --- a/protomodels/certificate_properties.gogoproto.go +++ /dev/null @@ -1,385 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: certificate_properties.proto - -package protomodels - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type CertificateProperties struct { - OrganizationalUnit []string `protobuf:"bytes,1,rep,name=organizational_unit,json=organizationalUnit,proto3" json:"organizational_unit,omitempty"` -} - -func (m *CertificateProperties) Reset() { *m = CertificateProperties{} } -func (*CertificateProperties) ProtoMessage() {} -func (*CertificateProperties) Descriptor() ([]byte, []int) { - return fileDescriptor_9291b57c1fe01997, []int{0} -} -func (m *CertificateProperties) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CertificateProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CertificateProperties.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CertificateProperties) XXX_Merge(src proto.Message) { - xxx_messageInfo_CertificateProperties.Merge(m, src) -} -func (m *CertificateProperties) XXX_Size() int { - return m.Size() -} -func (m *CertificateProperties) XXX_DiscardUnknown() { - xxx_messageInfo_CertificateProperties.DiscardUnknown(m) -} - -var xxx_messageInfo_CertificateProperties proto.InternalMessageInfo - -func (m *CertificateProperties) GetOrganizationalUnit() []string { - if m != nil { - return m.OrganizationalUnit - } - return nil -} - -func init() { - proto.RegisterType((*CertificateProperties)(nil), "models.CertificateProperties") -} - -func init() { proto.RegisterFile("certificate_properties.proto", fileDescriptor_9291b57c1fe01997) } - -var fileDescriptor_9291b57c1fe01997 = []byte{ - // 169 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0x4e, 0x2d, 0x2a, - 0xc9, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0x49, 0x8d, 0x2f, 0x28, 0xca, 0x2f, 0x00, 0x71, 0x53, 0x8b, - 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xd8, 0x72, 0xf3, 0x53, 0x52, 0x73, 0x8a, 0x95, 0x3c, - 0xb8, 0x44, 0x9d, 0x11, 0xea, 0x02, 0xe0, 0xca, 0x84, 0xf4, 0xb9, 0x84, 0xf3, 0x8b, 0xd2, 0x13, - 0xf3, 0x32, 0xab, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x12, 0x73, 0xe2, 0x4b, 0xf3, 0x32, 0x4b, 0x24, - 0x18, 0x15, 0x98, 0x35, 0x38, 0x83, 0x84, 0x50, 0xa5, 0x42, 0xf3, 0x32, 0x4b, 0x9c, 0x4c, 0x2e, - 0x3c, 0x94, 0x63, 0xb8, 0xf1, 0x50, 0x8e, 0xe1, 0xc3, 0x43, 0x39, 0xc6, 0x86, 0x47, 0x72, 0x8c, - 0x2b, 0x1e, 0xc9, 0x31, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, - 0x8c, 0x2f, 0x1e, 0xc9, 0x31, 0x7c, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, - 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x24, 0xb1, 0x81, 0x9d, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, - 0xff, 0x07, 0xe2, 0x02, 0xdf, 0xae, 0x00, 0x00, 0x00, -} - -func (this *CertificateProperties) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CertificateProperties) - if !ok { - that2, ok := that.(CertificateProperties) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.OrganizationalUnit) != len(that1.OrganizationalUnit) { - return false - } - for i := range this.OrganizationalUnit { - if this.OrganizationalUnit[i] != that1.OrganizationalUnit[i] { - return false - } - } - return true -} -func (this *CertificateProperties) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.CertificateProperties{") - s = append(s, "OrganizationalUnit: "+fmt.Sprintf("%#v", this.OrganizationalUnit)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringCertificateProperties(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *CertificateProperties) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CertificateProperties) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CertificateProperties) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.OrganizationalUnit) > 0 { - for iNdEx := len(m.OrganizationalUnit) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.OrganizationalUnit[iNdEx]) - copy(dAtA[i:], m.OrganizationalUnit[iNdEx]) - i = encodeVarintCertificateProperties(dAtA, i, uint64(len(m.OrganizationalUnit[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func encodeVarintCertificateProperties(dAtA []byte, offset int, v uint64) int { - offset -= sovCertificateProperties(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *CertificateProperties) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.OrganizationalUnit) > 0 { - for _, s := range m.OrganizationalUnit { - l = len(s) - n += 1 + l + sovCertificateProperties(uint64(l)) - } - } - return n -} - -func sovCertificateProperties(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozCertificateProperties(x uint64) (n int) { - return sovCertificateProperties(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *CertificateProperties) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&CertificateProperties{`, - `OrganizationalUnit:` + fmt.Sprintf("%v", this.OrganizationalUnit) + `,`, - `}`, - }, "") - return s -} -func valueToStringCertificateProperties(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *CertificateProperties) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCertificateProperties - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CertificateProperties: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CertificateProperties: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrganizationalUnit", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCertificateProperties - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCertificateProperties - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCertificateProperties - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OrganizationalUnit = append(m.OrganizationalUnit, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCertificateProperties(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCertificateProperties - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipCertificateProperties(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCertificateProperties - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCertificateProperties - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCertificateProperties - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthCertificateProperties - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupCertificateProperties - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthCertificateProperties - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthCertificateProperties = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCertificateProperties = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupCertificateProperties = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/check_definition.gogoproto.go b/protomodels/check_definition.gogoproto.go deleted file mode 100644 index bccf34a3..00000000 --- a/protomodels/check_definition.gogoproto.go +++ /dev/null @@ -1,1453 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: check_definition.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type CheckDefinition struct { - Checks []*Check `protobuf:"bytes,1,rep,name=checks,proto3" json:"checks,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source"` - ReadinessChecks []*Check `protobuf:"bytes,3,rep,name=readiness_checks,json=readinessChecks,proto3" json:"readiness_checks,omitempty"` -} - -func (m *CheckDefinition) Reset() { *m = CheckDefinition{} } -func (*CheckDefinition) ProtoMessage() {} -func (*CheckDefinition) Descriptor() ([]byte, []int) { - return fileDescriptor_048a62b88ce7913d, []int{0} -} -func (m *CheckDefinition) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CheckDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CheckDefinition.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CheckDefinition) XXX_Merge(src proto.Message) { - xxx_messageInfo_CheckDefinition.Merge(m, src) -} -func (m *CheckDefinition) XXX_Size() int { - return m.Size() -} -func (m *CheckDefinition) XXX_DiscardUnknown() { - xxx_messageInfo_CheckDefinition.DiscardUnknown(m) -} - -var xxx_messageInfo_CheckDefinition proto.InternalMessageInfo - -func (m *CheckDefinition) GetChecks() []*Check { - if m != nil { - return m.Checks - } - return nil -} - -func (m *CheckDefinition) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *CheckDefinition) GetReadinessChecks() []*Check { - if m != nil { - return m.ReadinessChecks - } - return nil -} - -type Check struct { - // oneof is hard to use right now, instead we can do this check in validation - // oneof check { - TcpCheck *TCPCheck `protobuf:"bytes,1,opt,name=tcp_check,json=tcpCheck,proto3" json:"tcp_check,omitempty"` - HttpCheck *HTTPCheck `protobuf:"bytes,2,opt,name=http_check,json=httpCheck,proto3" json:"http_check,omitempty"` -} - -func (m *Check) Reset() { *m = Check{} } -func (*Check) ProtoMessage() {} -func (*Check) Descriptor() ([]byte, []int) { - return fileDescriptor_048a62b88ce7913d, []int{1} -} -func (m *Check) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Check) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Check.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Check) XXX_Merge(src proto.Message) { - xxx_messageInfo_Check.Merge(m, src) -} -func (m *Check) XXX_Size() int { - return m.Size() -} -func (m *Check) XXX_DiscardUnknown() { - xxx_messageInfo_Check.DiscardUnknown(m) -} - -var xxx_messageInfo_Check proto.InternalMessageInfo - -func (m *Check) GetTcpCheck() *TCPCheck { - if m != nil { - return m.TcpCheck - } - return nil -} - -func (m *Check) GetHttpCheck() *HTTPCheck { - if m != nil { - return m.HttpCheck - } - return nil -} - -type TCPCheck struct { - Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port"` - ConnectTimeoutMs uint64 `protobuf:"varint,2,opt,name=connect_timeout_ms,json=connectTimeoutMs,proto3" json:"connect_timeout_ms,omitempty"` - IntervalMs uint64 `protobuf:"varint,3,opt,name=interval_ms,json=intervalMs,proto3" json:"interval_ms,omitempty"` -} - -func (m *TCPCheck) Reset() { *m = TCPCheck{} } -func (*TCPCheck) ProtoMessage() {} -func (*TCPCheck) Descriptor() ([]byte, []int) { - return fileDescriptor_048a62b88ce7913d, []int{2} -} -func (m *TCPCheck) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TCPCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TCPCheck.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TCPCheck) XXX_Merge(src proto.Message) { - xxx_messageInfo_TCPCheck.Merge(m, src) -} -func (m *TCPCheck) XXX_Size() int { - return m.Size() -} -func (m *TCPCheck) XXX_DiscardUnknown() { - xxx_messageInfo_TCPCheck.DiscardUnknown(m) -} - -var xxx_messageInfo_TCPCheck proto.InternalMessageInfo - -func (m *TCPCheck) GetPort() uint32 { - if m != nil { - return m.Port - } - return 0 -} - -func (m *TCPCheck) GetConnectTimeoutMs() uint64 { - if m != nil { - return m.ConnectTimeoutMs - } - return 0 -} - -func (m *TCPCheck) GetIntervalMs() uint64 { - if m != nil { - return m.IntervalMs - } - return 0 -} - -type HTTPCheck struct { - Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port"` - RequestTimeoutMs uint64 `protobuf:"varint,2,opt,name=request_timeout_ms,json=requestTimeoutMs,proto3" json:"request_timeout_ms,omitempty"` - Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path"` - IntervalMs uint64 `protobuf:"varint,4,opt,name=interval_ms,json=intervalMs,proto3" json:"interval_ms,omitempty"` -} - -func (m *HTTPCheck) Reset() { *m = HTTPCheck{} } -func (*HTTPCheck) ProtoMessage() {} -func (*HTTPCheck) Descriptor() ([]byte, []int) { - return fileDescriptor_048a62b88ce7913d, []int{3} -} -func (m *HTTPCheck) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *HTTPCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_HTTPCheck.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *HTTPCheck) XXX_Merge(src proto.Message) { - xxx_messageInfo_HTTPCheck.Merge(m, src) -} -func (m *HTTPCheck) XXX_Size() int { - return m.Size() -} -func (m *HTTPCheck) XXX_DiscardUnknown() { - xxx_messageInfo_HTTPCheck.DiscardUnknown(m) -} - -var xxx_messageInfo_HTTPCheck proto.InternalMessageInfo - -func (m *HTTPCheck) GetPort() uint32 { - if m != nil { - return m.Port - } - return 0 -} - -func (m *HTTPCheck) GetRequestTimeoutMs() uint64 { - if m != nil { - return m.RequestTimeoutMs - } - return 0 -} - -func (m *HTTPCheck) GetPath() string { - if m != nil { - return m.Path - } - return "" -} - -func (m *HTTPCheck) GetIntervalMs() uint64 { - if m != nil { - return m.IntervalMs - } - return 0 -} - -func init() { - proto.RegisterType((*CheckDefinition)(nil), "models.CheckDefinition") - proto.RegisterType((*Check)(nil), "models.Check") - proto.RegisterType((*TCPCheck)(nil), "models.TCPCheck") - proto.RegisterType((*HTTPCheck)(nil), "models.HTTPCheck") -} - -func init() { proto.RegisterFile("check_definition.proto", fileDescriptor_048a62b88ce7913d) } - -var fileDescriptor_048a62b88ce7913d = []byte{ - // 414 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x31, 0x8f, 0xd3, 0x40, - 0x10, 0x85, 0xbd, 0x97, 0x10, 0xc5, 0x13, 0x1d, 0x17, 0xb6, 0x40, 0x11, 0x42, 0x9b, 0xc8, 0x12, - 0x52, 0x0a, 0xe2, 0x43, 0x07, 0x05, 0x75, 0x8e, 0x82, 0xe6, 0x24, 0x64, 0xdc, 0x5b, 0xce, 0x66, - 0xcf, 0xb6, 0xb0, 0xbd, 0xc6, 0xbb, 0x86, 0x96, 0x9f, 0x40, 0x45, 0x4f, 0xc7, 0x4f, 0xa1, 0x4c, - 0x99, 0x2a, 0x22, 0x4e, 0x83, 0x52, 0xe5, 0x27, 0x20, 0x8f, 0xed, 0x80, 0xa2, 0x48, 0x34, 0xd6, - 0xcc, 0xbe, 0xef, 0xbd, 0x37, 0x85, 0xe1, 0x31, 0x0f, 0x05, 0xff, 0xe0, 0x2d, 0xc5, 0x7d, 0x94, - 0x46, 0x3a, 0x92, 0xa9, 0x9d, 0xe5, 0x52, 0x4b, 0xda, 0x4b, 0xe4, 0x52, 0xc4, 0xea, 0xc9, 0x2c, - 0x88, 0x74, 0x58, 0x2c, 0x6c, 0x2e, 0x93, 0xeb, 0x40, 0x06, 0xf2, 0x1a, 0xe5, 0x45, 0x71, 0x8f, - 0x1b, 0x2e, 0x38, 0xd5, 0x36, 0xeb, 0x3b, 0x81, 0xab, 0xdb, 0x2a, 0xf1, 0xcd, 0x31, 0x90, 0x3e, - 0x83, 0x1e, 0x96, 0xa8, 0x11, 0x99, 0x74, 0xa6, 0x83, 0x9b, 0x4b, 0xbb, 0xce, 0xb6, 0x11, 0x74, - 0x1a, 0x91, 0xce, 0x00, 0x62, 0x19, 0x78, 0x4a, 0x16, 0x39, 0x17, 0xa3, 0x8b, 0x09, 0x99, 0x9a, - 0xf3, 0x87, 0xfb, 0xcd, 0xf8, 0x9f, 0x57, 0xc7, 0x8c, 0x65, 0xf0, 0x1e, 0x47, 0xfa, 0x1a, 0x86, - 0xb9, 0xf0, 0x97, 0x51, 0x2a, 0x94, 0xf2, 0x9a, 0xfc, 0xce, 0xb9, 0xfc, 0xab, 0x23, 0x86, 0xbb, - 0xb2, 0x42, 0x78, 0x80, 0x13, 0x9d, 0x81, 0xa9, 0x79, 0x56, 0x9b, 0x47, 0x64, 0x42, 0xa6, 0x83, - 0x9b, 0x61, 0xeb, 0x75, 0x6f, 0xdf, 0xd5, 0xf6, 0xbe, 0xe6, 0x59, 0x8d, 0xbf, 0x00, 0x08, 0xb5, - 0x6e, 0xf9, 0x0b, 0xe4, 0x1f, 0xb5, 0xfc, 0x5b, 0xd7, 0x6d, 0x0c, 0x66, 0x05, 0xe1, 0x68, 0x7d, - 0x86, 0x7e, 0x9b, 0x43, 0x9f, 0x42, 0x37, 0x93, 0xb9, 0xc6, 0x9e, 0xcb, 0x79, 0x7f, 0xbf, 0x19, - 0xe3, 0xee, 0xe0, 0x97, 0x3e, 0x07, 0xca, 0x65, 0x9a, 0x0a, 0xae, 0x3d, 0x1d, 0x25, 0x42, 0x16, - 0xda, 0x4b, 0x14, 0x76, 0x74, 0x9d, 0x61, 0xa3, 0xb8, 0xb5, 0x70, 0xa7, 0xe8, 0x18, 0x06, 0x51, - 0xaa, 0x45, 0xfe, 0xc9, 0x8f, 0x2b, 0xac, 0x83, 0x18, 0xb4, 0x4f, 0x77, 0xca, 0xfa, 0x46, 0xc0, - 0x3c, 0x5e, 0xf4, 0xff, 0xea, 0x5c, 0x7c, 0x2c, 0x84, 0x3a, 0x57, 0xdd, 0x28, 0x7f, 0xab, 0xab, - 0x2c, 0x5f, 0x87, 0xd8, 0x69, 0x36, 0x59, 0xbe, 0x0e, 0x1d, 0xfc, 0x9e, 0x1e, 0xd6, 0x3d, 0x3d, - 0x6c, 0xfe, 0x6a, 0xb5, 0x65, 0xc6, 0x7a, 0xcb, 0x8c, 0xc3, 0x96, 0x91, 0x2f, 0x25, 0x23, 0x3f, - 0x4a, 0x46, 0x7e, 0x96, 0x8c, 0xac, 0x4a, 0x46, 0x7e, 0x95, 0x8c, 0xfc, 0x2e, 0x99, 0x71, 0x28, - 0x19, 0xf9, 0xba, 0x63, 0xc6, 0x6a, 0xc7, 0x8c, 0xf5, 0x8e, 0x19, 0x8b, 0x1e, 0xfe, 0x5c, 0x2f, - 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xc4, 0x3b, 0x86, 0xad, 0x02, 0x00, 0x00, -} - -func (this *CheckDefinition) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CheckDefinition) - if !ok { - that2, ok := that.(CheckDefinition) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.Checks) != len(that1.Checks) { - return false - } - for i := range this.Checks { - if !this.Checks[i].Equal(that1.Checks[i]) { - return false - } - } - if this.LogSource != that1.LogSource { - return false - } - if len(this.ReadinessChecks) != len(that1.ReadinessChecks) { - return false - } - for i := range this.ReadinessChecks { - if !this.ReadinessChecks[i].Equal(that1.ReadinessChecks[i]) { - return false - } - } - return true -} -func (this *Check) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Check) - if !ok { - that2, ok := that.(Check) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.TcpCheck.Equal(that1.TcpCheck) { - return false - } - if !this.HttpCheck.Equal(that1.HttpCheck) { - return false - } - return true -} -func (this *TCPCheck) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TCPCheck) - if !ok { - that2, ok := that.(TCPCheck) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Port != that1.Port { - return false - } - if this.ConnectTimeoutMs != that1.ConnectTimeoutMs { - return false - } - if this.IntervalMs != that1.IntervalMs { - return false - } - return true -} -func (this *HTTPCheck) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*HTTPCheck) - if !ok { - that2, ok := that.(HTTPCheck) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Port != that1.Port { - return false - } - if this.RequestTimeoutMs != that1.RequestTimeoutMs { - return false - } - if this.Path != that1.Path { - return false - } - if this.IntervalMs != that1.IntervalMs { - return false - } - return true -} -func (this *CheckDefinition) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.CheckDefinition{") - if this.Checks != nil { - s = append(s, "Checks: "+fmt.Sprintf("%#v", this.Checks)+",\n") - } - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - if this.ReadinessChecks != nil { - s = append(s, "ReadinessChecks: "+fmt.Sprintf("%#v", this.ReadinessChecks)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *Check) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.Check{") - if this.TcpCheck != nil { - s = append(s, "TcpCheck: "+fmt.Sprintf("%#v", this.TcpCheck)+",\n") - } - if this.HttpCheck != nil { - s = append(s, "HttpCheck: "+fmt.Sprintf("%#v", this.HttpCheck)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TCPCheck) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.TCPCheck{") - s = append(s, "Port: "+fmt.Sprintf("%#v", this.Port)+",\n") - s = append(s, "ConnectTimeoutMs: "+fmt.Sprintf("%#v", this.ConnectTimeoutMs)+",\n") - s = append(s, "IntervalMs: "+fmt.Sprintf("%#v", this.IntervalMs)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *HTTPCheck) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.HTTPCheck{") - s = append(s, "Port: "+fmt.Sprintf("%#v", this.Port)+",\n") - s = append(s, "RequestTimeoutMs: "+fmt.Sprintf("%#v", this.RequestTimeoutMs)+",\n") - s = append(s, "Path: "+fmt.Sprintf("%#v", this.Path)+",\n") - s = append(s, "IntervalMs: "+fmt.Sprintf("%#v", this.IntervalMs)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringCheckDefinition(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *CheckDefinition) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CheckDefinition) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CheckDefinition) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ReadinessChecks) > 0 { - for iNdEx := len(m.ReadinessChecks) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ReadinessChecks[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCheckDefinition(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintCheckDefinition(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x12 - } - if len(m.Checks) > 0 { - for iNdEx := len(m.Checks) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Checks[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCheckDefinition(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *Check) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Check) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Check) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.HttpCheck != nil { - { - size, err := m.HttpCheck.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCheckDefinition(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.TcpCheck != nil { - { - size, err := m.TcpCheck.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCheckDefinition(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TCPCheck) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TCPCheck) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TCPCheck) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.IntervalMs != 0 { - i = encodeVarintCheckDefinition(dAtA, i, uint64(m.IntervalMs)) - i-- - dAtA[i] = 0x18 - } - if m.ConnectTimeoutMs != 0 { - i = encodeVarintCheckDefinition(dAtA, i, uint64(m.ConnectTimeoutMs)) - i-- - dAtA[i] = 0x10 - } - if m.Port != 0 { - i = encodeVarintCheckDefinition(dAtA, i, uint64(m.Port)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *HTTPCheck) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *HTTPCheck) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *HTTPCheck) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.IntervalMs != 0 { - i = encodeVarintCheckDefinition(dAtA, i, uint64(m.IntervalMs)) - i-- - dAtA[i] = 0x20 - } - if len(m.Path) > 0 { - i -= len(m.Path) - copy(dAtA[i:], m.Path) - i = encodeVarintCheckDefinition(dAtA, i, uint64(len(m.Path))) - i-- - dAtA[i] = 0x1a - } - if m.RequestTimeoutMs != 0 { - i = encodeVarintCheckDefinition(dAtA, i, uint64(m.RequestTimeoutMs)) - i-- - dAtA[i] = 0x10 - } - if m.Port != 0 { - i = encodeVarintCheckDefinition(dAtA, i, uint64(m.Port)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintCheckDefinition(dAtA []byte, offset int, v uint64) int { - offset -= sovCheckDefinition(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *CheckDefinition) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Checks) > 0 { - for _, e := range m.Checks { - l = e.Size() - n += 1 + l + sovCheckDefinition(uint64(l)) - } - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovCheckDefinition(uint64(l)) - } - if len(m.ReadinessChecks) > 0 { - for _, e := range m.ReadinessChecks { - l = e.Size() - n += 1 + l + sovCheckDefinition(uint64(l)) - } - } - return n -} - -func (m *Check) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.TcpCheck != nil { - l = m.TcpCheck.Size() - n += 1 + l + sovCheckDefinition(uint64(l)) - } - if m.HttpCheck != nil { - l = m.HttpCheck.Size() - n += 1 + l + sovCheckDefinition(uint64(l)) - } - return n -} - -func (m *TCPCheck) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Port != 0 { - n += 1 + sovCheckDefinition(uint64(m.Port)) - } - if m.ConnectTimeoutMs != 0 { - n += 1 + sovCheckDefinition(uint64(m.ConnectTimeoutMs)) - } - if m.IntervalMs != 0 { - n += 1 + sovCheckDefinition(uint64(m.IntervalMs)) - } - return n -} - -func (m *HTTPCheck) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Port != 0 { - n += 1 + sovCheckDefinition(uint64(m.Port)) - } - if m.RequestTimeoutMs != 0 { - n += 1 + sovCheckDefinition(uint64(m.RequestTimeoutMs)) - } - l = len(m.Path) - if l > 0 { - n += 1 + l + sovCheckDefinition(uint64(l)) - } - if m.IntervalMs != 0 { - n += 1 + sovCheckDefinition(uint64(m.IntervalMs)) - } - return n -} - -func sovCheckDefinition(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozCheckDefinition(x uint64) (n int) { - return sovCheckDefinition(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *CheckDefinition) String() string { - if this == nil { - return "nil" - } - repeatedStringForChecks := "[]*Check{" - for _, f := range this.Checks { - repeatedStringForChecks += strings.Replace(f.String(), "Check", "Check", 1) + "," - } - repeatedStringForChecks += "}" - repeatedStringForReadinessChecks := "[]*Check{" - for _, f := range this.ReadinessChecks { - repeatedStringForReadinessChecks += strings.Replace(f.String(), "Check", "Check", 1) + "," - } - repeatedStringForReadinessChecks += "}" - s := strings.Join([]string{`&CheckDefinition{`, - `Checks:` + repeatedStringForChecks + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `ReadinessChecks:` + repeatedStringForReadinessChecks + `,`, - `}`, - }, "") - return s -} -func (this *Check) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Check{`, - `TcpCheck:` + strings.Replace(this.TcpCheck.String(), "TCPCheck", "TCPCheck", 1) + `,`, - `HttpCheck:` + strings.Replace(this.HttpCheck.String(), "HTTPCheck", "HTTPCheck", 1) + `,`, - `}`, - }, "") - return s -} -func (this *TCPCheck) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TCPCheck{`, - `Port:` + fmt.Sprintf("%v", this.Port) + `,`, - `ConnectTimeoutMs:` + fmt.Sprintf("%v", this.ConnectTimeoutMs) + `,`, - `IntervalMs:` + fmt.Sprintf("%v", this.IntervalMs) + `,`, - `}`, - }, "") - return s -} -func (this *HTTPCheck) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&HTTPCheck{`, - `Port:` + fmt.Sprintf("%v", this.Port) + `,`, - `RequestTimeoutMs:` + fmt.Sprintf("%v", this.RequestTimeoutMs) + `,`, - `Path:` + fmt.Sprintf("%v", this.Path) + `,`, - `IntervalMs:` + fmt.Sprintf("%v", this.IntervalMs) + `,`, - `}`, - }, "") - return s -} -func valueToStringCheckDefinition(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *CheckDefinition) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CheckDefinition: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CheckDefinition: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Checks", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCheckDefinition - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCheckDefinition - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Checks = append(m.Checks, &Check{}) - if err := m.Checks[len(m.Checks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCheckDefinition - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCheckDefinition - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ReadinessChecks", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCheckDefinition - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCheckDefinition - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ReadinessChecks = append(m.ReadinessChecks, &Check{}) - if err := m.ReadinessChecks[len(m.ReadinessChecks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCheckDefinition(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCheckDefinition - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Check) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Check: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Check: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TcpCheck", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCheckDefinition - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCheckDefinition - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TcpCheck == nil { - m.TcpCheck = &TCPCheck{} - } - if err := m.TcpCheck.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field HttpCheck", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCheckDefinition - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCheckDefinition - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.HttpCheck == nil { - m.HttpCheck = &HTTPCheck{} - } - if err := m.HttpCheck.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCheckDefinition(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCheckDefinition - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TCPCheck) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TCPCheck: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TCPCheck: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Port", wireType) - } - m.Port = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Port |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectTimeoutMs", wireType) - } - m.ConnectTimeoutMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ConnectTimeoutMs |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IntervalMs", wireType) - } - m.IntervalMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.IntervalMs |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipCheckDefinition(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCheckDefinition - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *HTTPCheck) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: HTTPCheck: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: HTTPCheck: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Port", wireType) - } - m.Port = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Port |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RequestTimeoutMs", wireType) - } - m.RequestTimeoutMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RequestTimeoutMs |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Path", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCheckDefinition - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCheckDefinition - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Path = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IntervalMs", wireType) - } - m.IntervalMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.IntervalMs |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipCheckDefinition(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCheckDefinition - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipCheckDefinition(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCheckDefinition - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthCheckDefinition - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupCheckDefinition - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthCheckDefinition - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthCheckDefinition = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCheckDefinition = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupCheckDefinition = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/desired_lrp_requests.gogoproto.go b/protomodels/desired_lrp_requests.gogoproto.go deleted file mode 100644 index f699b85d..00000000 --- a/protomodels/desired_lrp_requests.gogoproto.go +++ /dev/null @@ -1,2806 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: desired_lrp_requests.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type DesiredLRPLifecycleResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` -} - -func (m *DesiredLRPLifecycleResponse) Reset() { *m = DesiredLRPLifecycleResponse{} } -func (*DesiredLRPLifecycleResponse) ProtoMessage() {} -func (*DesiredLRPLifecycleResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{0} -} -func (m *DesiredLRPLifecycleResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPLifecycleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPLifecycleResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPLifecycleResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPLifecycleResponse.Merge(m, src) -} -func (m *DesiredLRPLifecycleResponse) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPLifecycleResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPLifecycleResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPLifecycleResponse proto.InternalMessageInfo - -func (m *DesiredLRPLifecycleResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -type DesiredLRPsResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrps []*DesiredLRP `protobuf:"bytes,2,rep,name=desired_lrps,json=desiredLrps,proto3" json:"desired_lrps,omitempty"` -} - -func (m *DesiredLRPsResponse) Reset() { *m = DesiredLRPsResponse{} } -func (*DesiredLRPsResponse) ProtoMessage() {} -func (*DesiredLRPsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{1} -} -func (m *DesiredLRPsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPsResponse.Merge(m, src) -} -func (m *DesiredLRPsResponse) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPsResponse proto.InternalMessageInfo - -func (m *DesiredLRPsResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *DesiredLRPsResponse) GetDesiredLrps() []*DesiredLRP { - if m != nil { - return m.DesiredLrps - } - return nil -} - -type DesiredLRPsRequest struct { - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain"` - ProcessGuids []string `protobuf:"bytes,2,rep,name=process_guids,json=processGuids,proto3" json:"process_guids,omitempty"` -} - -func (m *DesiredLRPsRequest) Reset() { *m = DesiredLRPsRequest{} } -func (*DesiredLRPsRequest) ProtoMessage() {} -func (*DesiredLRPsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{2} -} -func (m *DesiredLRPsRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPsRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPsRequest.Merge(m, src) -} -func (m *DesiredLRPsRequest) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPsRequest proto.InternalMessageInfo - -func (m *DesiredLRPsRequest) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *DesiredLRPsRequest) GetProcessGuids() []string { - if m != nil { - return m.ProcessGuids - } - return nil -} - -type DesiredLRPResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrp *DesiredLRP `protobuf:"bytes,2,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` -} - -func (m *DesiredLRPResponse) Reset() { *m = DesiredLRPResponse{} } -func (*DesiredLRPResponse) ProtoMessage() {} -func (*DesiredLRPResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{3} -} -func (m *DesiredLRPResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPResponse.Merge(m, src) -} -func (m *DesiredLRPResponse) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPResponse proto.InternalMessageInfo - -func (m *DesiredLRPResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *DesiredLRPResponse) GetDesiredLrp() *DesiredLRP { - if m != nil { - return m.DesiredLrp - } - return nil -} - -type DesiredLRPSchedulingInfosResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo `protobuf:"bytes,2,rep,name=desired_lrp_scheduling_infos,json=desiredLrpSchedulingInfos,proto3" json:"desired_lrp_scheduling_infos,omitempty"` -} - -func (m *DesiredLRPSchedulingInfosResponse) Reset() { *m = DesiredLRPSchedulingInfosResponse{} } -func (*DesiredLRPSchedulingInfosResponse) ProtoMessage() {} -func (*DesiredLRPSchedulingInfosResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{4} -} -func (m *DesiredLRPSchedulingInfosResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPSchedulingInfosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPSchedulingInfosResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPSchedulingInfosResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPSchedulingInfosResponse.Merge(m, src) -} -func (m *DesiredLRPSchedulingInfosResponse) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPSchedulingInfosResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPSchedulingInfosResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPSchedulingInfosResponse proto.InternalMessageInfo - -func (m *DesiredLRPSchedulingInfosResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *DesiredLRPSchedulingInfosResponse) GetDesiredLrpSchedulingInfos() []*DesiredLRPSchedulingInfo { - if m != nil { - return m.DesiredLrpSchedulingInfos - } - return nil -} - -type DesiredLRPSchedulingInfoByProcessGuidResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo `protobuf:"bytes,2,opt,name=desired_lrp_scheduling_info,json=desiredLrpSchedulingInfo,proto3" json:"desired_lrp_scheduling_info,omitempty"` -} - -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) Reset() { - *m = DesiredLRPSchedulingInfoByProcessGuidResponse{} -} -func (*DesiredLRPSchedulingInfoByProcessGuidResponse) ProtoMessage() {} -func (*DesiredLRPSchedulingInfoByProcessGuidResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{5} -} -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPSchedulingInfoByProcessGuidResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPSchedulingInfoByProcessGuidResponse.Merge(m, src) -} -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPSchedulingInfoByProcessGuidResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPSchedulingInfoByProcessGuidResponse proto.InternalMessageInfo - -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLrpSchedulingInfo() *DesiredLRPSchedulingInfo { - if m != nil { - return m.DesiredLrpSchedulingInfo - } - return nil -} - -type DesiredLRPByProcessGuidRequest struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` -} - -func (m *DesiredLRPByProcessGuidRequest) Reset() { *m = DesiredLRPByProcessGuidRequest{} } -func (*DesiredLRPByProcessGuidRequest) ProtoMessage() {} -func (*DesiredLRPByProcessGuidRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{6} -} -func (m *DesiredLRPByProcessGuidRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPByProcessGuidRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPByProcessGuidRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPByProcessGuidRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPByProcessGuidRequest.Merge(m, src) -} -func (m *DesiredLRPByProcessGuidRequest) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPByProcessGuidRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPByProcessGuidRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPByProcessGuidRequest proto.InternalMessageInfo - -func (m *DesiredLRPByProcessGuidRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -type DesireLRPRequest struct { - DesiredLrp *DesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` -} - -func (m *DesireLRPRequest) Reset() { *m = DesireLRPRequest{} } -func (*DesireLRPRequest) ProtoMessage() {} -func (*DesireLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{7} -} -func (m *DesireLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesireLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesireLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesireLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesireLRPRequest.Merge(m, src) -} -func (m *DesireLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *DesireLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DesireLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DesireLRPRequest proto.InternalMessageInfo - -func (m *DesireLRPRequest) GetDesiredLrp() *DesiredLRP { - if m != nil { - return m.DesiredLrp - } - return nil -} - -type UpdateDesiredLRPRequest struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - Update *DesiredLRPUpdate `protobuf:"bytes,2,opt,name=update,proto3" json:"update,omitempty"` -} - -func (m *UpdateDesiredLRPRequest) Reset() { *m = UpdateDesiredLRPRequest{} } -func (*UpdateDesiredLRPRequest) ProtoMessage() {} -func (*UpdateDesiredLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{8} -} -func (m *UpdateDesiredLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UpdateDesiredLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_UpdateDesiredLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *UpdateDesiredLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateDesiredLRPRequest.Merge(m, src) -} -func (m *UpdateDesiredLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *UpdateDesiredLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_UpdateDesiredLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_UpdateDesiredLRPRequest proto.InternalMessageInfo - -func (m *UpdateDesiredLRPRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *UpdateDesiredLRPRequest) GetUpdate() *DesiredLRPUpdate { - if m != nil { - return m.Update - } - return nil -} - -type RemoveDesiredLRPRequest struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` -} - -func (m *RemoveDesiredLRPRequest) Reset() { *m = RemoveDesiredLRPRequest{} } -func (*RemoveDesiredLRPRequest) ProtoMessage() {} -func (*RemoveDesiredLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_7235cc1a84e38c85, []int{9} -} -func (m *RemoveDesiredLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RemoveDesiredLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RemoveDesiredLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RemoveDesiredLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveDesiredLRPRequest.Merge(m, src) -} -func (m *RemoveDesiredLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *RemoveDesiredLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveDesiredLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_RemoveDesiredLRPRequest proto.InternalMessageInfo - -func (m *RemoveDesiredLRPRequest) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func init() { - proto.RegisterType((*DesiredLRPLifecycleResponse)(nil), "models.DesiredLRPLifecycleResponse") - proto.RegisterType((*DesiredLRPsResponse)(nil), "models.DesiredLRPsResponse") - proto.RegisterType((*DesiredLRPsRequest)(nil), "models.DesiredLRPsRequest") - proto.RegisterType((*DesiredLRPResponse)(nil), "models.DesiredLRPResponse") - proto.RegisterType((*DesiredLRPSchedulingInfosResponse)(nil), "models.DesiredLRPSchedulingInfosResponse") - proto.RegisterType((*DesiredLRPSchedulingInfoByProcessGuidResponse)(nil), "models.DesiredLRPSchedulingInfoByProcessGuidResponse") - proto.RegisterType((*DesiredLRPByProcessGuidRequest)(nil), "models.DesiredLRPByProcessGuidRequest") - proto.RegisterType((*DesireLRPRequest)(nil), "models.DesireLRPRequest") - proto.RegisterType((*UpdateDesiredLRPRequest)(nil), "models.UpdateDesiredLRPRequest") - proto.RegisterType((*RemoveDesiredLRPRequest)(nil), "models.RemoveDesiredLRPRequest") -} - -func init() { proto.RegisterFile("desired_lrp_requests.proto", fileDescriptor_7235cc1a84e38c85) } - -var fileDescriptor_7235cc1a84e38c85 = []byte{ - // 493 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x6b, 0x13, 0x41, - 0x18, 0xc6, 0x77, 0x2a, 0x06, 0xfa, 0x6e, 0x0a, 0x75, 0x3c, 0x74, 0x4d, 0x65, 0x1a, 0xa7, 0x97, - 0x5e, 0x9a, 0x4a, 0xa3, 0x5f, 0x20, 0x28, 0x45, 0x08, 0x52, 0x46, 0x7a, 0x94, 0x25, 0xd9, 0x9d, - 0x6c, 0x17, 0x92, 0x9d, 0xed, 0x4c, 0x56, 0xe8, 0xad, 0x1f, 0xc1, 0x8f, 0x21, 0x78, 0xf6, 0x3b, - 0x78, 0xcc, 0xb1, 0xa7, 0x62, 0x36, 0x17, 0xe9, 0xa9, 0x1f, 0x41, 0x32, 0x33, 0x75, 0x27, 0xad, - 0x51, 0x23, 0x9e, 0x92, 0x79, 0xff, 0x3c, 0xef, 0xef, 0x7d, 0x79, 0x58, 0x68, 0xc4, 0x5c, 0xa5, - 0x92, 0xc7, 0xe1, 0x50, 0xe6, 0xa1, 0xe4, 0x67, 0x05, 0x57, 0x63, 0xd5, 0xca, 0xa5, 0x18, 0x0b, - 0x5c, 0x1b, 0x89, 0x98, 0x0f, 0x55, 0x63, 0x3f, 0x49, 0xc7, 0xa7, 0x45, 0xbf, 0x15, 0x89, 0xd1, - 0x41, 0x22, 0x12, 0x71, 0xa0, 0xd3, 0xfd, 0x62, 0xa0, 0x5f, 0xfa, 0xa1, 0xff, 0x99, 0xb6, 0xc6, - 0x23, 0x47, 0xd2, 0x86, 0x7c, 0x2e, 0xa5, 0x90, 0xe6, 0x41, 0x3b, 0xb0, 0xfd, 0xca, 0x54, 0x74, - 0xd9, 0x71, 0x37, 0x1d, 0xf0, 0xe8, 0x3c, 0x1a, 0x72, 0xc6, 0x55, 0x2e, 0x32, 0xc5, 0xf1, 0x2e, - 0x3c, 0xd4, 0xd5, 0x01, 0x6a, 0xa2, 0x3d, 0xff, 0x70, 0xa3, 0x65, 0x28, 0x5a, 0xaf, 0xe7, 0x41, - 0x66, 0x72, 0xf4, 0x0c, 0x1e, 0x57, 0x1a, 0x6a, 0xa5, 0x5e, 0xfc, 0x12, 0xea, 0x0e, 0xa1, 0x0a, - 0xd6, 0x9a, 0x0f, 0xf6, 0xfc, 0x43, 0x7c, 0x5b, 0x5b, 0xe9, 0x32, 0xdf, 0xd6, 0x75, 0x65, 0xae, - 0xe8, 0x7b, 0xc0, 0x0b, 0x23, 0xf5, 0xa9, 0x30, 0x85, 0x5a, 0x2c, 0x46, 0xbd, 0x34, 0xd3, 0x23, - 0xd7, 0x3b, 0x70, 0x7d, 0xb5, 0x63, 0x23, 0xcc, 0xfe, 0xe2, 0x5d, 0xd8, 0xc8, 0xa5, 0x88, 0xb8, - 0x52, 0x61, 0x52, 0xa4, 0xb1, 0x99, 0xb8, 0xce, 0xea, 0x36, 0x78, 0x34, 0x8f, 0xd1, 0xcc, 0x95, - 0x5f, 0x6d, 0xa1, 0x36, 0xf8, 0xce, 0x42, 0xc1, 0x9a, 0x2e, 0xfd, 0xd5, 0x3e, 0x50, 0xed, 0x43, - 0x3f, 0x23, 0x78, 0x56, 0xa5, 0xde, 0x45, 0xa7, 0x3c, 0x2e, 0x86, 0x69, 0x96, 0xbc, 0xc9, 0x06, - 0x62, 0xc5, 0x83, 0xf6, 0xe0, 0xa9, 0xeb, 0x22, 0xf5, 0x53, 0x2b, 0x4c, 0xe7, 0x62, 0xf6, 0xc0, - 0xcd, 0xfb, 0x40, 0x8b, 0x53, 0xd9, 0x93, 0x0a, 0xef, 0x0e, 0x0f, 0xfd, 0x82, 0x60, 0x7f, 0x59, - 0x5f, 0xe7, 0xfc, 0xb8, 0x3a, 0xe4, 0x6a, 0xe4, 0x21, 0x6c, 0xff, 0x86, 0xdc, 0x5e, 0xf2, 0xcf, - 0xe0, 0xc1, 0x32, 0x70, 0x7a, 0x02, 0xa4, 0xea, 0xba, 0x03, 0x6a, 0x0c, 0xd4, 0x86, 0xba, 0x6b, - 0x0e, 0x6b, 0xa3, 0xcd, 0xeb, 0xab, 0x9d, 0x85, 0x38, 0xf3, 0x1d, 0xb7, 0xd0, 0x23, 0xd8, 0x34, - 0xb2, 0xda, 0x2b, 0xb7, 0x42, 0x0b, 0x2e, 0x40, 0x7f, 0xe5, 0x82, 0x0b, 0x04, 0x5b, 0x27, 0x79, - 0xdc, 0x1b, 0x73, 0xd7, 0x7c, 0xff, 0x4e, 0x86, 0x9f, 0x43, 0xad, 0xd0, 0x7a, 0xf6, 0x78, 0xc1, - 0x7d, 0x00, 0x33, 0x8f, 0xd9, 0x3a, 0xfa, 0x16, 0xb6, 0x18, 0x1f, 0x89, 0x0f, 0xff, 0x89, 0xa0, - 0xf3, 0x62, 0x32, 0x25, 0xde, 0xe5, 0x94, 0x78, 0x37, 0x53, 0x82, 0x2e, 0x4a, 0x82, 0x3e, 0x95, - 0x04, 0x7d, 0x2d, 0x09, 0x9a, 0x94, 0x04, 0x7d, 0x2b, 0x09, 0xfa, 0x5e, 0x12, 0xef, 0xa6, 0x24, - 0xe8, 0xe3, 0x8c, 0x78, 0x93, 0x19, 0xf1, 0x2e, 0x67, 0xc4, 0xeb, 0xd7, 0xf4, 0xb7, 0xa9, 0xfd, - 0x23, 0x00, 0x00, 0xff, 0xff, 0xca, 0x08, 0x89, 0xe8, 0x10, 0x05, 0x00, 0x00, -} - -func (this *DesiredLRPLifecycleResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPLifecycleResponse) - if !ok { - that2, ok := that.(DesiredLRPLifecycleResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - return true -} -func (this *DesiredLRPsResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPsResponse) - if !ok { - that2, ok := that.(DesiredLRPsResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if len(this.DesiredLrps) != len(that1.DesiredLrps) { - return false - } - for i := range this.DesiredLrps { - if !this.DesiredLrps[i].Equal(that1.DesiredLrps[i]) { - return false - } - } - return true -} -func (this *DesiredLRPsRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPsRequest) - if !ok { - that2, ok := that.(DesiredLRPsRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Domain != that1.Domain { - return false - } - if len(this.ProcessGuids) != len(that1.ProcessGuids) { - return false - } - for i := range this.ProcessGuids { - if this.ProcessGuids[i] != that1.ProcessGuids[i] { - return false - } - } - return true -} -func (this *DesiredLRPResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPResponse) - if !ok { - that2, ok := that.(DesiredLRPResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { - return false - } - return true -} -func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPSchedulingInfosResponse) - if !ok { - that2, ok := that.(DesiredLRPSchedulingInfosResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if len(this.DesiredLrpSchedulingInfos) != len(that1.DesiredLrpSchedulingInfos) { - return false - } - for i := range this.DesiredLrpSchedulingInfos { - if !this.DesiredLrpSchedulingInfos[i].Equal(that1.DesiredLrpSchedulingInfos[i]) { - return false - } - } - return true -} -func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPSchedulingInfoByProcessGuidResponse) - if !ok { - that2, ok := that.(DesiredLRPSchedulingInfoByProcessGuidResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if !this.DesiredLrpSchedulingInfo.Equal(that1.DesiredLrpSchedulingInfo) { - return false - } - return true -} -func (this *DesiredLRPByProcessGuidRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPByProcessGuidRequest) - if !ok { - that2, ok := that.(DesiredLRPByProcessGuidRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - return true -} -func (this *DesireLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesireLRPRequest) - if !ok { - that2, ok := that.(DesireLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { - return false - } - return true -} -func (this *UpdateDesiredLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*UpdateDesiredLRPRequest) - if !ok { - that2, ok := that.(UpdateDesiredLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if !this.Update.Equal(that1.Update) { - return false - } - return true -} -func (this *RemoveDesiredLRPRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*RemoveDesiredLRPRequest) - if !ok { - that2, ok := that.(RemoveDesiredLRPRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - return true -} -func (this *DesiredLRPLifecycleResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.DesiredLRPLifecycleResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPsResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DesiredLRPsResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.DesiredLrps != nil { - s = append(s, "DesiredLrps: "+fmt.Sprintf("%#v", this.DesiredLrps)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPsRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DesiredLRPsRequest{") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "ProcessGuids: "+fmt.Sprintf("%#v", this.ProcessGuids)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DesiredLRPResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.DesiredLrp != nil { - s = append(s, "DesiredLrp: "+fmt.Sprintf("%#v", this.DesiredLrp)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPSchedulingInfosResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DesiredLRPSchedulingInfosResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.DesiredLrpSchedulingInfos != nil { - s = append(s, "DesiredLrpSchedulingInfos: "+fmt.Sprintf("%#v", this.DesiredLrpSchedulingInfos)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DesiredLRPSchedulingInfoByProcessGuidResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.DesiredLrpSchedulingInfo != nil { - s = append(s, "DesiredLrpSchedulingInfo: "+fmt.Sprintf("%#v", this.DesiredLrpSchedulingInfo)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPByProcessGuidRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.DesiredLRPByProcessGuidRequest{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesireLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.DesireLRPRequest{") - if this.DesiredLrp != nil { - s = append(s, "DesiredLrp: "+fmt.Sprintf("%#v", this.DesiredLrp)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *UpdateDesiredLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.UpdateDesiredLRPRequest{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - if this.Update != nil { - s = append(s, "Update: "+fmt.Sprintf("%#v", this.Update)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *RemoveDesiredLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.RemoveDesiredLRPRequest{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringDesiredLrpRequests(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *DesiredLRPLifecycleResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPLifecycleResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPLifecycleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.DesiredLrps) > 0 { - for iNdEx := len(m.DesiredLrps) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.DesiredLrps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPsRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ProcessGuids) > 0 { - for iNdEx := len(m.ProcessGuids) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.ProcessGuids[iNdEx]) - copy(dAtA[i:], m.ProcessGuids[iNdEx]) - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(len(m.ProcessGuids[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.DesiredLrp != nil { - { - size, err := m.DesiredLrp.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPSchedulingInfosResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPSchedulingInfosResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPSchedulingInfosResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.DesiredLrpSchedulingInfos) > 0 { - for iNdEx := len(m.DesiredLrpSchedulingInfos) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.DesiredLrpSchedulingInfos[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.DesiredLrpSchedulingInfo != nil { - { - size, err := m.DesiredLrpSchedulingInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPByProcessGuidRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPByProcessGuidRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPByProcessGuidRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesireLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesireLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesireLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.DesiredLrp != nil { - { - size, err := m.DesiredLrp.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *UpdateDesiredLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UpdateDesiredLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UpdateDesiredLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Update != nil { - { - size, err := m.Update.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *RemoveDesiredLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RemoveDesiredLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RemoveDesiredLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintDesiredLrpRequests(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintDesiredLrpRequests(dAtA []byte, offset int, v uint64) int { - offset -= sovDesiredLrpRequests(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *DesiredLRPLifecycleResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - return n -} - -func (m *DesiredLRPsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - if len(m.DesiredLrps) > 0 { - for _, e := range m.DesiredLrps { - l = e.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - } - return n -} - -func (m *DesiredLRPsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - if len(m.ProcessGuids) > 0 { - for _, s := range m.ProcessGuids { - l = len(s) - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - } - return n -} - -func (m *DesiredLRPResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - if m.DesiredLrp != nil { - l = m.DesiredLrp.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - return n -} - -func (m *DesiredLRPSchedulingInfosResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - if len(m.DesiredLrpSchedulingInfos) > 0 { - for _, e := range m.DesiredLrpSchedulingInfos { - l = e.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - } - return n -} - -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - if m.DesiredLrpSchedulingInfo != nil { - l = m.DesiredLrpSchedulingInfo.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - return n -} - -func (m *DesiredLRPByProcessGuidRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - return n -} - -func (m *DesireLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.DesiredLrp != nil { - l = m.DesiredLrp.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - return n -} - -func (m *UpdateDesiredLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - if m.Update != nil { - l = m.Update.Size() - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - return n -} - -func (m *RemoveDesiredLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovDesiredLrpRequests(uint64(l)) - } - return n -} - -func sovDesiredLrpRequests(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozDesiredLrpRequests(x uint64) (n int) { - return sovDesiredLrpRequests(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *DesiredLRPLifecycleResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPLifecycleResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPsResponse) String() string { - if this == nil { - return "nil" - } - repeatedStringForDesiredLrps := "[]*DesiredLRP{" - for _, f := range this.DesiredLrps { - repeatedStringForDesiredLrps += strings.Replace(fmt.Sprintf("%v", f), "DesiredLRP", "DesiredLRP", 1) + "," - } - repeatedStringForDesiredLrps += "}" - s := strings.Join([]string{`&DesiredLRPsResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `DesiredLrps:` + repeatedStringForDesiredLrps + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPsRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPsRequest{`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `ProcessGuids:` + fmt.Sprintf("%v", this.ProcessGuids) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `DesiredLrp:` + strings.Replace(fmt.Sprintf("%v", this.DesiredLrp), "DesiredLRP", "DesiredLRP", 1) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPSchedulingInfosResponse) String() string { - if this == nil { - return "nil" - } - repeatedStringForDesiredLrpSchedulingInfos := "[]*DesiredLRPSchedulingInfo{" - for _, f := range this.DesiredLrpSchedulingInfos { - repeatedStringForDesiredLrpSchedulingInfos += strings.Replace(fmt.Sprintf("%v", f), "DesiredLRPSchedulingInfo", "DesiredLRPSchedulingInfo", 1) + "," - } - repeatedStringForDesiredLrpSchedulingInfos += "}" - s := strings.Join([]string{`&DesiredLRPSchedulingInfosResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `DesiredLrpSchedulingInfos:` + repeatedStringForDesiredLrpSchedulingInfos + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPSchedulingInfoByProcessGuidResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `DesiredLrpSchedulingInfo:` + strings.Replace(fmt.Sprintf("%v", this.DesiredLrpSchedulingInfo), "DesiredLRPSchedulingInfo", "DesiredLRPSchedulingInfo", 1) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPByProcessGuidRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPByProcessGuidRequest{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `}`, - }, "") - return s -} -func (this *DesireLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesireLRPRequest{`, - `DesiredLrp:` + strings.Replace(fmt.Sprintf("%v", this.DesiredLrp), "DesiredLRP", "DesiredLRP", 1) + `,`, - `}`, - }, "") - return s -} -func (this *UpdateDesiredLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&UpdateDesiredLRPRequest{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `Update:` + strings.Replace(fmt.Sprintf("%v", this.Update), "DesiredLRPUpdate", "DesiredLRPUpdate", 1) + `,`, - `}`, - }, "") - return s -} -func (this *RemoveDesiredLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&RemoveDesiredLRPRequest{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `}`, - }, "") - return s -} -func valueToStringDesiredLrpRequests(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *DesiredLRPLifecycleResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPLifecycleResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPLifecycleResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLrps", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DesiredLrps = append(m.DesiredLrps, &DesiredLRP{}) - if err := m.DesiredLrps[len(m.DesiredLrps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPsRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuids", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuids = append(m.ProcessGuids, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLrp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DesiredLrp == nil { - m.DesiredLrp = &DesiredLRP{} - } - if err := m.DesiredLrp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPSchedulingInfosResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPSchedulingInfosResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPSchedulingInfosResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLrpSchedulingInfos", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DesiredLrpSchedulingInfos = append(m.DesiredLrpSchedulingInfos, &DesiredLRPSchedulingInfo{}) - if err := m.DesiredLrpSchedulingInfos[len(m.DesiredLrpSchedulingInfos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPSchedulingInfoByProcessGuidResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPSchedulingInfoByProcessGuidResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLrpSchedulingInfo", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DesiredLrpSchedulingInfo == nil { - m.DesiredLrpSchedulingInfo = &DesiredLRPSchedulingInfo{} - } - if err := m.DesiredLrpSchedulingInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPByProcessGuidRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPByProcessGuidRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPByProcessGuidRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesireLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesireLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesireLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLrp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DesiredLrp == nil { - m.DesiredLrp = &DesiredLRP{} - } - if err := m.DesiredLrp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *UpdateDesiredLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UpdateDesiredLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UpdateDesiredLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Update", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Update == nil { - m.Update = &DesiredLRPUpdate{} - } - if err := m.Update.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RemoveDesiredLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RemoveDesiredLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RemoveDesiredLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrpRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrpRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipDesiredLrpRequests(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDesiredLrpRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthDesiredLrpRequests - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupDesiredLrpRequests - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthDesiredLrpRequests - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthDesiredLrpRequests = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDesiredLrpRequests = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupDesiredLrpRequests = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/domain.gogoproto.go b/protomodels/domain.gogoproto.go deleted file mode 100644 index 3f7fd775..00000000 --- a/protomodels/domain.gogoproto.go +++ /dev/null @@ -1,853 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: domain.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type DomainsResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"` -} - -func (m *DomainsResponse) Reset() { *m = DomainsResponse{} } -func (*DomainsResponse) ProtoMessage() {} -func (*DomainsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_73e6234e76dbdb84, []int{0} -} -func (m *DomainsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DomainsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DomainsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DomainsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DomainsResponse.Merge(m, src) -} -func (m *DomainsResponse) XXX_Size() int { - return m.Size() -} -func (m *DomainsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DomainsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DomainsResponse proto.InternalMessageInfo - -func (m *DomainsResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *DomainsResponse) GetDomains() []string { - if m != nil { - return m.Domains - } - return nil -} - -type UpsertDomainResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` -} - -func (m *UpsertDomainResponse) Reset() { *m = UpsertDomainResponse{} } -func (*UpsertDomainResponse) ProtoMessage() {} -func (*UpsertDomainResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_73e6234e76dbdb84, []int{1} -} -func (m *UpsertDomainResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UpsertDomainResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_UpsertDomainResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *UpsertDomainResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpsertDomainResponse.Merge(m, src) -} -func (m *UpsertDomainResponse) XXX_Size() int { - return m.Size() -} -func (m *UpsertDomainResponse) XXX_DiscardUnknown() { - xxx_messageInfo_UpsertDomainResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_UpsertDomainResponse proto.InternalMessageInfo - -func (m *UpsertDomainResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -type UpsertDomainRequest struct { - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain"` - Ttl uint32 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl"` -} - -func (m *UpsertDomainRequest) Reset() { *m = UpsertDomainRequest{} } -func (*UpsertDomainRequest) ProtoMessage() {} -func (*UpsertDomainRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_73e6234e76dbdb84, []int{2} -} -func (m *UpsertDomainRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UpsertDomainRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_UpsertDomainRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *UpsertDomainRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpsertDomainRequest.Merge(m, src) -} -func (m *UpsertDomainRequest) XXX_Size() int { - return m.Size() -} -func (m *UpsertDomainRequest) XXX_DiscardUnknown() { - xxx_messageInfo_UpsertDomainRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_UpsertDomainRequest proto.InternalMessageInfo - -func (m *UpsertDomainRequest) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *UpsertDomainRequest) GetTtl() uint32 { - if m != nil { - return m.Ttl - } - return 0 -} - -func init() { - proto.RegisterType((*DomainsResponse)(nil), "models.DomainsResponse") - proto.RegisterType((*UpsertDomainResponse)(nil), "models.UpsertDomainResponse") - proto.RegisterType((*UpsertDomainRequest)(nil), "models.UpsertDomainRequest") -} - -func init() { proto.RegisterFile("domain.proto", fileDescriptor_73e6234e76dbdb84) } - -var fileDescriptor_73e6234e76dbdb84 = []byte{ - // 271 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x49, 0xc9, 0xcf, 0x4d, - 0xcc, 0xcc, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, 0x29, - 0x96, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, - 0xcf, 0xd7, 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0x26, 0xc5, - 0x9d, 0x5a, 0x54, 0x94, 0x5f, 0x04, 0xe1, 0x28, 0x05, 0x70, 0xf1, 0xbb, 0x80, 0xcd, 0x2c, 0x0e, - 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x15, 0x52, 0xe6, 0x62, 0x05, 0xab, 0x90, 0x60, 0x54, - 0x60, 0xd4, 0xe0, 0x36, 0xe2, 0xd5, 0x83, 0x58, 0xa3, 0xe7, 0x0a, 0x12, 0x0c, 0x82, 0xc8, 0x09, - 0x49, 0x70, 0xb1, 0x43, 0xdc, 0x52, 0x2c, 0xc1, 0xa4, 0xc0, 0xac, 0xc1, 0x19, 0x04, 0xe3, 0x2a, - 0x59, 0x73, 0x89, 0x84, 0x16, 0x14, 0xa7, 0x16, 0x95, 0x40, 0xcc, 0x25, 0xc9, 0x58, 0xa5, 0x10, - 0x2e, 0x61, 0x54, 0xcd, 0x85, 0xa5, 0xa9, 0xc5, 0x25, 0x42, 0x4a, 0x5c, 0x6c, 0x10, 0xe3, 0xc1, - 0x9a, 0x39, 0x9d, 0xb8, 0x5e, 0xdd, 0x93, 0x87, 0x8a, 0x04, 0x41, 0x69, 0x21, 0x49, 0x2e, 0xe6, - 0x92, 0x92, 0x1c, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x5e, 0x27, 0xf6, 0x57, 0xf7, 0xe4, 0x41, 0xdc, - 0x20, 0x10, 0xe1, 0x64, 0x72, 0xe1, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x1f, 0x1e, 0xca, - 0x31, 0x36, 0x3c, 0x92, 0x63, 0x5c, 0xf1, 0x48, 0x8e, 0xe1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, - 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x7c, 0xf1, 0x48, 0x8e, 0xe1, 0xc3, 0x23, 0x39, 0xc6, 0x09, - 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x89, 0x0d, 0x1c, 0x42, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0xd1, 0x20, 0xc4, 0x75, 0x01, 0x00, 0x00, -} - -func (this *DomainsResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DomainsResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "Domains: "+fmt.Sprintf("%#v", this.Domains)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *UpsertDomainResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.UpsertDomainResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *UpsertDomainRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.UpsertDomainRequest{") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "Ttl: "+fmt.Sprintf("%#v", this.Ttl)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringDomain(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *DomainsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DomainsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DomainsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Domains) > 0 { - for iNdEx := len(m.Domains) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Domains[iNdEx]) - copy(dAtA[i:], m.Domains[iNdEx]) - i = encodeVarintDomain(dAtA, i, uint64(len(m.Domains[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDomain(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *UpsertDomainResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UpsertDomainResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UpsertDomainResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDomain(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *UpsertDomainRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UpsertDomainRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UpsertDomainRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Ttl != 0 { - i = encodeVarintDomain(dAtA, i, uint64(m.Ttl)) - i-- - dAtA[i] = 0x10 - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintDomain(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintDomain(dAtA []byte, offset int, v uint64) int { - offset -= sovDomain(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *DomainsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovDomain(uint64(l)) - } - if len(m.Domains) > 0 { - for _, s := range m.Domains { - l = len(s) - n += 1 + l + sovDomain(uint64(l)) - } - } - return n -} - -func (m *UpsertDomainResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovDomain(uint64(l)) - } - return n -} - -func (m *UpsertDomainRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovDomain(uint64(l)) - } - if m.Ttl != 0 { - n += 1 + sovDomain(uint64(m.Ttl)) - } - return n -} - -func sovDomain(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozDomain(x uint64) (n int) { - return sovDomain(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *DomainsResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DomainsResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `Domains:` + fmt.Sprintf("%v", this.Domains) + `,`, - `}`, - }, "") - return s -} -func (this *UpsertDomainResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&UpsertDomainResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `}`, - }, "") - return s -} -func (this *UpsertDomainRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&UpsertDomainRequest{`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `Ttl:` + fmt.Sprintf("%v", this.Ttl) + `,`, - `}`, - }, "") - return s -} -func valueToStringDomain(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *DomainsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DomainsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DomainsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDomain - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDomain - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domains", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDomain - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDomain - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domains = append(m.Domains, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDomain(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDomain - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *UpsertDomainResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UpsertDomainResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UpsertDomainResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDomain - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDomain - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDomain(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDomain - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *UpsertDomainRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UpsertDomainRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UpsertDomainRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDomain - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDomain - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Ttl", wireType) - } - m.Ttl = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDomain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Ttl |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipDomain(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDomain - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipDomain(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDomain - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDomain - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDomain - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthDomain - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupDomain - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthDomain - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthDomain = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDomain = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupDomain = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/environment_variables.gogoproto.go b/protomodels/environment_variables.gogoproto.go deleted file mode 100644 index a292cfe4..00000000 --- a/protomodels/environment_variables.gogoproto.go +++ /dev/null @@ -1,436 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: environment_variables.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type EnvironmentVariable struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value"` -} - -func (m *EnvironmentVariable) Reset() { *m = EnvironmentVariable{} } -func (*EnvironmentVariable) ProtoMessage() {} -func (*EnvironmentVariable) Descriptor() ([]byte, []int) { - return fileDescriptor_8938dda491bd78a1, []int{0} -} -func (m *EnvironmentVariable) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EnvironmentVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EnvironmentVariable.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EnvironmentVariable) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnvironmentVariable.Merge(m, src) -} -func (m *EnvironmentVariable) XXX_Size() int { - return m.Size() -} -func (m *EnvironmentVariable) XXX_DiscardUnknown() { - xxx_messageInfo_EnvironmentVariable.DiscardUnknown(m) -} - -var xxx_messageInfo_EnvironmentVariable proto.InternalMessageInfo - -func (m *EnvironmentVariable) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *EnvironmentVariable) GetValue() string { - if m != nil { - return m.Value - } - return "" -} - -func init() { - proto.RegisterType((*EnvironmentVariable)(nil), "models.EnvironmentVariable") -} - -func init() { proto.RegisterFile("environment_variables.proto", fileDescriptor_8938dda491bd78a1) } - -var fileDescriptor_8938dda491bd78a1 = []byte{ - // 209 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcd, 0x2b, 0xcb, - 0x2c, 0xca, 0xcf, 0xcb, 0x4d, 0xcd, 0x2b, 0x89, 0x2f, 0x4b, 0x2c, 0xca, 0x4c, 0x4c, 0xca, 0x49, - 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x96, - 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, - 0xd7, 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xa6, 0x14, 0xc2, - 0x25, 0xec, 0x8a, 0x30, 0x35, 0x0c, 0x6a, 0xa8, 0x90, 0x0c, 0x17, 0x4b, 0x5e, 0x62, 0x6e, 0xaa, - 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x13, 0xc7, 0xab, 0x7b, 0xf2, 0x60, 0x7e, 0x10, 0x98, 0x14, - 0x92, 0xe7, 0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x95, 0x60, 0x02, 0x4b, 0x73, 0xbe, 0xba, 0x27, - 0x0f, 0x11, 0x08, 0x82, 0x50, 0x4e, 0x26, 0x17, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xf0, - 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, 0x15, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, - 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, - 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0x92, 0xd8, - 0xc0, 0x4e, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x8a, 0x91, 0xe1, 0xe8, 0x00, 0x00, - 0x00, -} - -func (this *EnvironmentVariable) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*EnvironmentVariable) - if !ok { - that2, ok := that.(EnvironmentVariable) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Name != that1.Name { - return false - } - if this.Value != that1.Value { - return false - } - return true -} -func (this *EnvironmentVariable) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.EnvironmentVariable{") - s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n") - s = append(s, "Value: "+fmt.Sprintf("%#v", this.Value)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringEnvironmentVariables(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *EnvironmentVariable) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EnvironmentVariable) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EnvironmentVariable) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Value) > 0 { - i -= len(m.Value) - copy(dAtA[i:], m.Value) - i = encodeVarintEnvironmentVariables(dAtA, i, uint64(len(m.Value))) - i-- - dAtA[i] = 0x12 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintEnvironmentVariables(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintEnvironmentVariables(dAtA []byte, offset int, v uint64) int { - offset -= sovEnvironmentVariables(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *EnvironmentVariable) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovEnvironmentVariables(uint64(l)) - } - l = len(m.Value) - if l > 0 { - n += 1 + l + sovEnvironmentVariables(uint64(l)) - } - return n -} - -func sovEnvironmentVariables(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozEnvironmentVariables(x uint64) (n int) { - return sovEnvironmentVariables(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *EnvironmentVariable) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EnvironmentVariable{`, - `Name:` + fmt.Sprintf("%v", this.Name) + `,`, - `Value:` + fmt.Sprintf("%v", this.Value) + `,`, - `}`, - }, "") - return s -} -func valueToStringEnvironmentVariables(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *EnvironmentVariable) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEnvironmentVariables - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EnvironmentVariable: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EnvironmentVariable: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEnvironmentVariables - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEnvironmentVariables - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEnvironmentVariables - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEnvironmentVariables - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEnvironmentVariables - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEnvironmentVariables - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Value = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEnvironmentVariables(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEnvironmentVariables - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipEnvironmentVariables(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEnvironmentVariables - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEnvironmentVariables - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEnvironmentVariables - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthEnvironmentVariables - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupEnvironmentVariables - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthEnvironmentVariables - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthEnvironmentVariables = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEnvironmentVariables = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupEnvironmentVariables = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/error.gogoproto.go b/protomodels/error.gogoproto.go deleted file mode 100644 index d755a3ce..00000000 --- a/protomodels/error.gogoproto.go +++ /dev/null @@ -1,515 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: error.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strconv "strconv" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Error_Type int32 - -const ( - Error_UnknownError Error_Type = 0 - Error_InvalidRecord Error_Type = 3 - Error_InvalidRequest Error_Type = 4 - Error_InvalidResponse Error_Type = 5 - Error_InvalidProtobufMessage Error_Type = 6 - Error_InvalidJSON Error_Type = 7 - Error_FailedToOpenEnvelope Error_Type = 8 - Error_InvalidStateTransition Error_Type = 9 - Error_ResourceConflict Error_Type = 11 - Error_ResourceExists Error_Type = 12 - Error_ResourceNotFound Error_Type = 13 - Error_RouterError Error_Type = 14 - Error_ActualLRPCannotBeClaimed Error_Type = 15 - Error_ActualLRPCannotBeStarted Error_Type = 16 - Error_ActualLRPCannotBeCrashed Error_Type = 17 - Error_ActualLRPCannotBeFailed Error_Type = 18 - Error_ActualLRPCannotBeRemoved Error_Type = 19 - Error_ActualLRPCannotBeUnclaimed Error_Type = 21 - Error_RunningOnDifferentCell Error_Type = 24 - Error_GUIDGeneration Error_Type = 26 - Error_Deserialize Error_Type = 27 - Error_Deadlock Error_Type = 28 - Error_Unrecoverable Error_Type = 29 - Error_LockCollision Error_Type = 30 - Error_Timeout Error_Type = 31 -) - -var Error_Type_name = map[int32]string{ - 0: "UnknownError", - 3: "InvalidRecord", - 4: "InvalidRequest", - 5: "InvalidResponse", - 6: "InvalidProtobufMessage", - 7: "InvalidJSON", - 8: "FailedToOpenEnvelope", - 9: "InvalidStateTransition", - 11: "ResourceConflict", - 12: "ResourceExists", - 13: "ResourceNotFound", - 14: "RouterError", - 15: "ActualLRPCannotBeClaimed", - 16: "ActualLRPCannotBeStarted", - 17: "ActualLRPCannotBeCrashed", - 18: "ActualLRPCannotBeFailed", - 19: "ActualLRPCannotBeRemoved", - 21: "ActualLRPCannotBeUnclaimed", - 24: "RunningOnDifferentCell", - 26: "GUIDGeneration", - 27: "Deserialize", - 28: "Deadlock", - 29: "Unrecoverable", - 30: "LockCollision", - 31: "Timeout", -} - -var Error_Type_value = map[string]int32{ - "UnknownError": 0, - "InvalidRecord": 3, - "InvalidRequest": 4, - "InvalidResponse": 5, - "InvalidProtobufMessage": 6, - "InvalidJSON": 7, - "FailedToOpenEnvelope": 8, - "InvalidStateTransition": 9, - "ResourceConflict": 11, - "ResourceExists": 12, - "ResourceNotFound": 13, - "RouterError": 14, - "ActualLRPCannotBeClaimed": 15, - "ActualLRPCannotBeStarted": 16, - "ActualLRPCannotBeCrashed": 17, - "ActualLRPCannotBeFailed": 18, - "ActualLRPCannotBeRemoved": 19, - "ActualLRPCannotBeUnclaimed": 21, - "RunningOnDifferentCell": 24, - "GUIDGeneration": 26, - "Deserialize": 27, - "Deadlock": 28, - "Unrecoverable": 29, - "LockCollision": 30, - "Timeout": 31, -} - -func (Error_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0579b252106fcf4a, []int{0, 0} -} - -type Error struct { - Type Error_Type `protobuf:"varint,1,opt,name=type,proto3,enum=models.Error_Type" json:"type"` - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message"` -} - -func (m *Error) Reset() { *m = Error{} } -func (*Error) ProtoMessage() {} -func (*Error) Descriptor() ([]byte, []int) { - return fileDescriptor_0579b252106fcf4a, []int{0} -} -func (m *Error) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Error) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Error.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Error) XXX_Merge(src proto.Message) { - xxx_messageInfo_Error.Merge(m, src) -} -func (m *Error) XXX_Size() int { - return m.Size() -} -func (m *Error) XXX_DiscardUnknown() { - xxx_messageInfo_Error.DiscardUnknown(m) -} - -var xxx_messageInfo_Error proto.InternalMessageInfo - -func (m *Error) GetType() Error_Type { - if m != nil { - return m.Type - } - return Error_UnknownError -} - -func (m *Error) GetMessage() string { - if m != nil { - return m.Message - } - return "" -} - -func init() { - proto.RegisterEnum("models.Error_Type", Error_Type_name, Error_Type_value) - proto.RegisterType((*Error)(nil), "models.Error") -} - -func init() { proto.RegisterFile("error.proto", fileDescriptor_0579b252106fcf4a) } - -var fileDescriptor_0579b252106fcf4a = []byte{ - // 585 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcd, 0x4e, 0xdb, 0x4c, - 0x14, 0xb5, 0xf9, 0x0c, 0x98, 0x09, 0x3f, 0x97, 0x21, 0x1f, 0x84, 0x40, 0x07, 0x64, 0xa9, 0x12, - 0x9b, 0x86, 0xaa, 0xed, 0x0b, 0x34, 0x09, 0x20, 0x2a, 0x0a, 0xc8, 0x24, 0x0f, 0x30, 0xb1, 0x6f, - 0xc2, 0x88, 0xc9, 0x4c, 0x3a, 0x1e, 0xa7, 0xa5, 0xab, 0x3e, 0x42, 0x1f, 0xa3, 0x8f, 0xd2, 0x45, - 0x17, 0x2c, 0x59, 0xa1, 0x62, 0x36, 0x2d, 0x2b, 0x1e, 0xa1, 0xb2, 0x13, 0x10, 0x12, 0x6c, 0xac, - 0x7b, 0xcf, 0xb9, 0xe7, 0xf8, 0x9e, 0x6b, 0x99, 0x94, 0xd0, 0x18, 0x6d, 0x6a, 0x03, 0xa3, 0xad, - 0xa6, 0x53, 0x7d, 0x1d, 0xa3, 0x4c, 0xaa, 0xaf, 0x7a, 0xc2, 0x9e, 0xa6, 0x9d, 0x5a, 0xa4, 0xfb, - 0xdb, 0x3d, 0xdd, 0xd3, 0xdb, 0x05, 0xdd, 0x49, 0xbb, 0x45, 0x57, 0x34, 0x45, 0x35, 0x92, 0x05, - 0xbf, 0x26, 0xc9, 0xe4, 0x4e, 0x6e, 0x43, 0x5f, 0x13, 0xcf, 0x9e, 0x0f, 0xb0, 0xe2, 0x6e, 0xba, - 0x5b, 0xf3, 0x6f, 0x68, 0x6d, 0xe4, 0x57, 0x2b, 0xc8, 0x5a, 0xeb, 0x7c, 0x80, 0x75, 0xff, 0xf6, - 0x6a, 0xa3, 0x98, 0x09, 0x8b, 0x27, 0x7d, 0x49, 0xa6, 0xfb, 0x98, 0x24, 0xbc, 0x87, 0x95, 0x89, - 0x4d, 0x77, 0x6b, 0xa6, 0x5e, 0xba, 0xbd, 0xda, 0xb8, 0x87, 0xc2, 0xfb, 0x22, 0xf8, 0xeb, 0x11, - 0x2f, 0xd7, 0x53, 0x20, 0xb3, 0x6d, 0x75, 0xa6, 0xf4, 0x67, 0x55, 0x98, 0x82, 0x43, 0x17, 0xc9, - 0xdc, 0xbe, 0x1a, 0x72, 0x29, 0xe2, 0x10, 0x23, 0x6d, 0x62, 0xf8, 0x8f, 0x52, 0x32, 0xff, 0x00, - 0x7d, 0x4a, 0x31, 0xb1, 0xe0, 0xd1, 0x25, 0xb2, 0xf0, 0x80, 0x25, 0x03, 0xad, 0x12, 0x84, 0x49, - 0x5a, 0x25, 0xcb, 0x63, 0xf0, 0x78, 0x9c, 0xf0, 0xe3, 0xe8, 0x85, 0x30, 0x45, 0x17, 0x48, 0x69, - 0xcc, 0x7d, 0x38, 0x39, 0x3a, 0x84, 0x69, 0x5a, 0x21, 0xe5, 0x5d, 0x2e, 0x24, 0xc6, 0x2d, 0x7d, - 0x34, 0x40, 0xb5, 0xa3, 0x86, 0x28, 0xf5, 0x00, 0xc1, 0x7f, 0x64, 0x73, 0x62, 0xb9, 0xc5, 0x96, - 0xe1, 0x2a, 0x11, 0x56, 0x68, 0x05, 0x33, 0xb4, 0x4c, 0x20, 0xc4, 0x44, 0xa7, 0x26, 0xc2, 0x86, - 0x56, 0x5d, 0x29, 0x22, 0x0b, 0xa5, 0x7c, 0xc3, 0x7b, 0x74, 0xe7, 0x8b, 0x48, 0x6c, 0x02, 0xb3, - 0x8f, 0x27, 0x0f, 0xb5, 0xdd, 0xd5, 0xa9, 0x8a, 0x61, 0x2e, 0x5f, 0x23, 0xd4, 0xa9, 0x45, 0x33, - 0xca, 0x3b, 0x4f, 0xd7, 0x49, 0xe5, 0x7d, 0x64, 0x53, 0x2e, 0x0f, 0xc2, 0xe3, 0x06, 0x57, 0x4a, - 0xdb, 0x3a, 0x36, 0x24, 0x17, 0x7d, 0x8c, 0x61, 0xe1, 0x59, 0xf6, 0xc4, 0x72, 0x63, 0x31, 0x06, - 0x78, 0x5e, 0x6b, 0x78, 0x72, 0x8a, 0x31, 0x2c, 0xd2, 0x35, 0xb2, 0xf2, 0x84, 0x1d, 0x25, 0x06, - 0xfa, 0xac, 0x34, 0xc4, 0xbe, 0x1e, 0x62, 0x0c, 0x4b, 0x94, 0x91, 0xea, 0x13, 0xb6, 0xad, 0xa2, - 0xf1, 0x5a, 0xff, 0xe7, 0x17, 0x0a, 0x53, 0xa5, 0x84, 0xea, 0x1d, 0xa9, 0xa6, 0xe8, 0x76, 0xd1, - 0xa0, 0xb2, 0x0d, 0x94, 0x12, 0x2a, 0xf9, 0x2d, 0xf6, 0xda, 0xfb, 0xcd, 0x3d, 0x54, 0x68, 0x78, - 0x71, 0xb5, 0x6a, 0x9e, 0xba, 0x89, 0x09, 0x1a, 0xc1, 0xa5, 0xf8, 0x8a, 0xb0, 0x46, 0x67, 0x89, - 0xdf, 0x44, 0x1e, 0x4b, 0x1d, 0x9d, 0xc1, 0x7a, 0xfe, 0xcd, 0xdb, 0xca, 0x60, 0xa4, 0x87, 0x68, - 0x78, 0x47, 0x22, 0xbc, 0xc8, 0xa1, 0x03, 0x1d, 0x9d, 0x35, 0xb4, 0x94, 0x22, 0xc9, 0x4d, 0x18, - 0x2d, 0x91, 0xe9, 0x96, 0xe8, 0xa3, 0x4e, 0x2d, 0x6c, 0x04, 0x9e, 0xef, 0x82, 0x1b, 0x78, 0xfe, - 0x04, 0x4c, 0x04, 0x9e, 0x4f, 0x80, 0x04, 0x9e, 0x5f, 0x86, 0x72, 0xe0, 0xf9, 0xcb, 0xb0, 0x1c, - 0x78, 0xfe, 0x0a, 0xac, 0x04, 0x9e, 0xbf, 0x0a, 0xab, 0xf5, 0x77, 0x17, 0xd7, 0xcc, 0xbd, 0xbc, - 0x66, 0xce, 0xdd, 0x35, 0x73, 0xbf, 0x65, 0xcc, 0xfd, 0x91, 0x31, 0xe7, 0x67, 0xc6, 0xdc, 0x8b, - 0x8c, 0xb9, 0xbf, 0x33, 0xe6, 0xfe, 0xc9, 0x98, 0x73, 0x97, 0x31, 0xf7, 0xfb, 0x0d, 0x73, 0x2e, - 0x6e, 0x98, 0x73, 0x79, 0xc3, 0x9c, 0xce, 0x54, 0xf1, 0x2f, 0xbc, 0xfd, 0x17, 0x00, 0x00, 0xff, - 0xff, 0xf2, 0xb4, 0xa0, 0xf2, 0x51, 0x03, 0x00, 0x00, -} - -func (x Error_Type) String() string { - s, ok := Error_Type_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (this *Error) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.Error{") - s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n") - s = append(s, "Message: "+fmt.Sprintf("%#v", this.Message)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringError(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *Error) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Error) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Error) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Message) > 0 { - i -= len(m.Message) - copy(dAtA[i:], m.Message) - i = encodeVarintError(dAtA, i, uint64(len(m.Message))) - i-- - dAtA[i] = 0x12 - } - if m.Type != 0 { - i = encodeVarintError(dAtA, i, uint64(m.Type)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintError(dAtA []byte, offset int, v uint64) int { - offset -= sovError(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Error) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Type != 0 { - n += 1 + sovError(uint64(m.Type)) - } - l = len(m.Message) - if l > 0 { - n += 1 + l + sovError(uint64(l)) - } - return n -} - -func sovError(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozError(x uint64) (n int) { - return sovError(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *Error) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Error{`, - `Type:` + fmt.Sprintf("%v", this.Type) + `,`, - `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `}`, - }, "") - return s -} -func valueToStringError(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *Error) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowError - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Error: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Error: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - m.Type = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowError - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Type |= Error_Type(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Message", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowError - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthError - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthError - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Message = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipError(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthError - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipError(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowError - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowError - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowError - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthError - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupError - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthError - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthError = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowError = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupError = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/evacuation.gogoproto.go b/protomodels/evacuation.gogoproto.go deleted file mode 100644 index 45ec8a6b..00000000 --- a/protomodels/evacuation.gogoproto.go +++ /dev/null @@ -1,2503 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: evacuation.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type EvacuationResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - KeepContainer bool `protobuf:"varint,2,opt,name=keep_container,json=keepContainer,proto3" json:"keep_container"` -} - -func (m *EvacuationResponse) Reset() { *m = EvacuationResponse{} } -func (*EvacuationResponse) ProtoMessage() {} -func (*EvacuationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5cec7f656fd69c9d, []int{0} -} -func (m *EvacuationResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EvacuationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EvacuationResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EvacuationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvacuationResponse.Merge(m, src) -} -func (m *EvacuationResponse) XXX_Size() int { - return m.Size() -} -func (m *EvacuationResponse) XXX_DiscardUnknown() { - xxx_messageInfo_EvacuationResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_EvacuationResponse proto.InternalMessageInfo - -func (m *EvacuationResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *EvacuationResponse) GetKeepContainer() bool { - if m != nil { - return m.KeepContainer - } - return false -} - -type EvacuateClaimedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` -} - -func (m *EvacuateClaimedActualLRPRequest) Reset() { *m = EvacuateClaimedActualLRPRequest{} } -func (*EvacuateClaimedActualLRPRequest) ProtoMessage() {} -func (*EvacuateClaimedActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5cec7f656fd69c9d, []int{1} -} -func (m *EvacuateClaimedActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EvacuateClaimedActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EvacuateClaimedActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EvacuateClaimedActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvacuateClaimedActualLRPRequest.Merge(m, src) -} -func (m *EvacuateClaimedActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *EvacuateClaimedActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EvacuateClaimedActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_EvacuateClaimedActualLRPRequest proto.InternalMessageInfo - -func (m *EvacuateClaimedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *EvacuateClaimedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -type EvacuateRunningActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` - ActualLrpNetInfo *ActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` - ActualLrpInternalRoutes []*ActualLRPInternalRoute `protobuf:"bytes,5,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,6,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - // Types that are valid to be assigned to OptionalRoutable: - // *EvacuateRunningActualLRPRequest_Routable - OptionalRoutable isEvacuateRunningActualLRPRequest_OptionalRoutable `protobuf_oneof:"optional_routable"` - AvailabilityZone string `protobuf:"bytes,8,opt,name=availability_zone,json=availabilityZone,proto3" json:"availability_zone"` -} - -func (m *EvacuateRunningActualLRPRequest) Reset() { *m = EvacuateRunningActualLRPRequest{} } -func (*EvacuateRunningActualLRPRequest) ProtoMessage() {} -func (*EvacuateRunningActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5cec7f656fd69c9d, []int{2} -} -func (m *EvacuateRunningActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EvacuateRunningActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EvacuateRunningActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EvacuateRunningActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvacuateRunningActualLRPRequest.Merge(m, src) -} -func (m *EvacuateRunningActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *EvacuateRunningActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EvacuateRunningActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_EvacuateRunningActualLRPRequest proto.InternalMessageInfo - -type isEvacuateRunningActualLRPRequest_OptionalRoutable interface { - isEvacuateRunningActualLRPRequest_OptionalRoutable() - MarshalTo([]byte) (int, error) - Size() int -} - -type EvacuateRunningActualLRPRequest_Routable struct { - Routable bool `protobuf:"varint,7,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` -} - -func (*EvacuateRunningActualLRPRequest_Routable) isEvacuateRunningActualLRPRequest_OptionalRoutable() { -} - -func (m *EvacuateRunningActualLRPRequest) GetOptionalRoutable() isEvacuateRunningActualLRPRequest_OptionalRoutable { - if m != nil { - return m.OptionalRoutable - } - return nil -} - -func (m *EvacuateRunningActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *EvacuateRunningActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -func (m *EvacuateRunningActualLRPRequest) GetActualLrpNetInfo() *ActualLRPNetInfo { - if m != nil { - return m.ActualLrpNetInfo - } - return nil -} - -func (m *EvacuateRunningActualLRPRequest) GetActualLrpInternalRoutes() []*ActualLRPInternalRoute { - if m != nil { - return m.ActualLrpInternalRoutes - } - return nil -} - -func (m *EvacuateRunningActualLRPRequest) GetMetricTags() map[string]string { - if m != nil { - return m.MetricTags - } - return nil -} - -func (m *EvacuateRunningActualLRPRequest) GetRoutable() bool { - if x, ok := m.GetOptionalRoutable().(*EvacuateRunningActualLRPRequest_Routable); ok { - return x.Routable - } - return false -} - -func (m *EvacuateRunningActualLRPRequest) GetAvailabilityZone() string { - if m != nil { - return m.AvailabilityZone - } - return "" -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*EvacuateRunningActualLRPRequest) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*EvacuateRunningActualLRPRequest_Routable)(nil), - } -} - -type EvacuateStoppedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` -} - -func (m *EvacuateStoppedActualLRPRequest) Reset() { *m = EvacuateStoppedActualLRPRequest{} } -func (*EvacuateStoppedActualLRPRequest) ProtoMessage() {} -func (*EvacuateStoppedActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5cec7f656fd69c9d, []int{3} -} -func (m *EvacuateStoppedActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EvacuateStoppedActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EvacuateStoppedActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EvacuateStoppedActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvacuateStoppedActualLRPRequest.Merge(m, src) -} -func (m *EvacuateStoppedActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *EvacuateStoppedActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EvacuateStoppedActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_EvacuateStoppedActualLRPRequest proto.InternalMessageInfo - -func (m *EvacuateStoppedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *EvacuateStoppedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -type EvacuateCrashedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` - ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,json=errorMessage,proto3" json:"error_message"` -} - -func (m *EvacuateCrashedActualLRPRequest) Reset() { *m = EvacuateCrashedActualLRPRequest{} } -func (*EvacuateCrashedActualLRPRequest) ProtoMessage() {} -func (*EvacuateCrashedActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5cec7f656fd69c9d, []int{4} -} -func (m *EvacuateCrashedActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EvacuateCrashedActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EvacuateCrashedActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EvacuateCrashedActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EvacuateCrashedActualLRPRequest.Merge(m, src) -} -func (m *EvacuateCrashedActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *EvacuateCrashedActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EvacuateCrashedActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_EvacuateCrashedActualLRPRequest proto.InternalMessageInfo - -func (m *EvacuateCrashedActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *EvacuateCrashedActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -func (m *EvacuateCrashedActualLRPRequest) GetErrorMessage() string { - if m != nil { - return m.ErrorMessage - } - return "" -} - -type RemoveEvacuatingActualLRPRequest struct { - ActualLrpKey *ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` -} - -func (m *RemoveEvacuatingActualLRPRequest) Reset() { *m = RemoveEvacuatingActualLRPRequest{} } -func (*RemoveEvacuatingActualLRPRequest) ProtoMessage() {} -func (*RemoveEvacuatingActualLRPRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5cec7f656fd69c9d, []int{5} -} -func (m *RemoveEvacuatingActualLRPRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RemoveEvacuatingActualLRPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RemoveEvacuatingActualLRPRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RemoveEvacuatingActualLRPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveEvacuatingActualLRPRequest.Merge(m, src) -} -func (m *RemoveEvacuatingActualLRPRequest) XXX_Size() int { - return m.Size() -} -func (m *RemoveEvacuatingActualLRPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveEvacuatingActualLRPRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_RemoveEvacuatingActualLRPRequest proto.InternalMessageInfo - -func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} - -func (m *RemoveEvacuatingActualLRPRequest) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} - -type RemoveEvacuatingActualLRPResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` -} - -func (m *RemoveEvacuatingActualLRPResponse) Reset() { *m = RemoveEvacuatingActualLRPResponse{} } -func (*RemoveEvacuatingActualLRPResponse) ProtoMessage() {} -func (*RemoveEvacuatingActualLRPResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5cec7f656fd69c9d, []int{6} -} -func (m *RemoveEvacuatingActualLRPResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RemoveEvacuatingActualLRPResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RemoveEvacuatingActualLRPResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RemoveEvacuatingActualLRPResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RemoveEvacuatingActualLRPResponse.Merge(m, src) -} -func (m *RemoveEvacuatingActualLRPResponse) XXX_Size() int { - return m.Size() -} -func (m *RemoveEvacuatingActualLRPResponse) XXX_DiscardUnknown() { - xxx_messageInfo_RemoveEvacuatingActualLRPResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_RemoveEvacuatingActualLRPResponse proto.InternalMessageInfo - -func (m *RemoveEvacuatingActualLRPResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func init() { - proto.RegisterType((*EvacuationResponse)(nil), "models.EvacuationResponse") - proto.RegisterType((*EvacuateClaimedActualLRPRequest)(nil), "models.EvacuateClaimedActualLRPRequest") - proto.RegisterType((*EvacuateRunningActualLRPRequest)(nil), "models.EvacuateRunningActualLRPRequest") - proto.RegisterMapType((map[string]string)(nil), "models.EvacuateRunningActualLRPRequest.MetricTagsEntry") - proto.RegisterType((*EvacuateStoppedActualLRPRequest)(nil), "models.EvacuateStoppedActualLRPRequest") - proto.RegisterType((*EvacuateCrashedActualLRPRequest)(nil), "models.EvacuateCrashedActualLRPRequest") - proto.RegisterType((*RemoveEvacuatingActualLRPRequest)(nil), "models.RemoveEvacuatingActualLRPRequest") - proto.RegisterType((*RemoveEvacuatingActualLRPResponse)(nil), "models.RemoveEvacuatingActualLRPResponse") -} - -func init() { proto.RegisterFile("evacuation.proto", fileDescriptor_5cec7f656fd69c9d) } - -var fileDescriptor_5cec7f656fd69c9d = []byte{ - // 628 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xcd, 0x4e, 0xdb, 0x4c, - 0x14, 0xf5, 0x00, 0xe1, 0x4b, 0x26, 0xc0, 0x17, 0x06, 0x2a, 0xac, 0x08, 0x4d, 0xd2, 0x74, 0x93, - 0x4d, 0x83, 0x44, 0xab, 0xfe, 0x20, 0x75, 0xd1, 0x20, 0x54, 0x28, 0x50, 0x55, 0x43, 0x17, 0x55, - 0xbb, 0xb0, 0x26, 0xe1, 0x62, 0x2c, 0xec, 0x19, 0xd7, 0x1e, 0x47, 0x4a, 0x57, 0x7d, 0x84, 0x3e, - 0x46, 0xd7, 0xed, 0x4b, 0x74, 0xc9, 0x92, 0x15, 0x2a, 0x66, 0x53, 0x65, 0x51, 0xf1, 0x08, 0x95, - 0xc7, 0x89, 0x31, 0x50, 0x21, 0x75, 0xd7, 0xec, 0xe6, 0x9c, 0x7b, 0xef, 0xb9, 0x47, 0x33, 0x73, - 0x67, 0x70, 0x05, 0x7a, 0xbc, 0x1b, 0x71, 0xe5, 0x48, 0xd1, 0xf2, 0x03, 0xa9, 0x24, 0x99, 0xf6, - 0xe4, 0x3e, 0xb8, 0x61, 0xf5, 0xbe, 0xed, 0xa8, 0xc3, 0xa8, 0xd3, 0xea, 0x4a, 0x6f, 0xc5, 0x96, - 0xb6, 0x5c, 0xd1, 0xe1, 0x4e, 0x74, 0xa0, 0x91, 0x06, 0x7a, 0x95, 0x96, 0x55, 0x2b, 0xbc, 0xab, - 0x22, 0xee, 0x5a, 0x6e, 0xe0, 0x0f, 0x99, 0x32, 0x04, 0x81, 0x0c, 0x52, 0xd0, 0x50, 0x98, 0x6c, - 0x64, 0x9d, 0x18, 0x84, 0xbe, 0x14, 0x21, 0x90, 0x7b, 0xb8, 0xa0, 0x93, 0x4c, 0x54, 0x47, 0xcd, - 0xf2, 0xea, 0x6c, 0x2b, 0xed, 0xdd, 0xda, 0x48, 0x48, 0x96, 0xc6, 0xc8, 0x53, 0x3c, 0x77, 0x04, - 0xe0, 0x5b, 0x5d, 0x29, 0x14, 0x77, 0x04, 0x04, 0xe6, 0x44, 0x1d, 0x35, 0x8b, 0x6d, 0x32, 0x38, - 0xad, 0x5d, 0x8b, 0xb0, 0xd9, 0x04, 0xaf, 0x8f, 0x60, 0xe3, 0x2b, 0xc2, 0xb5, 0x61, 0x5b, 0x58, - 0x77, 0xb9, 0xe3, 0xc1, 0xfe, 0x73, 0x6d, 0x73, 0x87, 0xbd, 0x66, 0xf0, 0x21, 0x82, 0x50, 0x91, - 0x35, 0x3c, 0x77, 0x69, 0xdd, 0x3a, 0x82, 0xfe, 0xd0, 0xcc, 0xe2, 0xc8, 0x4c, 0x56, 0xb1, 0x0d, - 0x7d, 0x36, 0x93, 0xe6, 0xee, 0x04, 0xfe, 0x36, 0xf4, 0xc9, 0x1e, 0x5e, 0xca, 0xd5, 0x3a, 0x22, - 0x54, 0x5c, 0x74, 0x41, 0x8b, 0x4c, 0x68, 0x91, 0xe5, 0x1b, 0x22, 0x5b, 0xc3, 0xa4, 0x44, 0x6c, - 0x31, 0x13, 0xcb, 0xb1, 0x8d, 0x5f, 0x53, 0x97, 0xa6, 0x59, 0x24, 0x84, 0x23, 0xec, 0x7f, 0xde, - 0x34, 0x79, 0x81, 0x17, 0x72, 0xa2, 0x02, 0x94, 0xe5, 0x88, 0x03, 0x69, 0x4e, 0x6a, 0x41, 0xf3, - 0x86, 0xe0, 0x2b, 0x50, 0x5b, 0xe2, 0x40, 0xb2, 0x4a, 0x26, 0x36, 0x64, 0xc8, 0x7b, 0x5c, 0xbd, - 0xe2, 0x4e, 0x41, 0x20, 0xb8, 0x6b, 0x05, 0x32, 0x52, 0x10, 0x9a, 0x85, 0xfa, 0x64, 0xb3, 0xbc, - 0x4a, 0xff, 0x60, 0x30, 0xcd, 0x63, 0x49, 0x1a, 0x5b, 0xca, 0x59, 0xcc, 0xf1, 0x21, 0x79, 0x8b, - 0xcb, 0x1e, 0xa8, 0xc0, 0xe9, 0x5a, 0x8a, 0xdb, 0xa1, 0x39, 0xad, 0xd5, 0x1e, 0x67, 0xb7, 0xee, - 0xf6, 0x4d, 0x6f, 0xed, 0xea, 0xd2, 0x37, 0xdc, 0x0e, 0x37, 0x84, 0x0a, 0xfa, 0x0c, 0x7b, 0x19, - 0x41, 0x96, 0x71, 0x31, 0xe9, 0xc1, 0x3b, 0x2e, 0x98, 0xff, 0x25, 0xd7, 0x73, 0xd3, 0x60, 0x19, - 0x43, 0xda, 0x78, 0x9e, 0xf7, 0xb8, 0xe3, 0xf2, 0x8e, 0xe3, 0x3a, 0xaa, 0x6f, 0x7d, 0x94, 0x02, - 0xcc, 0x62, 0x1d, 0x35, 0x4b, 0xed, 0x3b, 0x83, 0xd3, 0xda, 0xcd, 0x20, 0xab, 0xe4, 0xa9, 0x77, - 0x52, 0x40, 0xf5, 0x19, 0xfe, 0xff, 0x9a, 0x01, 0x52, 0xc1, 0x93, 0xa3, 0xa3, 0x2f, 0xb1, 0x64, - 0x49, 0x16, 0x71, 0xa1, 0xc7, 0xdd, 0x08, 0xf4, 0x49, 0x96, 0x58, 0x0a, 0xd6, 0x26, 0x9e, 0xa0, - 0xf6, 0x02, 0x9e, 0x97, 0x7e, 0x32, 0x7c, 0xc3, 0xcd, 0x4c, 0x7c, 0xbd, 0x9c, 0x2a, 0x4e, 0x55, - 0x0a, 0x57, 0xa6, 0x64, 0x4f, 0x49, 0xdf, 0x1f, 0x87, 0x29, 0x19, 0xe4, 0x47, 0x3b, 0xe0, 0xe1, - 0xe1, 0x18, 0x98, 0x26, 0x8f, 0xf0, 0xac, 0x7e, 0xd3, 0x2c, 0x0f, 0xc2, 0x90, 0xdb, 0xa0, 0xe7, - 0xa3, 0xd4, 0x9e, 0x1f, 0x9c, 0xd6, 0xae, 0x06, 0xd8, 0x8c, 0x86, 0xbb, 0x29, 0x6a, 0x7c, 0x43, - 0xb8, 0xce, 0xc0, 0x93, 0x3d, 0x18, 0x3d, 0xa2, 0x63, 0xf0, 0x26, 0x34, 0x36, 0xf1, 0xdd, 0x5b, - 0x4c, 0xff, 0xc5, 0x17, 0xd0, 0x7e, 0x78, 0x7c, 0x46, 0x8d, 0x93, 0x33, 0x6a, 0x5c, 0x9c, 0x51, - 0xf4, 0x29, 0xa6, 0xe8, 0x4b, 0x4c, 0x8d, 0xef, 0x31, 0x45, 0xc7, 0x31, 0x45, 0x3f, 0x62, 0x8a, - 0x7e, 0xc6, 0xd4, 0xb8, 0x88, 0x29, 0xfa, 0x7c, 0x4e, 0x8d, 0xe3, 0x73, 0x6a, 0x9c, 0x9c, 0x53, - 0xa3, 0x33, 0xad, 0xbf, 0x9e, 0x07, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x02, 0x9c, 0x2f, 0xec, - 0xe4, 0x06, 0x00, 0x00, -} - -func (this *EvacuationResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.EvacuationResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "KeepContainer: "+fmt.Sprintf("%#v", this.KeepContainer)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *EvacuateClaimedActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.EvacuateClaimedActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *EvacuateRunningActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 11) - s = append(s, "&models.EvacuateRunningActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - if this.ActualLrpNetInfo != nil { - s = append(s, "ActualLrpNetInfo: "+fmt.Sprintf("%#v", this.ActualLrpNetInfo)+",\n") - } - if this.ActualLrpInternalRoutes != nil { - s = append(s, "ActualLrpInternalRoutes: "+fmt.Sprintf("%#v", this.ActualLrpInternalRoutes)+",\n") - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]string{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%#v: %#v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - if this.MetricTags != nil { - s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") - } - if this.OptionalRoutable != nil { - s = append(s, "OptionalRoutable: "+fmt.Sprintf("%#v", this.OptionalRoutable)+",\n") - } - s = append(s, "AvailabilityZone: "+fmt.Sprintf("%#v", this.AvailabilityZone)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *EvacuateRunningActualLRPRequest_Routable) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.EvacuateRunningActualLRPRequest_Routable{` + - `Routable:` + fmt.Sprintf("%#v", this.Routable) + `}`}, ", ") - return s -} -func (this *EvacuateStoppedActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.EvacuateStoppedActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *EvacuateCrashedActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.EvacuateCrashedActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - s = append(s, "ErrorMessage: "+fmt.Sprintf("%#v", this.ErrorMessage)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *RemoveEvacuatingActualLRPRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.RemoveEvacuatingActualLRPRequest{") - if this.ActualLrpKey != nil { - s = append(s, "ActualLrpKey: "+fmt.Sprintf("%#v", this.ActualLrpKey)+",\n") - } - if this.ActualLrpInstanceKey != nil { - s = append(s, "ActualLrpInstanceKey: "+fmt.Sprintf("%#v", this.ActualLrpInstanceKey)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *RemoveEvacuatingActualLRPResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.RemoveEvacuatingActualLRPResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringEvacuation(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *EvacuationResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EvacuationResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EvacuationResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.KeepContainer { - i-- - if m.KeepContainer { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EvacuateClaimedActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EvacuateClaimedActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EvacuateClaimedActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EvacuateRunningActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EvacuateRunningActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EvacuateRunningActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.AvailabilityZone) > 0 { - i -= len(m.AvailabilityZone) - copy(dAtA[i:], m.AvailabilityZone) - i = encodeVarintEvacuation(dAtA, i, uint64(len(m.AvailabilityZone))) - i-- - dAtA[i] = 0x42 - } - if m.OptionalRoutable != nil { - { - size := m.OptionalRoutable.Size() - i -= size - if _, err := m.OptionalRoutable.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if len(m.MetricTags) > 0 { - for k := range m.MetricTags { - v := m.MetricTags[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintEvacuation(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintEvacuation(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintEvacuation(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x32 - } - } - if len(m.ActualLrpInternalRoutes) > 0 { - for iNdEx := len(m.ActualLrpInternalRoutes) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ActualLrpInternalRoutes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - } - if m.ActualLrpNetInfo != nil { - { - size, err := m.ActualLrpNetInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EvacuateRunningActualLRPRequest_Routable) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EvacuateRunningActualLRPRequest_Routable) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i-- - if m.Routable { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - return len(dAtA) - i, nil -} -func (m *EvacuateStoppedActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EvacuateStoppedActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EvacuateStoppedActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EvacuateCrashedActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EvacuateCrashedActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EvacuateCrashedActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ErrorMessage) > 0 { - i -= len(m.ErrorMessage) - copy(dAtA[i:], m.ErrorMessage) - i = encodeVarintEvacuation(dAtA, i, uint64(len(m.ErrorMessage))) - i-- - dAtA[i] = 0x1a - } - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *RemoveEvacuatingActualLRPRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RemoveEvacuatingActualLRPRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RemoveEvacuatingActualLRPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpInstanceKey != nil { - { - size, err := m.ActualLrpInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.ActualLrpKey != nil { - { - size, err := m.ActualLrpKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *RemoveEvacuatingActualLRPResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RemoveEvacuatingActualLRPResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RemoveEvacuatingActualLRPResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvacuation(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintEvacuation(dAtA []byte, offset int, v uint64) int { - offset -= sovEvacuation(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *EvacuationResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if m.KeepContainer { - n += 2 - } - return n -} - -func (m *EvacuateClaimedActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - return n -} - -func (m *EvacuateRunningActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if m.ActualLrpNetInfo != nil { - l = m.ActualLrpNetInfo.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if len(m.ActualLrpInternalRoutes) > 0 { - for _, e := range m.ActualLrpInternalRoutes { - l = e.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - } - if len(m.MetricTags) > 0 { - for k, v := range m.MetricTags { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovEvacuation(uint64(len(k))) + 1 + len(v) + sovEvacuation(uint64(len(v))) - n += mapEntrySize + 1 + sovEvacuation(uint64(mapEntrySize)) - } - } - if m.OptionalRoutable != nil { - n += m.OptionalRoutable.Size() - } - l = len(m.AvailabilityZone) - if l > 0 { - n += 1 + l + sovEvacuation(uint64(l)) - } - return n -} - -func (m *EvacuateRunningActualLRPRequest_Routable) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 2 - return n -} -func (m *EvacuateStoppedActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - return n -} - -func (m *EvacuateCrashedActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - l = len(m.ErrorMessage) - if l > 0 { - n += 1 + l + sovEvacuation(uint64(l)) - } - return n -} - -func (m *RemoveEvacuatingActualLRPRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpKey != nil { - l = m.ActualLrpKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - if m.ActualLrpInstanceKey != nil { - l = m.ActualLrpInstanceKey.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - return n -} - -func (m *RemoveEvacuatingActualLRPResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovEvacuation(uint64(l)) - } - return n -} - -func sovEvacuation(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozEvacuation(x uint64) (n int) { - return sovEvacuation(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *EvacuationResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EvacuationResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `KeepContainer:` + fmt.Sprintf("%v", this.KeepContainer) + `,`, - `}`, - }, "") - return s -} -func (this *EvacuateClaimedActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EvacuateClaimedActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `}`, - }, "") - return s -} -func (this *EvacuateRunningActualLRPRequest) String() string { - if this == nil { - return "nil" - } - repeatedStringForActualLrpInternalRoutes := "[]*ActualLRPInternalRoute{" - for _, f := range this.ActualLrpInternalRoutes { - repeatedStringForActualLrpInternalRoutes += strings.Replace(fmt.Sprintf("%v", f), "ActualLRPInternalRoute", "ActualLRPInternalRoute", 1) + "," - } - repeatedStringForActualLrpInternalRoutes += "}" - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]string{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%v: %v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - s := strings.Join([]string{`&EvacuateRunningActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `ActualLrpNetInfo:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpNetInfo), "ActualLRPNetInfo", "ActualLRPNetInfo", 1) + `,`, - `ActualLrpInternalRoutes:` + repeatedStringForActualLrpInternalRoutes + `,`, - `MetricTags:` + mapStringForMetricTags + `,`, - `OptionalRoutable:` + fmt.Sprintf("%v", this.OptionalRoutable) + `,`, - `AvailabilityZone:` + fmt.Sprintf("%v", this.AvailabilityZone) + `,`, - `}`, - }, "") - return s -} -func (this *EvacuateRunningActualLRPRequest_Routable) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EvacuateRunningActualLRPRequest_Routable{`, - `Routable:` + fmt.Sprintf("%v", this.Routable) + `,`, - `}`, - }, "") - return s -} -func (this *EvacuateStoppedActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EvacuateStoppedActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `}`, - }, "") - return s -} -func (this *EvacuateCrashedActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EvacuateCrashedActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `ErrorMessage:` + fmt.Sprintf("%v", this.ErrorMessage) + `,`, - `}`, - }, "") - return s -} -func (this *RemoveEvacuatingActualLRPRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&RemoveEvacuatingActualLRPRequest{`, - `ActualLrpKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpKey), "ActualLRPKey", "ActualLRPKey", 1) + `,`, - `ActualLrpInstanceKey:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1) + `,`, - `}`, - }, "") - return s -} -func (this *RemoveEvacuatingActualLRPResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&RemoveEvacuatingActualLRPResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `}`, - }, "") - return s -} -func valueToStringEvacuation(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *EvacuationResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EvacuationResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EvacuationResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field KeepContainer", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.KeepContainer = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EvacuateClaimedActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EvacuateClaimedActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EvacuateClaimedActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EvacuateRunningActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EvacuateRunningActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EvacuateRunningActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpNetInfo", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpNetInfo == nil { - m.ActualLrpNetInfo = &ActualLRPNetInfo{} - } - if err := m.ActualLrpNetInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInternalRoutes", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ActualLrpInternalRoutes = append(m.ActualLrpInternalRoutes, &ActualLRPInternalRoute{}) - if err := m.ActualLrpInternalRoutes[len(m.ActualLrpInternalRoutes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricTags", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MetricTags == nil { - m.MetricTags = make(map[string]string) - } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthEvacuation - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthEvacuation - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthEvacuation - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthEvacuation - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.MetricTags[mapkey] = mapvalue - iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Routable", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - b := bool(v != 0) - m.OptionalRoutable = &EvacuateRunningActualLRPRequest_Routable{b} - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AvailabilityZone", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AvailabilityZone = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EvacuateStoppedActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EvacuateStoppedActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EvacuateStoppedActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EvacuateCrashedActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EvacuateCrashedActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EvacuateCrashedActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ErrorMessage", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ErrorMessage = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RemoveEvacuatingActualLRPRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RemoveEvacuatingActualLRPRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RemoveEvacuatingActualLRPRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpKey == nil { - m.ActualLrpKey = &ActualLRPKey{} - } - if err := m.ActualLrpKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpInstanceKey == nil { - m.ActualLrpInstanceKey = &ActualLRPInstanceKey{} - } - if err := m.ActualLrpInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RemoveEvacuatingActualLRPResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RemoveEvacuatingActualLRPResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RemoveEvacuatingActualLRPResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvacuation - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvacuation - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvacuation - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvacuation(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvacuation - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipEvacuation(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvacuation - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvacuation - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvacuation - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthEvacuation - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupEvacuation - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthEvacuation - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthEvacuation = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEvacuation = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupEvacuation = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/events.gogoproto.go b/protomodels/events.gogoproto.go deleted file mode 100644 index 3b7511e4..00000000 --- a/protomodels/events.gogoproto.go +++ /dev/null @@ -1,4977 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: events.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// Deprecated: Do not use. -type ActualLRPCreatedEvent struct { - ActualLrpGroup *ActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` -} - -func (m *ActualLRPCreatedEvent) Reset() { *m = ActualLRPCreatedEvent{} } -func (*ActualLRPCreatedEvent) ProtoMessage() {} -func (*ActualLRPCreatedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{0} -} -func (m *ActualLRPCreatedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPCreatedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPCreatedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPCreatedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPCreatedEvent.Merge(m, src) -} -func (m *ActualLRPCreatedEvent) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPCreatedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPCreatedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPCreatedEvent proto.InternalMessageInfo - -func (m *ActualLRPCreatedEvent) GetActualLrpGroup() *ActualLRPGroup { - if m != nil { - return m.ActualLrpGroup - } - return nil -} - -// Deprecated: Do not use. -type ActualLRPChangedEvent struct { - Before *ActualLRPGroup `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` - After *ActualLRPGroup `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` -} - -func (m *ActualLRPChangedEvent) Reset() { *m = ActualLRPChangedEvent{} } -func (*ActualLRPChangedEvent) ProtoMessage() {} -func (*ActualLRPChangedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{1} -} -func (m *ActualLRPChangedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPChangedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPChangedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPChangedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPChangedEvent.Merge(m, src) -} -func (m *ActualLRPChangedEvent) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPChangedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPChangedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPChangedEvent proto.InternalMessageInfo - -func (m *ActualLRPChangedEvent) GetBefore() *ActualLRPGroup { - if m != nil { - return m.Before - } - return nil -} - -func (m *ActualLRPChangedEvent) GetAfter() *ActualLRPGroup { - if m != nil { - return m.After - } - return nil -} - -// Deprecated: Do not use. -type ActualLRPRemovedEvent struct { - ActualLrpGroup *ActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` -} - -func (m *ActualLRPRemovedEvent) Reset() { *m = ActualLRPRemovedEvent{} } -func (*ActualLRPRemovedEvent) ProtoMessage() {} -func (*ActualLRPRemovedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{2} -} -func (m *ActualLRPRemovedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPRemovedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPRemovedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPRemovedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPRemovedEvent.Merge(m, src) -} -func (m *ActualLRPRemovedEvent) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPRemovedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPRemovedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPRemovedEvent proto.InternalMessageInfo - -func (m *ActualLRPRemovedEvent) GetActualLrpGroup() *ActualLRPGroup { - if m != nil { - return m.ActualLrpGroup - } - return nil -} - -type ActualLRPInstanceCreatedEvent struct { - ActualLrp *ActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,json=actualLrp,proto3" json:"actual_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,json=traceId,proto3" json:"trace_id"` -} - -func (m *ActualLRPInstanceCreatedEvent) Reset() { *m = ActualLRPInstanceCreatedEvent{} } -func (*ActualLRPInstanceCreatedEvent) ProtoMessage() {} -func (*ActualLRPInstanceCreatedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{3} -} -func (m *ActualLRPInstanceCreatedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPInstanceCreatedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPInstanceCreatedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPInstanceCreatedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPInstanceCreatedEvent.Merge(m, src) -} -func (m *ActualLRPInstanceCreatedEvent) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPInstanceCreatedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPInstanceCreatedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPInstanceCreatedEvent proto.InternalMessageInfo - -func (m *ActualLRPInstanceCreatedEvent) GetActualLrp() *ActualLRP { - if m != nil { - return m.ActualLrp - } - return nil -} - -func (m *ActualLRPInstanceCreatedEvent) GetTraceId() string { - if m != nil { - return m.TraceId - } - return "" -} - -type ActualLRPInfo struct { - ActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3,embedded=actual_lrp_net_info" json:""` - CrashCount int32 `protobuf:"varint,4,opt,name=crash_count,json=crashCount,proto3" json:"crash_count"` - CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` - State string `protobuf:"bytes,6,opt,name=state,proto3" json:"state"` - PlacementError string `protobuf:"bytes,7,opt,name=placement_error,json=placementError,proto3" json:"placement_error,omitempty"` - Since int64 `protobuf:"varint,8,opt,name=since,proto3" json:"since"` - ModificationTag ModificationTag `protobuf:"bytes,9,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag"` - Presence ActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ActualLRP_Presence" json:"presence"` - // Types that are valid to be assigned to OptionalRoutable: - // *ActualLRPInfo_Routable - OptionalRoutable isActualLRPInfo_OptionalRoutable `protobuf_oneof:"optional_routable"` - AvailabilityZone string `protobuf:"bytes,12,opt,name=availability_zone,json=availabilityZone,proto3" json:"availability_zone"` -} - -func (m *ActualLRPInfo) Reset() { *m = ActualLRPInfo{} } -func (*ActualLRPInfo) ProtoMessage() {} -func (*ActualLRPInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{4} -} -func (m *ActualLRPInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPInfo.Merge(m, src) -} -func (m *ActualLRPInfo) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPInfo) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPInfo proto.InternalMessageInfo - -type isActualLRPInfo_OptionalRoutable interface { - isActualLRPInfo_OptionalRoutable() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} - -type ActualLRPInfo_Routable struct { - Routable bool `protobuf:"varint,11,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` -} - -func (*ActualLRPInfo_Routable) isActualLRPInfo_OptionalRoutable() {} - -func (m *ActualLRPInfo) GetOptionalRoutable() isActualLRPInfo_OptionalRoutable { - if m != nil { - return m.OptionalRoutable - } - return nil -} - -func (m *ActualLRPInfo) GetCrashCount() int32 { - if m != nil { - return m.CrashCount - } - return 0 -} - -func (m *ActualLRPInfo) GetCrashReason() string { - if m != nil { - return m.CrashReason - } - return "" -} - -func (m *ActualLRPInfo) GetState() string { - if m != nil { - return m.State - } - return "" -} - -func (m *ActualLRPInfo) GetPlacementError() string { - if m != nil { - return m.PlacementError - } - return "" -} - -func (m *ActualLRPInfo) GetSince() int64 { - if m != nil { - return m.Since - } - return 0 -} - -func (m *ActualLRPInfo) GetModificationTag() ModificationTag { - if m != nil { - return m.ModificationTag - } - return ModificationTag{} -} - -func (m *ActualLRPInfo) GetPresence() ActualLRP_Presence { - if m != nil { - return m.Presence - } - return ActualLRP_Ordinary -} - -func (m *ActualLRPInfo) GetRoutable() bool { - if x, ok := m.GetOptionalRoutable().(*ActualLRPInfo_Routable); ok { - return x.Routable - } - return false -} - -func (m *ActualLRPInfo) GetAvailabilityZone() string { - if m != nil { - return m.AvailabilityZone - } - return "" -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*ActualLRPInfo) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*ActualLRPInfo_Routable)(nil), - } -} - -type ActualLRPInstanceChangedEvent struct { - ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3,embedded=actual_lrp_key" json:""` - ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3,embedded=actual_lrp_instance_key" json:""` - Before *ActualLRPInfo `protobuf:"bytes,3,opt,name=before,proto3" json:"before,omitempty"` - After *ActualLRPInfo `protobuf:"bytes,4,opt,name=after,proto3" json:"after,omitempty"` - TraceId string `protobuf:"bytes,5,opt,name=trace_id,json=traceId,proto3" json:"trace_id"` -} - -func (m *ActualLRPInstanceChangedEvent) Reset() { *m = ActualLRPInstanceChangedEvent{} } -func (*ActualLRPInstanceChangedEvent) ProtoMessage() {} -func (*ActualLRPInstanceChangedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{5} -} -func (m *ActualLRPInstanceChangedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPInstanceChangedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPInstanceChangedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPInstanceChangedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPInstanceChangedEvent.Merge(m, src) -} -func (m *ActualLRPInstanceChangedEvent) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPInstanceChangedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPInstanceChangedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPInstanceChangedEvent proto.InternalMessageInfo - -func (m *ActualLRPInstanceChangedEvent) GetBefore() *ActualLRPInfo { - if m != nil { - return m.Before - } - return nil -} - -func (m *ActualLRPInstanceChangedEvent) GetAfter() *ActualLRPInfo { - if m != nil { - return m.After - } - return nil -} - -func (m *ActualLRPInstanceChangedEvent) GetTraceId() string { - if m != nil { - return m.TraceId - } - return "" -} - -type ActualLRPInstanceRemovedEvent struct { - ActualLrp *ActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,json=actualLrp,proto3" json:"actual_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,json=traceId,proto3" json:"trace_id"` -} - -func (m *ActualLRPInstanceRemovedEvent) Reset() { *m = ActualLRPInstanceRemovedEvent{} } -func (*ActualLRPInstanceRemovedEvent) ProtoMessage() {} -func (*ActualLRPInstanceRemovedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{6} -} -func (m *ActualLRPInstanceRemovedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPInstanceRemovedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPInstanceRemovedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPInstanceRemovedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPInstanceRemovedEvent.Merge(m, src) -} -func (m *ActualLRPInstanceRemovedEvent) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPInstanceRemovedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPInstanceRemovedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPInstanceRemovedEvent proto.InternalMessageInfo - -func (m *ActualLRPInstanceRemovedEvent) GetActualLrp() *ActualLRP { - if m != nil { - return m.ActualLrp - } - return nil -} - -func (m *ActualLRPInstanceRemovedEvent) GetTraceId() string { - if m != nil { - return m.TraceId - } - return "" -} - -type DesiredLRPCreatedEvent struct { - DesiredLrp *DesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,json=traceId,proto3" json:"trace_id"` -} - -func (m *DesiredLRPCreatedEvent) Reset() { *m = DesiredLRPCreatedEvent{} } -func (*DesiredLRPCreatedEvent) ProtoMessage() {} -func (*DesiredLRPCreatedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{7} -} -func (m *DesiredLRPCreatedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPCreatedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPCreatedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPCreatedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPCreatedEvent.Merge(m, src) -} -func (m *DesiredLRPCreatedEvent) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPCreatedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPCreatedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPCreatedEvent proto.InternalMessageInfo - -func (m *DesiredLRPCreatedEvent) GetDesiredLrp() *DesiredLRP { - if m != nil { - return m.DesiredLrp - } - return nil -} - -func (m *DesiredLRPCreatedEvent) GetTraceId() string { - if m != nil { - return m.TraceId - } - return "" -} - -type DesiredLRPChangedEvent struct { - Before *DesiredLRP `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` - After *DesiredLRP `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` - TraceId string `protobuf:"bytes,3,opt,name=trace_id,json=traceId,proto3" json:"trace_id"` -} - -func (m *DesiredLRPChangedEvent) Reset() { *m = DesiredLRPChangedEvent{} } -func (*DesiredLRPChangedEvent) ProtoMessage() {} -func (*DesiredLRPChangedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{8} -} -func (m *DesiredLRPChangedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPChangedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPChangedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPChangedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPChangedEvent.Merge(m, src) -} -func (m *DesiredLRPChangedEvent) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPChangedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPChangedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPChangedEvent proto.InternalMessageInfo - -func (m *DesiredLRPChangedEvent) GetBefore() *DesiredLRP { - if m != nil { - return m.Before - } - return nil -} - -func (m *DesiredLRPChangedEvent) GetAfter() *DesiredLRP { - if m != nil { - return m.After - } - return nil -} - -func (m *DesiredLRPChangedEvent) GetTraceId() string { - if m != nil { - return m.TraceId - } - return "" -} - -type DesiredLRPRemovedEvent struct { - DesiredLrp *DesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,json=traceId,proto3" json:"trace_id"` -} - -func (m *DesiredLRPRemovedEvent) Reset() { *m = DesiredLRPRemovedEvent{} } -func (*DesiredLRPRemovedEvent) ProtoMessage() {} -func (*DesiredLRPRemovedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{9} -} -func (m *DesiredLRPRemovedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPRemovedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPRemovedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPRemovedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPRemovedEvent.Merge(m, src) -} -func (m *DesiredLRPRemovedEvent) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPRemovedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPRemovedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPRemovedEvent proto.InternalMessageInfo - -func (m *DesiredLRPRemovedEvent) GetDesiredLrp() *DesiredLRP { - if m != nil { - return m.DesiredLrp - } - return nil -} - -func (m *DesiredLRPRemovedEvent) GetTraceId() string { - if m != nil { - return m.TraceId - } - return "" -} - -type ActualLRPCrashedEvent struct { - ActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3,embedded=actual_lrp_key" json:""` - ActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3,embedded=actual_lrp_instance_key" json:""` - CrashCount int32 `protobuf:"varint,3,opt,name=crash_count,json=crashCount,proto3" json:"crash_count"` - CrashReason string `protobuf:"bytes,4,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` - Since int64 `protobuf:"varint,5,opt,name=since,proto3" json:"since"` -} - -func (m *ActualLRPCrashedEvent) Reset() { *m = ActualLRPCrashedEvent{} } -func (*ActualLRPCrashedEvent) ProtoMessage() {} -func (*ActualLRPCrashedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{10} -} -func (m *ActualLRPCrashedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ActualLRPCrashedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ActualLRPCrashedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ActualLRPCrashedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_ActualLRPCrashedEvent.Merge(m, src) -} -func (m *ActualLRPCrashedEvent) XXX_Size() int { - return m.Size() -} -func (m *ActualLRPCrashedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_ActualLRPCrashedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_ActualLRPCrashedEvent proto.InternalMessageInfo - -func (m *ActualLRPCrashedEvent) GetCrashCount() int32 { - if m != nil { - return m.CrashCount - } - return 0 -} - -func (m *ActualLRPCrashedEvent) GetCrashReason() string { - if m != nil { - return m.CrashReason - } - return "" -} - -func (m *ActualLRPCrashedEvent) GetSince() int64 { - if m != nil { - return m.Since - } - return 0 -} - -type EventsByCellId struct { - CellId string `protobuf:"bytes,1,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` -} - -func (m *EventsByCellId) Reset() { *m = EventsByCellId{} } -func (*EventsByCellId) ProtoMessage() {} -func (*EventsByCellId) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{11} -} -func (m *EventsByCellId) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EventsByCellId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EventsByCellId.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *EventsByCellId) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventsByCellId.Merge(m, src) -} -func (m *EventsByCellId) XXX_Size() int { - return m.Size() -} -func (m *EventsByCellId) XXX_DiscardUnknown() { - xxx_messageInfo_EventsByCellId.DiscardUnknown(m) -} - -var xxx_messageInfo_EventsByCellId proto.InternalMessageInfo - -func (m *EventsByCellId) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -type TaskCreatedEvent struct { - Task *Task `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` -} - -func (m *TaskCreatedEvent) Reset() { *m = TaskCreatedEvent{} } -func (*TaskCreatedEvent) ProtoMessage() {} -func (*TaskCreatedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{12} -} -func (m *TaskCreatedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskCreatedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskCreatedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskCreatedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskCreatedEvent.Merge(m, src) -} -func (m *TaskCreatedEvent) XXX_Size() int { - return m.Size() -} -func (m *TaskCreatedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_TaskCreatedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskCreatedEvent proto.InternalMessageInfo - -func (m *TaskCreatedEvent) GetTask() *Task { - if m != nil { - return m.Task - } - return nil -} - -type TaskChangedEvent struct { - Before *Task `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` - After *Task `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` -} - -func (m *TaskChangedEvent) Reset() { *m = TaskChangedEvent{} } -func (*TaskChangedEvent) ProtoMessage() {} -func (*TaskChangedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{13} -} -func (m *TaskChangedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskChangedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskChangedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskChangedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskChangedEvent.Merge(m, src) -} -func (m *TaskChangedEvent) XXX_Size() int { - return m.Size() -} -func (m *TaskChangedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_TaskChangedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskChangedEvent proto.InternalMessageInfo - -func (m *TaskChangedEvent) GetBefore() *Task { - if m != nil { - return m.Before - } - return nil -} - -func (m *TaskChangedEvent) GetAfter() *Task { - if m != nil { - return m.After - } - return nil -} - -type TaskRemovedEvent struct { - Task *Task `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` -} - -func (m *TaskRemovedEvent) Reset() { *m = TaskRemovedEvent{} } -func (*TaskRemovedEvent) ProtoMessage() {} -func (*TaskRemovedEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{14} -} -func (m *TaskRemovedEvent) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskRemovedEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskRemovedEvent.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskRemovedEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskRemovedEvent.Merge(m, src) -} -func (m *TaskRemovedEvent) XXX_Size() int { - return m.Size() -} -func (m *TaskRemovedEvent) XXX_DiscardUnknown() { - xxx_messageInfo_TaskRemovedEvent.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskRemovedEvent proto.InternalMessageInfo - -func (m *TaskRemovedEvent) GetTask() *Task { - if m != nil { - return m.Task - } - return nil -} - -func init() { - proto.RegisterType((*ActualLRPCreatedEvent)(nil), "models.ActualLRPCreatedEvent") - proto.RegisterType((*ActualLRPChangedEvent)(nil), "models.ActualLRPChangedEvent") - proto.RegisterType((*ActualLRPRemovedEvent)(nil), "models.ActualLRPRemovedEvent") - proto.RegisterType((*ActualLRPInstanceCreatedEvent)(nil), "models.ActualLRPInstanceCreatedEvent") - proto.RegisterType((*ActualLRPInfo)(nil), "models.ActualLRPInfo") - proto.RegisterType((*ActualLRPInstanceChangedEvent)(nil), "models.ActualLRPInstanceChangedEvent") - proto.RegisterType((*ActualLRPInstanceRemovedEvent)(nil), "models.ActualLRPInstanceRemovedEvent") - proto.RegisterType((*DesiredLRPCreatedEvent)(nil), "models.DesiredLRPCreatedEvent") - proto.RegisterType((*DesiredLRPChangedEvent)(nil), "models.DesiredLRPChangedEvent") - proto.RegisterType((*DesiredLRPRemovedEvent)(nil), "models.DesiredLRPRemovedEvent") - proto.RegisterType((*ActualLRPCrashedEvent)(nil), "models.ActualLRPCrashedEvent") - proto.RegisterType((*EventsByCellId)(nil), "models.EventsByCellId") - proto.RegisterType((*TaskCreatedEvent)(nil), "models.TaskCreatedEvent") - proto.RegisterType((*TaskChangedEvent)(nil), "models.TaskChangedEvent") - proto.RegisterType((*TaskRemovedEvent)(nil), "models.TaskRemovedEvent") -} - -func init() { proto.RegisterFile("events.proto", fileDescriptor_8f22242cb04491f9) } - -var fileDescriptor_8f22242cb04491f9 = []byte{ - // 913 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xdb, 0x36, - 0x14, 0x17, 0x13, 0xdb, 0x71, 0x9e, 0x3d, 0xc7, 0x61, 0x9b, 0x54, 0x08, 0x3a, 0xc9, 0x33, 0x0a, - 0xd4, 0xd8, 0x56, 0xb7, 0x68, 0x8b, 0x1d, 0x76, 0xda, 0x9c, 0x16, 0x6b, 0xd0, 0x6e, 0x28, 0x88, - 0xee, 0x32, 0x74, 0x10, 0x68, 0x99, 0x76, 0x84, 0xc8, 0xa2, 0x21, 0xd1, 0x01, 0xdc, 0xd3, 0x3e, - 0xc2, 0x6e, 0xfb, 0x0a, 0xfb, 0x0c, 0xbb, 0xed, 0xd6, 0x63, 0x76, 0xeb, 0x49, 0x58, 0x9c, 0xcb, - 0xe0, 0x53, 0x3f, 0xc2, 0x20, 0x52, 0x52, 0x29, 0xdb, 0x48, 0x57, 0x60, 0x39, 0xf4, 0x64, 0xf2, - 0xbd, 0x1f, 0x7f, 0xef, 0x0f, 0x1f, 0x7f, 0x32, 0xd4, 0xd9, 0x29, 0x0b, 0x44, 0xd4, 0x9d, 0x84, - 0x5c, 0x70, 0x5c, 0x19, 0xf3, 0x01, 0xf3, 0xa3, 0x83, 0x3b, 0x23, 0x4f, 0x1c, 0x4f, 0xfb, 0x5d, - 0x97, 0x8f, 0xef, 0x8e, 0xf8, 0x88, 0xdf, 0x95, 0xee, 0xfe, 0x74, 0x28, 0x77, 0x72, 0x23, 0x57, - 0xea, 0xd8, 0x41, 0x93, 0xba, 0x62, 0x4a, 0x7d, 0xc7, 0x0f, 0x27, 0xa9, 0x65, 0x77, 0xc0, 0x22, - 0x2f, 0x64, 0x03, 0xcd, 0x04, 0x82, 0x46, 0x27, 0xe9, 0x7a, 0x7f, 0xcc, 0x07, 0xde, 0xd0, 0x73, - 0xa9, 0xf0, 0x78, 0xe0, 0x08, 0x3a, 0x52, 0xf6, 0xf6, 0xcf, 0xb0, 0xf7, 0xad, 0xa4, 0x7a, 0x46, - 0x9e, 0x1f, 0x86, 0x8c, 0x0a, 0x36, 0x78, 0x9c, 0xe4, 0x87, 0xbf, 0x01, 0x2d, 0x86, 0x33, 0x0a, - 0xf9, 0x74, 0x62, 0xa2, 0x16, 0xea, 0xd4, 0xee, 0xef, 0x77, 0x55, 0xce, 0xdd, 0xfc, 0xe0, 0x77, - 0x89, 0x97, 0x34, 0x14, 0xfe, 0x59, 0x38, 0x91, 0xfb, 0xaf, 0x37, 0x4c, 0xd4, 0x9e, 0xe9, 0xf4, - 0xc7, 0x34, 0x18, 0x65, 0xf4, 0x5d, 0xa8, 0xf4, 0xd9, 0x90, 0x87, 0xec, 0x3d, 0xa4, 0x29, 0x0a, - 0x7f, 0x09, 0x65, 0x3a, 0x14, 0x2c, 0x34, 0x37, 0x2e, 0x85, 0x2b, 0x90, 0x0c, 0xad, 0x57, 0x46, - 0xd8, 0x98, 0x9f, 0xfe, 0xbf, 0x95, 0xbd, 0x82, 0x4f, 0x73, 0xd4, 0x51, 0x10, 0x09, 0x1a, 0xb8, - 0xac, 0xd0, 0xc0, 0x7b, 0x00, 0xef, 0xc2, 0xa4, 0x01, 0x76, 0x57, 0x02, 0x90, 0xed, 0x9c, 0x1b, - 0xdf, 0x86, 0xaa, 0x08, 0xa9, 0xcb, 0x1c, 0x6f, 0x20, 0xcb, 0xdc, 0xee, 0xd5, 0x17, 0xb1, 0x9d, - 0xdb, 0xc8, 0x96, 0x5c, 0x1d, 0x0d, 0xda, 0x7f, 0x96, 0xe0, 0x13, 0x2d, 0xf8, 0x90, 0xe3, 0x1f, - 0xe1, 0x9a, 0x56, 0x53, 0xc0, 0x84, 0xe3, 0x05, 0x43, 0x6e, 0x6e, 0xca, 0xa8, 0xe6, 0x4a, 0xd4, - 0x1f, 0x98, 0x48, 0x8e, 0xf5, 0xea, 0xaf, 0x63, 0xdb, 0x38, 0x8b, 0x6d, 0xb4, 0x88, 0x6d, 0x83, - 0x34, 0xf3, 0x54, 0x52, 0x3f, 0xbe, 0x07, 0x35, 0x37, 0xa4, 0xd1, 0xb1, 0xe3, 0xf2, 0x69, 0x20, - 0xcc, 0x52, 0x0b, 0x75, 0xca, 0xbd, 0x9d, 0x45, 0x6c, 0xeb, 0x66, 0x02, 0x72, 0x73, 0x98, 0xac, - 0xf1, 0x67, 0x50, 0x57, 0xae, 0x90, 0xd1, 0x88, 0x07, 0x66, 0x39, 0xa9, 0x83, 0x28, 0x38, 0x91, - 0x26, 0x6c, 0x43, 0x39, 0x12, 0x54, 0x30, 0xb3, 0x22, 0x6b, 0xdc, 0x5e, 0xc4, 0xb6, 0x32, 0x10, - 0xf5, 0x83, 0x6f, 0xc3, 0xce, 0xc4, 0xa7, 0x2e, 0x1b, 0xb3, 0x40, 0x38, 0x2c, 0x0c, 0x79, 0x68, - 0x6e, 0x49, 0x9a, 0x46, 0x6e, 0x7e, 0x9c, 0x58, 0x25, 0x93, 0x17, 0xb8, 0xcc, 0xac, 0xb6, 0x50, - 0x67, 0x33, 0x65, 0x4a, 0x0c, 0x44, 0xfd, 0xe0, 0x97, 0xd0, 0x5c, 0x9e, 0x7b, 0x73, 0x5b, 0xf6, - 0xe4, 0x46, 0xd6, 0x93, 0xef, 0x35, 0xff, 0x0b, 0x3a, 0xea, 0x99, 0x49, 0x4b, 0x16, 0xb1, 0xbd, - 0x72, 0x90, 0xec, 0x8c, 0x8b, 0x50, 0xfc, 0x08, 0xaa, 0x93, 0x90, 0x45, 0x2c, 0xc9, 0x00, 0x5a, - 0xa8, 0xd3, 0xb8, 0x7f, 0xb0, 0xd2, 0xe9, 0xee, 0xf3, 0x14, 0xa1, 0xee, 0x32, 0xc3, 0x93, 0x7c, - 0x85, 0x6f, 0x42, 0x95, 0xf0, 0xa9, 0xa0, 0x7d, 0x9f, 0x99, 0xb5, 0x16, 0xea, 0x54, 0x9f, 0x18, - 0x24, 0xb7, 0xe0, 0x1e, 0xec, 0xd2, 0x53, 0xea, 0xf9, 0xb4, 0xef, 0xf9, 0x9e, 0x98, 0x39, 0xaf, - 0x78, 0xc0, 0xcc, 0xba, 0x6c, 0xdc, 0xde, 0x22, 0xb6, 0x57, 0x9d, 0xa4, 0xa9, 0x9b, 0x7e, 0xe2, - 0x01, 0xeb, 0x5d, 0x83, 0x5d, 0x3e, 0x49, 0x92, 0xa6, 0xbe, 0x13, 0xa6, 0xc4, 0xed, 0xbf, 0x36, - 0xd6, 0x0d, 0xb0, 0xfe, 0x44, 0x9f, 0x40, 0x43, 0x9b, 0xa9, 0x13, 0x36, 0x4b, 0x87, 0xf8, 0xfa, - 0x4a, 0x91, 0x4f, 0xd9, 0x6c, 0x69, 0x94, 0xea, 0xf9, 0x28, 0x3d, 0x65, 0x33, 0x4c, 0xe1, 0x86, - 0xc6, 0xe4, 0xa5, 0xc1, 0x24, 0xa5, 0x7a, 0xce, 0x37, 0x57, 0x28, 0xb3, 0x8c, 0x56, 0xa9, 0xaf, - 0xe7, 0xd4, 0x1a, 0x06, 0xdf, 0xc9, 0xf5, 0x44, 0xcd, 0xfc, 0xde, 0x1a, 0xc6, 0x21, 0xcf, 0xe5, - 0xe4, 0x8b, 0x4c, 0x4e, 0x4a, 0x97, 0xa1, 0x15, 0xa6, 0xf0, 0x2e, 0xcb, 0x97, 0xbd, 0xcb, 0x75, - 0x9a, 0x50, 0x90, 0x9e, 0x2b, 0xd4, 0x84, 0x53, 0xd8, 0x7f, 0xa4, 0xbe, 0x00, 0xcb, 0x4a, 0xfe, - 0x00, 0x6a, 0xda, 0xb7, 0x21, 0x8d, 0x8a, 0xb3, 0xa8, 0xef, 0x0e, 0x11, 0x48, 0x61, 0x1f, 0x14, - 0xf7, 0x37, 0x54, 0x08, 0xac, 0x0f, 0xd0, 0xe7, 0x4b, 0x1a, 0xbf, 0x2e, 0x66, 0x76, 0x21, 0x9d, - 0xa2, 0xbe, 0xaf, 0x83, 0xae, 0xb9, 0x8d, 0xcd, 0xff, 0xdc, 0x91, 0xc2, 0x35, 0x5c, 0x6d, 0x47, - 0xfe, 0xd8, 0x28, 0x7c, 0x53, 0x69, 0x74, 0xfc, 0x51, 0xbe, 0xa8, 0x25, 0xed, 0xdf, 0xfc, 0x70, - 0xed, 0x2f, 0xad, 0xd7, 0x7e, 0xa9, 0xd8, 0xe5, 0xf5, 0x8a, 0xdd, 0xfe, 0x0a, 0x1a, 0xb2, 0x57, - 0x51, 0x6f, 0x76, 0xc8, 0x7c, 0xff, 0x68, 0x80, 0x6f, 0xc1, 0x96, 0xcb, 0x7c, 0x3f, 0x69, 0x3b, - 0x92, 0x6d, 0xaf, 0x2d, 0x62, 0x3b, 0x33, 0x91, 0x8a, 0x2b, 0x51, 0xed, 0x87, 0xd0, 0x7c, 0x41, - 0xa3, 0x93, 0xc2, 0xe0, 0xb7, 0xa0, 0x94, 0xfc, 0x03, 0x4a, 0x9b, 0x5c, 0xcf, 0x3a, 0x92, 0xe0, - 0x88, 0xf4, 0xb4, 0x5f, 0xa6, 0xa7, 0xf4, 0xa9, 0xbd, 0xb5, 0x34, 0xb5, 0xc5, 0x73, 0xd9, 0xbc, - 0xb6, 0x8b, 0xf3, 0x5a, 0x04, 0x29, 0x57, 0x96, 0x53, 0x61, 0xf4, 0xde, 0x9b, 0x53, 0xef, 0xe1, - 0xd9, 0xb9, 0x65, 0xbc, 0x39, 0xb7, 0x8c, 0xb7, 0xe7, 0x16, 0xfa, 0x65, 0x6e, 0xa1, 0xdf, 0xe7, - 0x16, 0x7a, 0x3d, 0xb7, 0xd0, 0xd9, 0xdc, 0x42, 0x7f, 0xcf, 0x2d, 0xf4, 0xcf, 0xdc, 0x32, 0xde, - 0xce, 0x2d, 0xf4, 0xeb, 0x85, 0x65, 0x9c, 0x5d, 0x58, 0xc6, 0x9b, 0x0b, 0xcb, 0xe8, 0x57, 0xe4, - 0xdf, 0xb9, 0x07, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x15, 0xfc, 0xcc, 0x44, 0x5e, 0x0a, 0x00, - 0x00, -} - -func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPCreatedEvent) - if !ok { - that2, ok := that.(ActualLRPCreatedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { - return false - } - return true -} -func (this *ActualLRPChangedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPChangedEvent) - if !ok { - that2, ok := that.(ActualLRPChangedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Before.Equal(that1.Before) { - return false - } - if !this.After.Equal(that1.After) { - return false - } - return true -} -func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPRemovedEvent) - if !ok { - that2, ok := that.(ActualLRPRemovedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { - return false - } - return true -} -func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPInstanceCreatedEvent) - if !ok { - that2, ok := that.(ActualLRPInstanceCreatedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrp.Equal(that1.ActualLrp) { - return false - } - if this.TraceId != that1.TraceId { - return false - } - return true -} -func (this *ActualLRPInfo) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPInfo) - if !ok { - that2, ok := that.(ActualLRPInfo) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLRPNetInfo.Equal(&that1.ActualLRPNetInfo) { - return false - } - if this.CrashCount != that1.CrashCount { - return false - } - if this.CrashReason != that1.CrashReason { - return false - } - if this.State != that1.State { - return false - } - if this.PlacementError != that1.PlacementError { - return false - } - if this.Since != that1.Since { - return false - } - if !this.ModificationTag.Equal(&that1.ModificationTag) { - return false - } - if this.Presence != that1.Presence { - return false - } - if that1.OptionalRoutable == nil { - if this.OptionalRoutable != nil { - return false - } - } else if this.OptionalRoutable == nil { - return false - } else if !this.OptionalRoutable.Equal(that1.OptionalRoutable) { - return false - } - if this.AvailabilityZone != that1.AvailabilityZone { - return false - } - return true -} -func (this *ActualLRPInfo_Routable) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPInfo_Routable) - if !ok { - that2, ok := that.(ActualLRPInfo_Routable) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Routable != that1.Routable { - return false - } - return true -} -func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPInstanceChangedEvent) - if !ok { - that2, ok := that.(ActualLRPInstanceChangedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLRPKey.Equal(&that1.ActualLRPKey) { - return false - } - if !this.ActualLRPInstanceKey.Equal(&that1.ActualLRPInstanceKey) { - return false - } - if !this.Before.Equal(that1.Before) { - return false - } - if !this.After.Equal(that1.After) { - return false - } - if this.TraceId != that1.TraceId { - return false - } - return true -} -func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPInstanceRemovedEvent) - if !ok { - that2, ok := that.(ActualLRPInstanceRemovedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLrp.Equal(that1.ActualLrp) { - return false - } - if this.TraceId != that1.TraceId { - return false - } - return true -} -func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPCreatedEvent) - if !ok { - that2, ok := that.(DesiredLRPCreatedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { - return false - } - if this.TraceId != that1.TraceId { - return false - } - return true -} -func (this *DesiredLRPChangedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPChangedEvent) - if !ok { - that2, ok := that.(DesiredLRPChangedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Before.Equal(that1.Before) { - return false - } - if !this.After.Equal(that1.After) { - return false - } - if this.TraceId != that1.TraceId { - return false - } - return true -} -func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPRemovedEvent) - if !ok { - that2, ok := that.(DesiredLRPRemovedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { - return false - } - if this.TraceId != that1.TraceId { - return false - } - return true -} -func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ActualLRPCrashedEvent) - if !ok { - that2, ok := that.(ActualLRPCrashedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.ActualLRPKey.Equal(&that1.ActualLRPKey) { - return false - } - if !this.ActualLRPInstanceKey.Equal(&that1.ActualLRPInstanceKey) { - return false - } - if this.CrashCount != that1.CrashCount { - return false - } - if this.CrashReason != that1.CrashReason { - return false - } - if this.Since != that1.Since { - return false - } - return true -} -func (this *EventsByCellId) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*EventsByCellId) - if !ok { - that2, ok := that.(EventsByCellId) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.CellId != that1.CellId { - return false - } - return true -} -func (this *TaskCreatedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskCreatedEvent) - if !ok { - that2, ok := that.(TaskCreatedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Task.Equal(that1.Task) { - return false - } - return true -} -func (this *TaskChangedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskChangedEvent) - if !ok { - that2, ok := that.(TaskChangedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Before.Equal(that1.Before) { - return false - } - if !this.After.Equal(that1.After) { - return false - } - return true -} -func (this *TaskRemovedEvent) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskRemovedEvent) - if !ok { - that2, ok := that.(TaskRemovedEvent) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Task.Equal(that1.Task) { - return false - } - return true -} -func (this *ActualLRPCreatedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.ActualLRPCreatedEvent{") - if this.ActualLrpGroup != nil { - s = append(s, "ActualLrpGroup: "+fmt.Sprintf("%#v", this.ActualLrpGroup)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPChangedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPChangedEvent{") - if this.Before != nil { - s = append(s, "Before: "+fmt.Sprintf("%#v", this.Before)+",\n") - } - if this.After != nil { - s = append(s, "After: "+fmt.Sprintf("%#v", this.After)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPRemovedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.ActualLRPRemovedEvent{") - if this.ActualLrpGroup != nil { - s = append(s, "ActualLrpGroup: "+fmt.Sprintf("%#v", this.ActualLrpGroup)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPInstanceCreatedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPInstanceCreatedEvent{") - if this.ActualLrp != nil { - s = append(s, "ActualLrp: "+fmt.Sprintf("%#v", this.ActualLrp)+",\n") - } - s = append(s, "TraceId: "+fmt.Sprintf("%#v", this.TraceId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPInfo) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 14) - s = append(s, "&models.ActualLRPInfo{") - s = append(s, "ActualLRPNetInfo: "+strings.Replace(this.ActualLRPNetInfo.GoString(), `&`, ``, 1)+",\n") - s = append(s, "CrashCount: "+fmt.Sprintf("%#v", this.CrashCount)+",\n") - s = append(s, "CrashReason: "+fmt.Sprintf("%#v", this.CrashReason)+",\n") - s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n") - s = append(s, "PlacementError: "+fmt.Sprintf("%#v", this.PlacementError)+",\n") - s = append(s, "Since: "+fmt.Sprintf("%#v", this.Since)+",\n") - s = append(s, "ModificationTag: "+strings.Replace(this.ModificationTag.GoString(), `&`, ``, 1)+",\n") - s = append(s, "Presence: "+fmt.Sprintf("%#v", this.Presence)+",\n") - if this.OptionalRoutable != nil { - s = append(s, "OptionalRoutable: "+fmt.Sprintf("%#v", this.OptionalRoutable)+",\n") - } - s = append(s, "AvailabilityZone: "+fmt.Sprintf("%#v", this.AvailabilityZone)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPInfo_Routable) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.ActualLRPInfo_Routable{` + - `Routable:` + fmt.Sprintf("%#v", this.Routable) + `}`}, ", ") - return s -} -func (this *ActualLRPInstanceChangedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 9) - s = append(s, "&models.ActualLRPInstanceChangedEvent{") - s = append(s, "ActualLRPKey: "+strings.Replace(this.ActualLRPKey.GoString(), `&`, ``, 1)+",\n") - s = append(s, "ActualLRPInstanceKey: "+strings.Replace(this.ActualLRPInstanceKey.GoString(), `&`, ``, 1)+",\n") - if this.Before != nil { - s = append(s, "Before: "+fmt.Sprintf("%#v", this.Before)+",\n") - } - if this.After != nil { - s = append(s, "After: "+fmt.Sprintf("%#v", this.After)+",\n") - } - s = append(s, "TraceId: "+fmt.Sprintf("%#v", this.TraceId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPInstanceRemovedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ActualLRPInstanceRemovedEvent{") - if this.ActualLrp != nil { - s = append(s, "ActualLrp: "+fmt.Sprintf("%#v", this.ActualLrp)+",\n") - } - s = append(s, "TraceId: "+fmt.Sprintf("%#v", this.TraceId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPCreatedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DesiredLRPCreatedEvent{") - if this.DesiredLrp != nil { - s = append(s, "DesiredLrp: "+fmt.Sprintf("%#v", this.DesiredLrp)+",\n") - } - s = append(s, "TraceId: "+fmt.Sprintf("%#v", this.TraceId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPChangedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.DesiredLRPChangedEvent{") - if this.Before != nil { - s = append(s, "Before: "+fmt.Sprintf("%#v", this.Before)+",\n") - } - if this.After != nil { - s = append(s, "After: "+fmt.Sprintf("%#v", this.After)+",\n") - } - s = append(s, "TraceId: "+fmt.Sprintf("%#v", this.TraceId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPRemovedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.DesiredLRPRemovedEvent{") - if this.DesiredLrp != nil { - s = append(s, "DesiredLrp: "+fmt.Sprintf("%#v", this.DesiredLrp)+",\n") - } - s = append(s, "TraceId: "+fmt.Sprintf("%#v", this.TraceId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ActualLRPCrashedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 9) - s = append(s, "&models.ActualLRPCrashedEvent{") - s = append(s, "ActualLRPKey: "+strings.Replace(this.ActualLRPKey.GoString(), `&`, ``, 1)+",\n") - s = append(s, "ActualLRPInstanceKey: "+strings.Replace(this.ActualLRPInstanceKey.GoString(), `&`, ``, 1)+",\n") - s = append(s, "CrashCount: "+fmt.Sprintf("%#v", this.CrashCount)+",\n") - s = append(s, "CrashReason: "+fmt.Sprintf("%#v", this.CrashReason)+",\n") - s = append(s, "Since: "+fmt.Sprintf("%#v", this.Since)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *EventsByCellId) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.EventsByCellId{") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TaskCreatedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.TaskCreatedEvent{") - if this.Task != nil { - s = append(s, "Task: "+fmt.Sprintf("%#v", this.Task)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TaskChangedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.TaskChangedEvent{") - if this.Before != nil { - s = append(s, "Before: "+fmt.Sprintf("%#v", this.Before)+",\n") - } - if this.After != nil { - s = append(s, "After: "+fmt.Sprintf("%#v", this.After)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TaskRemovedEvent) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.TaskRemovedEvent{") - if this.Task != nil { - s = append(s, "Task: "+fmt.Sprintf("%#v", this.Task)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringEvents(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *ActualLRPCreatedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPCreatedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPCreatedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpGroup != nil { - { - size, err := m.ActualLrpGroup.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPChangedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPChangedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPChangedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.After != nil { - { - size, err := m.After.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Before != nil { - { - size, err := m.Before.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPRemovedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPRemovedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPRemovedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ActualLrpGroup != nil { - { - size, err := m.ActualLrpGroup.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPInstanceCreatedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPInstanceCreatedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPInstanceCreatedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TraceId) > 0 { - i -= len(m.TraceId) - copy(dAtA[i:], m.TraceId) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TraceId))) - i-- - dAtA[i] = 0x12 - } - if m.ActualLrp != nil { - { - size, err := m.ActualLrp.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPInfo) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.AvailabilityZone) > 0 { - i -= len(m.AvailabilityZone) - copy(dAtA[i:], m.AvailabilityZone) - i = encodeVarintEvents(dAtA, i, uint64(len(m.AvailabilityZone))) - i-- - dAtA[i] = 0x62 - } - if m.OptionalRoutable != nil { - { - size := m.OptionalRoutable.Size() - i -= size - if _, err := m.OptionalRoutable.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if m.Presence != 0 { - i = encodeVarintEvents(dAtA, i, uint64(m.Presence)) - i-- - dAtA[i] = 0x50 - } - { - size, err := m.ModificationTag.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - if m.Since != 0 { - i = encodeVarintEvents(dAtA, i, uint64(m.Since)) - i-- - dAtA[i] = 0x40 - } - if len(m.PlacementError) > 0 { - i -= len(m.PlacementError) - copy(dAtA[i:], m.PlacementError) - i = encodeVarintEvents(dAtA, i, uint64(len(m.PlacementError))) - i-- - dAtA[i] = 0x3a - } - if len(m.State) > 0 { - i -= len(m.State) - copy(dAtA[i:], m.State) - i = encodeVarintEvents(dAtA, i, uint64(len(m.State))) - i-- - dAtA[i] = 0x32 - } - if len(m.CrashReason) > 0 { - i -= len(m.CrashReason) - copy(dAtA[i:], m.CrashReason) - i = encodeVarintEvents(dAtA, i, uint64(len(m.CrashReason))) - i-- - dAtA[i] = 0x2a - } - if m.CrashCount != 0 { - i = encodeVarintEvents(dAtA, i, uint64(m.CrashCount)) - i-- - dAtA[i] = 0x20 - } - { - size, err := m.ActualLRPNetInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - return len(dAtA) - i, nil -} - -func (m *ActualLRPInfo_Routable) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPInfo_Routable) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i-- - if m.Routable { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x58 - return len(dAtA) - i, nil -} -func (m *ActualLRPInstanceChangedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPInstanceChangedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPInstanceChangedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TraceId) > 0 { - i -= len(m.TraceId) - copy(dAtA[i:], m.TraceId) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TraceId))) - i-- - dAtA[i] = 0x2a - } - if m.After != nil { - { - size, err := m.After.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if m.Before != nil { - { - size, err := m.Before.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - { - size, err := m.ActualLRPInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size, err := m.ActualLRPKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *ActualLRPInstanceRemovedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPInstanceRemovedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPInstanceRemovedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TraceId) > 0 { - i -= len(m.TraceId) - copy(dAtA[i:], m.TraceId) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TraceId))) - i-- - dAtA[i] = 0x12 - } - if m.ActualLrp != nil { - { - size, err := m.ActualLrp.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPCreatedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPCreatedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPCreatedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TraceId) > 0 { - i -= len(m.TraceId) - copy(dAtA[i:], m.TraceId) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TraceId))) - i-- - dAtA[i] = 0x12 - } - if m.DesiredLrp != nil { - { - size, err := m.DesiredLrp.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPChangedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPChangedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPChangedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TraceId) > 0 { - i -= len(m.TraceId) - copy(dAtA[i:], m.TraceId) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TraceId))) - i-- - dAtA[i] = 0x1a - } - if m.After != nil { - { - size, err := m.After.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Before != nil { - { - size, err := m.Before.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPRemovedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPRemovedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPRemovedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TraceId) > 0 { - i -= len(m.TraceId) - copy(dAtA[i:], m.TraceId) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TraceId))) - i-- - dAtA[i] = 0x12 - } - if m.DesiredLrp != nil { - { - size, err := m.DesiredLrp.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ActualLRPCrashedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ActualLRPCrashedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ActualLRPCrashedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Since != 0 { - i = encodeVarintEvents(dAtA, i, uint64(m.Since)) - i-- - dAtA[i] = 0x28 - } - if len(m.CrashReason) > 0 { - i -= len(m.CrashReason) - copy(dAtA[i:], m.CrashReason) - i = encodeVarintEvents(dAtA, i, uint64(len(m.CrashReason))) - i-- - dAtA[i] = 0x22 - } - if m.CrashCount != 0 { - i = encodeVarintEvents(dAtA, i, uint64(m.CrashCount)) - i-- - dAtA[i] = 0x18 - } - { - size, err := m.ActualLRPInstanceKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size, err := m.ActualLRPKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *EventsByCellId) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *EventsByCellId) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventsByCellId) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintEvents(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TaskCreatedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskCreatedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskCreatedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Task != nil { - { - size, err := m.Task.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TaskChangedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskChangedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskChangedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.After != nil { - { - size, err := m.After.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Before != nil { - { - size, err := m.Before.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TaskRemovedEvent) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskRemovedEvent) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskRemovedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Task != nil { - { - size, err := m.Task.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintEvents(dAtA []byte, offset int, v uint64) int { - offset -= sovEvents(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *ActualLRPCreatedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpGroup != nil { - l = m.ActualLrpGroup.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *ActualLRPChangedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Before != nil { - l = m.Before.Size() - n += 1 + l + sovEvents(uint64(l)) - } - if m.After != nil { - l = m.After.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *ActualLRPRemovedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrpGroup != nil { - l = m.ActualLrpGroup.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *ActualLRPInstanceCreatedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrp != nil { - l = m.ActualLrp.Size() - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.TraceId) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *ActualLRPInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.ActualLRPNetInfo.Size() - n += 1 + l + sovEvents(uint64(l)) - if m.CrashCount != 0 { - n += 1 + sovEvents(uint64(m.CrashCount)) - } - l = len(m.CrashReason) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.State) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.PlacementError) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - if m.Since != 0 { - n += 1 + sovEvents(uint64(m.Since)) - } - l = m.ModificationTag.Size() - n += 1 + l + sovEvents(uint64(l)) - if m.Presence != 0 { - n += 1 + sovEvents(uint64(m.Presence)) - } - if m.OptionalRoutable != nil { - n += m.OptionalRoutable.Size() - } - l = len(m.AvailabilityZone) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *ActualLRPInfo_Routable) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 2 - return n -} -func (m *ActualLRPInstanceChangedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.ActualLRPKey.Size() - n += 1 + l + sovEvents(uint64(l)) - l = m.ActualLRPInstanceKey.Size() - n += 1 + l + sovEvents(uint64(l)) - if m.Before != nil { - l = m.Before.Size() - n += 1 + l + sovEvents(uint64(l)) - } - if m.After != nil { - l = m.After.Size() - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.TraceId) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *ActualLRPInstanceRemovedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ActualLrp != nil { - l = m.ActualLrp.Size() - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.TraceId) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *DesiredLRPCreatedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.DesiredLrp != nil { - l = m.DesiredLrp.Size() - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.TraceId) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *DesiredLRPChangedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Before != nil { - l = m.Before.Size() - n += 1 + l + sovEvents(uint64(l)) - } - if m.After != nil { - l = m.After.Size() - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.TraceId) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *DesiredLRPRemovedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.DesiredLrp != nil { - l = m.DesiredLrp.Size() - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.TraceId) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *ActualLRPCrashedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.ActualLRPKey.Size() - n += 1 + l + sovEvents(uint64(l)) - l = m.ActualLRPInstanceKey.Size() - n += 1 + l + sovEvents(uint64(l)) - if m.CrashCount != 0 { - n += 1 + sovEvents(uint64(m.CrashCount)) - } - l = len(m.CrashReason) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - if m.Since != 0 { - n += 1 + sovEvents(uint64(m.Since)) - } - return n -} - -func (m *EventsByCellId) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *TaskCreatedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Task != nil { - l = m.Task.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *TaskChangedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Before != nil { - l = m.Before.Size() - n += 1 + l + sovEvents(uint64(l)) - } - if m.After != nil { - l = m.After.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *TaskRemovedEvent) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Task != nil { - l = m.Task.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func sovEvents(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozEvents(x uint64) (n int) { - return sovEvents(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *ActualLRPCreatedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPCreatedEvent{`, - `ActualLrpGroup:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpGroup), "ActualLRPGroup", "ActualLRPGroup", 1) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPChangedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPChangedEvent{`, - `Before:` + strings.Replace(fmt.Sprintf("%v", this.Before), "ActualLRPGroup", "ActualLRPGroup", 1) + `,`, - `After:` + strings.Replace(fmt.Sprintf("%v", this.After), "ActualLRPGroup", "ActualLRPGroup", 1) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPRemovedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPRemovedEvent{`, - `ActualLrpGroup:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrpGroup), "ActualLRPGroup", "ActualLRPGroup", 1) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPInstanceCreatedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPInstanceCreatedEvent{`, - `ActualLrp:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrp), "ActualLRP", "ActualLRP", 1) + `,`, - `TraceId:` + fmt.Sprintf("%v", this.TraceId) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPInfo) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPInfo{`, - `ActualLRPNetInfo:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ActualLRPNetInfo), "ActualLRPNetInfo", "ActualLRPNetInfo", 1), `&`, ``, 1) + `,`, - `CrashCount:` + fmt.Sprintf("%v", this.CrashCount) + `,`, - `CrashReason:` + fmt.Sprintf("%v", this.CrashReason) + `,`, - `State:` + fmt.Sprintf("%v", this.State) + `,`, - `PlacementError:` + fmt.Sprintf("%v", this.PlacementError) + `,`, - `Since:` + fmt.Sprintf("%v", this.Since) + `,`, - `ModificationTag:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ModificationTag), "ModificationTag", "ModificationTag", 1), `&`, ``, 1) + `,`, - `Presence:` + fmt.Sprintf("%v", this.Presence) + `,`, - `OptionalRoutable:` + fmt.Sprintf("%v", this.OptionalRoutable) + `,`, - `AvailabilityZone:` + fmt.Sprintf("%v", this.AvailabilityZone) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPInfo_Routable) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPInfo_Routable{`, - `Routable:` + fmt.Sprintf("%v", this.Routable) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPInstanceChangedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPInstanceChangedEvent{`, - `ActualLRPKey:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ActualLRPKey), "ActualLRPKey", "ActualLRPKey", 1), `&`, ``, 1) + `,`, - `ActualLRPInstanceKey:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ActualLRPInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1), `&`, ``, 1) + `,`, - `Before:` + strings.Replace(this.Before.String(), "ActualLRPInfo", "ActualLRPInfo", 1) + `,`, - `After:` + strings.Replace(this.After.String(), "ActualLRPInfo", "ActualLRPInfo", 1) + `,`, - `TraceId:` + fmt.Sprintf("%v", this.TraceId) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPInstanceRemovedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPInstanceRemovedEvent{`, - `ActualLrp:` + strings.Replace(fmt.Sprintf("%v", this.ActualLrp), "ActualLRP", "ActualLRP", 1) + `,`, - `TraceId:` + fmt.Sprintf("%v", this.TraceId) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPCreatedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPCreatedEvent{`, - `DesiredLrp:` + strings.Replace(fmt.Sprintf("%v", this.DesiredLrp), "DesiredLRP", "DesiredLRP", 1) + `,`, - `TraceId:` + fmt.Sprintf("%v", this.TraceId) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPChangedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPChangedEvent{`, - `Before:` + strings.Replace(fmt.Sprintf("%v", this.Before), "DesiredLRP", "DesiredLRP", 1) + `,`, - `After:` + strings.Replace(fmt.Sprintf("%v", this.After), "DesiredLRP", "DesiredLRP", 1) + `,`, - `TraceId:` + fmt.Sprintf("%v", this.TraceId) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPRemovedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPRemovedEvent{`, - `DesiredLrp:` + strings.Replace(fmt.Sprintf("%v", this.DesiredLrp), "DesiredLRP", "DesiredLRP", 1) + `,`, - `TraceId:` + fmt.Sprintf("%v", this.TraceId) + `,`, - `}`, - }, "") - return s -} -func (this *ActualLRPCrashedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ActualLRPCrashedEvent{`, - `ActualLRPKey:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ActualLRPKey), "ActualLRPKey", "ActualLRPKey", 1), `&`, ``, 1) + `,`, - `ActualLRPInstanceKey:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ActualLRPInstanceKey), "ActualLRPInstanceKey", "ActualLRPInstanceKey", 1), `&`, ``, 1) + `,`, - `CrashCount:` + fmt.Sprintf("%v", this.CrashCount) + `,`, - `CrashReason:` + fmt.Sprintf("%v", this.CrashReason) + `,`, - `Since:` + fmt.Sprintf("%v", this.Since) + `,`, - `}`, - }, "") - return s -} -func (this *EventsByCellId) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&EventsByCellId{`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `}`, - }, "") - return s -} -func (this *TaskCreatedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskCreatedEvent{`, - `Task:` + strings.Replace(fmt.Sprintf("%v", this.Task), "Task", "Task", 1) + `,`, - `}`, - }, "") - return s -} -func (this *TaskChangedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskChangedEvent{`, - `Before:` + strings.Replace(fmt.Sprintf("%v", this.Before), "Task", "Task", 1) + `,`, - `After:` + strings.Replace(fmt.Sprintf("%v", this.After), "Task", "Task", 1) + `,`, - `}`, - }, "") - return s -} -func (this *TaskRemovedEvent) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskRemovedEvent{`, - `Task:` + strings.Replace(fmt.Sprintf("%v", this.Task), "Task", "Task", 1) + `,`, - `}`, - }, "") - return s -} -func valueToStringEvents(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *ActualLRPCreatedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPCreatedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPCreatedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpGroup", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpGroup == nil { - m.ActualLrpGroup = &ActualLRPGroup{} - } - if err := m.ActualLrpGroup.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPChangedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPChangedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPChangedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Before", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Before == nil { - m.Before = &ActualLRPGroup{} - } - if err := m.Before.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field After", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.After == nil { - m.After = &ActualLRPGroup{} - } - if err := m.After.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPRemovedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPRemovedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPRemovedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrpGroup", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrpGroup == nil { - m.ActualLrpGroup = &ActualLRPGroup{} - } - if err := m.ActualLrpGroup.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPInstanceCreatedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPInstanceCreatedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPInstanceCreatedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrp == nil { - m.ActualLrp = &ActualLRP{} - } - if err := m.ActualLrp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TraceId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TraceId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPInfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPNetInfo", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPNetInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CrashCount", wireType) - } - m.CrashCount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CrashCount |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CrashReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CrashReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field State", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.State = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PlacementError", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PlacementError = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Since", wireType) - } - m.Since = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Since |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ModificationTag", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ModificationTag.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Presence", wireType) - } - m.Presence = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Presence |= ActualLRP_Presence(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Routable", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - b := bool(v != 0) - m.OptionalRoutable = &ActualLRPInfo_Routable{b} - case 12: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AvailabilityZone", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AvailabilityZone = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPInstanceChangedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPInstanceChangedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPInstanceChangedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Before", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Before == nil { - m.Before = &ActualLRPInfo{} - } - if err := m.Before.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field After", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.After == nil { - m.After = &ActualLRPInfo{} - } - if err := m.After.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TraceId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TraceId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPInstanceRemovedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPInstanceRemovedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPInstanceRemovedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLrp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ActualLrp == nil { - m.ActualLrp = &ActualLRP{} - } - if err := m.ActualLrp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TraceId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TraceId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPCreatedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPCreatedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPCreatedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLrp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DesiredLrp == nil { - m.DesiredLrp = &DesiredLRP{} - } - if err := m.DesiredLrp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TraceId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TraceId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPChangedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPChangedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPChangedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Before", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Before == nil { - m.Before = &DesiredLRP{} - } - if err := m.Before.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field After", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.After == nil { - m.After = &DesiredLRP{} - } - if err := m.After.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TraceId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TraceId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPRemovedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPRemovedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPRemovedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLrp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DesiredLrp == nil { - m.DesiredLrp = &DesiredLRP{} - } - if err := m.DesiredLrp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TraceId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TraceId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ActualLRPCrashedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ActualLRPCrashedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ActualLRPCrashedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActualLRPInstanceKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ActualLRPInstanceKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CrashCount", wireType) - } - m.CrashCount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CrashCount |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CrashReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CrashReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Since", wireType) - } - m.Since = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Since |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EventsByCellId) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: EventsByCellId: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EventsByCellId: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TaskCreatedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskCreatedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskCreatedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Task", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Task == nil { - m.Task = &Task{} - } - if err := m.Task.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TaskChangedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskChangedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskChangedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Before", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Before == nil { - m.Before = &Task{} - } - if err := m.Before.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field After", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.After == nil { - m.After = &Task{} - } - if err := m.After.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TaskRemovedEvent) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskRemovedEvent: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskRemovedEvent: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Task", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Task == nil { - m.Task = &Task{} - } - if err := m.Task.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipEvents(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthEvents - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupEvents - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthEvents - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthEvents = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEvents = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupEvents = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/image_layer.gogoproto.go b/protomodels/image_layer.gogoproto.go deleted file mode 100644 index 675dac02..00000000 --- a/protomodels/image_layer.gogoproto.go +++ /dev/null @@ -1,788 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: image_layer.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strconv "strconv" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type ImageLayer_DigestAlgorithm int32 - -const ( - DigestAlgorithmInvalid ImageLayer_DigestAlgorithm = 0 - DigestAlgorithmSha256 ImageLayer_DigestAlgorithm = 1 - DigestAlgorithmSha512 ImageLayer_DigestAlgorithm = 2 // Deprecated: Do not use. -) - -var ImageLayer_DigestAlgorithm_name = map[int32]string{ - 0: "DigestAlgorithmInvalid", - 1: "SHA256", - 2: "SHA512", -} - -var ImageLayer_DigestAlgorithm_value = map[string]int32{ - "DigestAlgorithmInvalid": 0, - "SHA256": 1, - "SHA512": 2, -} - -func (ImageLayer_DigestAlgorithm) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_c089288d9f3c46a0, []int{0, 0} -} - -type ImageLayer_MediaType int32 - -const ( - MediaTypeInvalid ImageLayer_MediaType = 0 - MediaTypeTgz ImageLayer_MediaType = 1 - MediaTypeTar ImageLayer_MediaType = 2 - MediaTypeZip ImageLayer_MediaType = 3 -) - -var ImageLayer_MediaType_name = map[int32]string{ - 0: "MediaTypeInvalid", - 1: "TGZ", - 2: "TAR", - 3: "ZIP", -} - -var ImageLayer_MediaType_value = map[string]int32{ - "MediaTypeInvalid": 0, - "TGZ": 1, - "TAR": 2, - "ZIP": 3, -} - -func (ImageLayer_MediaType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_c089288d9f3c46a0, []int{0, 1} -} - -type ImageLayer_Type int32 - -const ( - LayerTypeInvalid ImageLayer_Type = 0 - LayerTypeShared ImageLayer_Type = 1 - LayerTypeExclusive ImageLayer_Type = 2 -) - -var ImageLayer_Type_name = map[int32]string{ - 0: "LayerTypeInvalid", - 1: "SHARED", - 2: "EXCLUSIVE", -} - -var ImageLayer_Type_value = map[string]int32{ - "LayerTypeInvalid": 0, - "SHARED": 1, - "EXCLUSIVE": 2, -} - -func (ImageLayer_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_c089288d9f3c46a0, []int{0, 2} -} - -type ImageLayer struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url"` - DestinationPath string `protobuf:"bytes,3,opt,name=destination_path,json=destinationPath,proto3" json:"destination_path"` - LayerType ImageLayer_Type `protobuf:"varint,4,opt,name=layer_type,json=layerType,proto3,enum=models.ImageLayer_Type" json:"layer_type"` - MediaType ImageLayer_MediaType `protobuf:"varint,5,opt,name=media_type,json=mediaType,proto3,enum=models.ImageLayer_MediaType" json:"media_type"` - DigestAlgorithm ImageLayer_DigestAlgorithm `protobuf:"varint,6,opt,name=digest_algorithm,json=digestAlgorithm,proto3,enum=models.ImageLayer_DigestAlgorithm" json:"digest_algorithm,omitempty"` - DigestValue string `protobuf:"bytes,7,opt,name=digest_value,json=digestValue,proto3" json:"digest_value,omitempty"` -} - -func (m *ImageLayer) Reset() { *m = ImageLayer{} } -func (*ImageLayer) ProtoMessage() {} -func (*ImageLayer) Descriptor() ([]byte, []int) { - return fileDescriptor_c089288d9f3c46a0, []int{0} -} -func (m *ImageLayer) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ImageLayer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ImageLayer.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ImageLayer) XXX_Merge(src proto.Message) { - xxx_messageInfo_ImageLayer.Merge(m, src) -} -func (m *ImageLayer) XXX_Size() int { - return m.Size() -} -func (m *ImageLayer) XXX_DiscardUnknown() { - xxx_messageInfo_ImageLayer.DiscardUnknown(m) -} - -var xxx_messageInfo_ImageLayer proto.InternalMessageInfo - -func (m *ImageLayer) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *ImageLayer) GetUrl() string { - if m != nil { - return m.Url - } - return "" -} - -func (m *ImageLayer) GetDestinationPath() string { - if m != nil { - return m.DestinationPath - } - return "" -} - -func (m *ImageLayer) GetLayerType() ImageLayer_Type { - if m != nil { - return m.LayerType - } - return LayerTypeInvalid -} - -func (m *ImageLayer) GetMediaType() ImageLayer_MediaType { - if m != nil { - return m.MediaType - } - return MediaTypeInvalid -} - -func (m *ImageLayer) GetDigestAlgorithm() ImageLayer_DigestAlgorithm { - if m != nil { - return m.DigestAlgorithm - } - return DigestAlgorithmInvalid -} - -func (m *ImageLayer) GetDigestValue() string { - if m != nil { - return m.DigestValue - } - return "" -} - -func init() { - proto.RegisterEnum("models.ImageLayer_DigestAlgorithm", ImageLayer_DigestAlgorithm_name, ImageLayer_DigestAlgorithm_value) - proto.RegisterEnum("models.ImageLayer_MediaType", ImageLayer_MediaType_name, ImageLayer_MediaType_value) - proto.RegisterEnum("models.ImageLayer_Type", ImageLayer_Type_name, ImageLayer_Type_value) - proto.RegisterType((*ImageLayer)(nil), "models.ImageLayer") -} - -func init() { proto.RegisterFile("image_layer.proto", fileDescriptor_c089288d9f3c46a0) } - -var fileDescriptor_c089288d9f3c46a0 = []byte{ - // 533 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x41, 0x6f, 0x12, 0x41, - 0x14, 0xc7, 0x77, 0xa0, 0xa5, 0xf2, 0x6c, 0xca, 0x38, 0xd6, 0xba, 0xac, 0x66, 0x58, 0x49, 0x1a, - 0x7b, 0x91, 0xa6, 0x28, 0xbd, 0x1a, 0xb0, 0xa8, 0x44, 0x9a, 0x34, 0x0b, 0x36, 0x86, 0x0b, 0x19, - 0xba, 0xe3, 0xee, 0x26, 0xbb, 0x2c, 0x59, 0x16, 0x22, 0x26, 0x26, 0x9e, 0x39, 0xf9, 0x05, 0xb8, - 0xfb, 0x51, 0x3c, 0x72, 0xec, 0xc1, 0x10, 0x59, 0x2e, 0x86, 0x53, 0x3f, 0x82, 0xd9, 0x41, 0xa0, - 0xae, 0x5c, 0x36, 0xef, 0xfd, 0xff, 0xbf, 0xf9, 0xbf, 0x99, 0xd9, 0x0c, 0xdc, 0xb3, 0x1c, 0x66, - 0xf0, 0xa6, 0xcd, 0x06, 0xdc, 0xcb, 0x75, 0x3c, 0xd7, 0x77, 0x49, 0xc2, 0x71, 0x75, 0x6e, 0x77, - 0x95, 0x67, 0x86, 0xe5, 0x9b, 0xbd, 0x56, 0xee, 0xca, 0x75, 0x8e, 0x0d, 0xd7, 0x70, 0x8f, 0x85, - 0xdd, 0xea, 0x7d, 0x14, 0x9d, 0x68, 0x44, 0xb5, 0x58, 0x96, 0xfd, 0xb9, 0x0d, 0x50, 0x09, 0xc3, - 0xaa, 0x61, 0x16, 0x21, 0xb0, 0xd5, 0x66, 0x0e, 0x97, 0x91, 0x8a, 0x8e, 0x92, 0x9a, 0xa8, 0x49, - 0x1a, 0xe2, 0x3d, 0xcf, 0x96, 0x63, 0xa1, 0x54, 0xda, 0x99, 0x4f, 0x32, 0x61, 0xab, 0x85, 0x1f, - 0xf2, 0x12, 0xb0, 0xce, 0xbb, 0xbe, 0xd5, 0x66, 0xbe, 0xe5, 0xb6, 0x9b, 0x1d, 0xe6, 0x9b, 0x72, - 0x5c, 0x70, 0xfb, 0xf3, 0x49, 0xe6, 0x3f, 0x4f, 0x4b, 0xdd, 0x52, 0x2e, 0x98, 0x6f, 0x92, 0xd7, - 0x00, 0xe2, 0x10, 0x4d, 0x7f, 0xd0, 0xe1, 0xf2, 0x96, 0x8a, 0x8e, 0xf6, 0xf2, 0x0f, 0x73, 0x8b, - 0xa3, 0xe4, 0xd6, 0xfb, 0xca, 0xd5, 0x07, 0x1d, 0x5e, 0xda, 0x9b, 0x4f, 0x32, 0xb7, 0x70, 0x2d, - 0x29, 0xea, 0xd0, 0x22, 0xef, 0x00, 0x1c, 0xae, 0x5b, 0x6c, 0x91, 0xb3, 0x2d, 0x72, 0x1e, 0x6f, - 0xc8, 0x39, 0x0f, 0xa1, 0x75, 0xd8, 0x7a, 0x8d, 0x96, 0x74, 0x96, 0x16, 0x39, 0x07, 0xac, 0x5b, - 0x06, 0xef, 0xfa, 0x4d, 0x66, 0x1b, 0xae, 0x67, 0xf9, 0xa6, 0x23, 0x27, 0x44, 0x64, 0x76, 0x43, - 0xe4, 0x99, 0x40, 0x8b, 0x4b, 0x52, 0x4b, 0xe9, 0xff, 0x0a, 0xe4, 0x09, 0xec, 0xfe, 0x8d, 0xeb, - 0x33, 0xbb, 0xc7, 0xe5, 0x1d, 0x71, 0xb7, 0x77, 0x17, 0xda, 0x65, 0x28, 0x65, 0xbf, 0x40, 0x2a, - 0x12, 0x43, 0x14, 0x38, 0x88, 0x48, 0x95, 0x76, 0x9f, 0xd9, 0x96, 0x8e, 0x25, 0x72, 0x08, 0x89, - 0xda, 0xdb, 0x62, 0xbe, 0x70, 0x8a, 0x91, 0x92, 0x1e, 0x8e, 0xd4, 0x07, 0x11, 0xb2, 0x66, 0xb2, - 0x7c, 0xe1, 0x94, 0x3c, 0x15, 0x58, 0xe1, 0x24, 0x8f, 0x63, 0xca, 0xa3, 0xcd, 0x58, 0xe1, 0x24, - 0x7f, 0x07, 0x65, 0x3d, 0x48, 0xae, 0x2e, 0x86, 0xec, 0x03, 0x5e, 0x35, 0xeb, 0x91, 0x69, 0x88, - 0xd7, 0xdf, 0x34, 0x30, 0x52, 0xf0, 0x70, 0xa4, 0xee, 0xae, 0x80, 0xba, 0xf1, 0x59, 0x58, 0x45, - 0x0d, 0xc7, 0xa2, 0x16, 0xf3, 0x42, 0xab, 0x51, 0xb9, 0xc0, 0xf1, 0x88, 0xd5, 0xb0, 0x3a, 0x59, - 0x1d, 0xb6, 0x96, 0xe3, 0xaa, 0xcb, 0xdf, 0xb8, 0x1e, 0x97, 0x11, 0x5b, 0xd7, 0xca, 0x67, 0x18, - 0x29, 0xf7, 0x87, 0x23, 0x35, 0xb5, 0x62, 0x6a, 0x26, 0xf3, 0xb8, 0x4e, 0x0e, 0x21, 0x59, 0xfe, - 0xf0, 0xaa, 0xfa, 0xbe, 0x56, 0xb9, 0x2c, 0xe3, 0x98, 0x72, 0x30, 0x1c, 0xa9, 0x64, 0xc5, 0x94, - 0x3f, 0x5d, 0xd9, 0xbd, 0xae, 0xd5, 0xe7, 0xa5, 0x17, 0xe3, 0x29, 0x95, 0xae, 0xa7, 0x54, 0xba, - 0x99, 0x52, 0xf4, 0x35, 0xa0, 0xe8, 0x7b, 0x40, 0xd1, 0x8f, 0x80, 0xa2, 0x71, 0x40, 0xd1, 0xaf, - 0x80, 0xa2, 0xdf, 0x01, 0x95, 0x6e, 0x02, 0x8a, 0xbe, 0xcd, 0xa8, 0x34, 0x9e, 0x51, 0xe9, 0x7a, - 0x46, 0xa5, 0x56, 0x42, 0xbc, 0x8d, 0xe7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x90, 0xc9, - 0x42, 0x67, 0x03, 0x00, 0x00, -} - -func (x ImageLayer_DigestAlgorithm) String() string { - s, ok := ImageLayer_DigestAlgorithm_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (x ImageLayer_MediaType) String() string { - s, ok := ImageLayer_MediaType_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (x ImageLayer_Type) String() string { - s, ok := ImageLayer_Type_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (this *ImageLayer) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ImageLayer) - if !ok { - that2, ok := that.(ImageLayer) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Name != that1.Name { - return false - } - if this.Url != that1.Url { - return false - } - if this.DestinationPath != that1.DestinationPath { - return false - } - if this.LayerType != that1.LayerType { - return false - } - if this.MediaType != that1.MediaType { - return false - } - if this.DigestAlgorithm != that1.DigestAlgorithm { - return false - } - if this.DigestValue != that1.DigestValue { - return false - } - return true -} -func (this *ImageLayer) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 11) - s = append(s, "&models.ImageLayer{") - s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n") - s = append(s, "Url: "+fmt.Sprintf("%#v", this.Url)+",\n") - s = append(s, "DestinationPath: "+fmt.Sprintf("%#v", this.DestinationPath)+",\n") - s = append(s, "LayerType: "+fmt.Sprintf("%#v", this.LayerType)+",\n") - s = append(s, "MediaType: "+fmt.Sprintf("%#v", this.MediaType)+",\n") - s = append(s, "DigestAlgorithm: "+fmt.Sprintf("%#v", this.DigestAlgorithm)+",\n") - s = append(s, "DigestValue: "+fmt.Sprintf("%#v", this.DigestValue)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringImageLayer(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *ImageLayer) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ImageLayer) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ImageLayer) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.DigestValue) > 0 { - i -= len(m.DigestValue) - copy(dAtA[i:], m.DigestValue) - i = encodeVarintImageLayer(dAtA, i, uint64(len(m.DigestValue))) - i-- - dAtA[i] = 0x3a - } - if m.DigestAlgorithm != 0 { - i = encodeVarintImageLayer(dAtA, i, uint64(m.DigestAlgorithm)) - i-- - dAtA[i] = 0x30 - } - if m.MediaType != 0 { - i = encodeVarintImageLayer(dAtA, i, uint64(m.MediaType)) - i-- - dAtA[i] = 0x28 - } - if m.LayerType != 0 { - i = encodeVarintImageLayer(dAtA, i, uint64(m.LayerType)) - i-- - dAtA[i] = 0x20 - } - if len(m.DestinationPath) > 0 { - i -= len(m.DestinationPath) - copy(dAtA[i:], m.DestinationPath) - i = encodeVarintImageLayer(dAtA, i, uint64(len(m.DestinationPath))) - i-- - dAtA[i] = 0x1a - } - if len(m.Url) > 0 { - i -= len(m.Url) - copy(dAtA[i:], m.Url) - i = encodeVarintImageLayer(dAtA, i, uint64(len(m.Url))) - i-- - dAtA[i] = 0x12 - } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintImageLayer(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintImageLayer(dAtA []byte, offset int, v uint64) int { - offset -= sovImageLayer(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *ImageLayer) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Name) - if l > 0 { - n += 1 + l + sovImageLayer(uint64(l)) - } - l = len(m.Url) - if l > 0 { - n += 1 + l + sovImageLayer(uint64(l)) - } - l = len(m.DestinationPath) - if l > 0 { - n += 1 + l + sovImageLayer(uint64(l)) - } - if m.LayerType != 0 { - n += 1 + sovImageLayer(uint64(m.LayerType)) - } - if m.MediaType != 0 { - n += 1 + sovImageLayer(uint64(m.MediaType)) - } - if m.DigestAlgorithm != 0 { - n += 1 + sovImageLayer(uint64(m.DigestAlgorithm)) - } - l = len(m.DigestValue) - if l > 0 { - n += 1 + l + sovImageLayer(uint64(l)) - } - return n -} - -func sovImageLayer(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozImageLayer(x uint64) (n int) { - return sovImageLayer(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *ImageLayer) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ImageLayer{`, - `Name:` + fmt.Sprintf("%v", this.Name) + `,`, - `Url:` + fmt.Sprintf("%v", this.Url) + `,`, - `DestinationPath:` + fmt.Sprintf("%v", this.DestinationPath) + `,`, - `LayerType:` + fmt.Sprintf("%v", this.LayerType) + `,`, - `MediaType:` + fmt.Sprintf("%v", this.MediaType) + `,`, - `DigestAlgorithm:` + fmt.Sprintf("%v", this.DigestAlgorithm) + `,`, - `DigestValue:` + fmt.Sprintf("%v", this.DigestValue) + `,`, - `}`, - }, "") - return s -} -func valueToStringImageLayer(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *ImageLayer) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ImageLayer: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ImageLayer: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthImageLayer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthImageLayer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Url", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthImageLayer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthImageLayer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Url = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DestinationPath", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthImageLayer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthImageLayer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DestinationPath = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field LayerType", wireType) - } - m.LayerType = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.LayerType |= ImageLayer_Type(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MediaType", wireType) - } - m.MediaType = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MediaType |= ImageLayer_MediaType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DigestAlgorithm", wireType) - } - m.DigestAlgorithm = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DigestAlgorithm |= ImageLayer_DigestAlgorithm(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DigestValue", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowImageLayer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthImageLayer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthImageLayer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DigestValue = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipImageLayer(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthImageLayer - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipImageLayer(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowImageLayer - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowImageLayer - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowImageLayer - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthImageLayer - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupImageLayer - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthImageLayer - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthImageLayer = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowImageLayer = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupImageLayer = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/log_rate_limit.gogoproto.go b/protomodels/log_rate_limit.gogoproto.go deleted file mode 100644 index 8d2093ad..00000000 --- a/protomodels/log_rate_limit.gogoproto.go +++ /dev/null @@ -1,360 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: log_rate_limit.proto - -package protomodels - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type LogRateLimit struct { - BytesPerSecond int64 `protobuf:"varint,1,opt,name=bytes_per_second,json=bytesPerSecond,proto3" json:"bytes_per_second,omitempty"` -} - -func (m *LogRateLimit) Reset() { *m = LogRateLimit{} } -func (*LogRateLimit) ProtoMessage() {} -func (*LogRateLimit) Descriptor() ([]byte, []int) { - return fileDescriptor_bfeb7b5141d983ba, []int{0} -} -func (m *LogRateLimit) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *LogRateLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_LogRateLimit.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *LogRateLimit) XXX_Merge(src proto.Message) { - xxx_messageInfo_LogRateLimit.Merge(m, src) -} -func (m *LogRateLimit) XXX_Size() int { - return m.Size() -} -func (m *LogRateLimit) XXX_DiscardUnknown() { - xxx_messageInfo_LogRateLimit.DiscardUnknown(m) -} - -var xxx_messageInfo_LogRateLimit proto.InternalMessageInfo - -func (m *LogRateLimit) GetBytesPerSecond() int64 { - if m != nil { - return m.BytesPerSecond - } - return 0 -} - -func init() { - proto.RegisterType((*LogRateLimit)(nil), "models.LogRateLimit") -} - -func init() { proto.RegisterFile("log_rate_limit.proto", fileDescriptor_bfeb7b5141d983ba) } - -var fileDescriptor_bfeb7b5141d983ba = []byte{ - // 166 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc9, 0xc9, 0x4f, 0x8f, - 0x2f, 0x4a, 0x2c, 0x49, 0x8d, 0xcf, 0xc9, 0xcc, 0xcd, 0x2c, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x56, 0xb2, 0xe0, 0xe2, 0xf1, 0xc9, 0x4f, 0x0f, - 0x4a, 0x2c, 0x49, 0xf5, 0x01, 0xc9, 0x0a, 0x69, 0x70, 0x09, 0x24, 0x55, 0x96, 0xa4, 0x16, 0xc7, - 0x17, 0xa4, 0x16, 0xc5, 0x17, 0xa7, 0x26, 0xe7, 0xe7, 0xa5, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x30, - 0x07, 0xf1, 0x81, 0xc5, 0x03, 0x52, 0x8b, 0x82, 0xc1, 0xa2, 0x4e, 0x26, 0x17, 0x1e, 0xca, 0x31, - 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, 0x15, 0x8f, 0xe4, - 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x17, 0x8f, - 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, - 0x8f, 0xe5, 0x18, 0x92, 0xd8, 0xc0, 0xd6, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xba, 0xbc, - 0x7d, 0xdf, 0x96, 0x00, 0x00, 0x00, -} - -func (this *LogRateLimit) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*LogRateLimit) - if !ok { - that2, ok := that.(LogRateLimit) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.BytesPerSecond != that1.BytesPerSecond { - return false - } - return true -} -func (this *LogRateLimit) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.LogRateLimit{") - s = append(s, "BytesPerSecond: "+fmt.Sprintf("%#v", this.BytesPerSecond)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringLogRateLimit(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *LogRateLimit) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *LogRateLimit) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *LogRateLimit) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.BytesPerSecond != 0 { - i = encodeVarintLogRateLimit(dAtA, i, uint64(m.BytesPerSecond)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintLogRateLimit(dAtA []byte, offset int, v uint64) int { - offset -= sovLogRateLimit(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *LogRateLimit) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.BytesPerSecond != 0 { - n += 1 + sovLogRateLimit(uint64(m.BytesPerSecond)) - } - return n -} - -func sovLogRateLimit(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozLogRateLimit(x uint64) (n int) { - return sovLogRateLimit(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *LogRateLimit) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&LogRateLimit{`, - `BytesPerSecond:` + fmt.Sprintf("%v", this.BytesPerSecond) + `,`, - `}`, - }, "") - return s -} -func valueToStringLogRateLimit(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *LogRateLimit) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLogRateLimit - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: LogRateLimit: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: LogRateLimit: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BytesPerSecond", wireType) - } - m.BytesPerSecond = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLogRateLimit - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BytesPerSecond |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipLogRateLimit(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthLogRateLimit - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipLogRateLimit(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLogRateLimit - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLogRateLimit - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowLogRateLimit - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthLogRateLimit - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupLogRateLimit - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthLogRateLimit - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthLogRateLimit = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowLogRateLimit = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupLogRateLimit = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/metric_tags.gogoproto.go b/protomodels/metric_tags.gogoproto.go deleted file mode 100644 index 2f6f6c4c..00000000 --- a/protomodels/metric_tags.gogoproto.go +++ /dev/null @@ -1,460 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: metric_tags.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strconv "strconv" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type MetricTagValue_DynamicValue int32 - -const ( - DynamicValueInvalid MetricTagValue_DynamicValue = 0 - MetricTagDynamicValueIndex MetricTagValue_DynamicValue = 1 - MetricTagDynamicValueInstanceGuid MetricTagValue_DynamicValue = 2 -) - -var MetricTagValue_DynamicValue_name = map[int32]string{ - 0: "DynamicValueInvalid", - 1: "INDEX", - 2: "INSTANCE_GUID", -} - -var MetricTagValue_DynamicValue_value = map[string]int32{ - "DynamicValueInvalid": 0, - "INDEX": 1, - "INSTANCE_GUID": 2, -} - -func (MetricTagValue_DynamicValue) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_6fa2ee0541447d5e, []int{0, 0} -} - -type MetricTagValue struct { - // Note: we only expect one of the following set of fields to be - // set. - Static string `protobuf:"bytes,1,opt,name=static,proto3" json:"static,omitempty"` - Dynamic MetricTagValue_DynamicValue `protobuf:"varint,2,opt,name=dynamic,proto3,enum=models.MetricTagValue_DynamicValue" json:"dynamic,omitempty"` -} - -func (m *MetricTagValue) Reset() { *m = MetricTagValue{} } -func (*MetricTagValue) ProtoMessage() {} -func (*MetricTagValue) Descriptor() ([]byte, []int) { - return fileDescriptor_6fa2ee0541447d5e, []int{0} -} -func (m *MetricTagValue) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MetricTagValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MetricTagValue.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MetricTagValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_MetricTagValue.Merge(m, src) -} -func (m *MetricTagValue) XXX_Size() int { - return m.Size() -} -func (m *MetricTagValue) XXX_DiscardUnknown() { - xxx_messageInfo_MetricTagValue.DiscardUnknown(m) -} - -var xxx_messageInfo_MetricTagValue proto.InternalMessageInfo - -func (m *MetricTagValue) GetStatic() string { - if m != nil { - return m.Static - } - return "" -} - -func (m *MetricTagValue) GetDynamic() MetricTagValue_DynamicValue { - if m != nil { - return m.Dynamic - } - return DynamicValueInvalid -} - -func init() { - proto.RegisterEnum("models.MetricTagValue_DynamicValue", MetricTagValue_DynamicValue_name, MetricTagValue_DynamicValue_value) - proto.RegisterType((*MetricTagValue)(nil), "models.MetricTagValue") -} - -func init() { proto.RegisterFile("metric_tags.proto", fileDescriptor_6fa2ee0541447d5e) } - -var fileDescriptor_6fa2ee0541447d5e = []byte{ - // 296 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcc, 0x4d, 0x2d, 0x29, - 0xca, 0x4c, 0x8e, 0x2f, 0x49, 0x4c, 0x2f, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, - 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x96, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, - 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7, 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, - 0x98, 0x05, 0xd1, 0xa6, 0xf4, 0x8d, 0x91, 0x8b, 0xcf, 0x17, 0x6c, 0x58, 0x48, 0x62, 0x7a, 0x58, - 0x62, 0x4e, 0x69, 0xaa, 0x90, 0x18, 0x17, 0x5b, 0x71, 0x49, 0x62, 0x49, 0x66, 0xb2, 0x04, 0xa3, - 0x02, 0xa3, 0x06, 0x67, 0x10, 0x94, 0x27, 0x64, 0xcb, 0xc5, 0x9e, 0x52, 0x99, 0x97, 0x98, 0x9b, - 0x99, 0x2c, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x67, 0xa4, 0xac, 0x07, 0xb1, 0x53, 0x0f, 0xd5, 0x00, - 0x3d, 0x17, 0x88, 0x2a, 0x30, 0x27, 0x08, 0xa6, 0x47, 0xa9, 0x87, 0x91, 0x8b, 0x07, 0x59, 0x46, - 0x48, 0x9c, 0x4b, 0x18, 0x99, 0xef, 0x99, 0x57, 0x96, 0x98, 0x93, 0x99, 0x22, 0xc0, 0x20, 0xa4, - 0xc9, 0xc5, 0xea, 0xe9, 0xe7, 0xe2, 0x1a, 0x21, 0xc0, 0x28, 0x25, 0xd7, 0x35, 0x57, 0x41, 0x0a, - 0x6e, 0x3c, 0xaa, 0xf2, 0x94, 0xd4, 0x0a, 0x21, 0x0b, 0x2e, 0x5e, 0x4f, 0xbf, 0xe0, 0x10, 0x47, - 0x3f, 0x67, 0xd7, 0x78, 0xf7, 0x50, 0x4f, 0x17, 0x01, 0x26, 0x29, 0xd5, 0xae, 0xb9, 0x0a, 0x8a, - 0x38, 0xb4, 0x14, 0x97, 0x24, 0xe6, 0x25, 0xa7, 0xba, 0x97, 0x66, 0xa6, 0x38, 0x99, 0x5c, 0x78, - 0x28, 0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f, 0xe4, 0x18, 0x57, - 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, - 0x5f, 0x3c, 0x92, 0x63, 0xf8, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, - 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x48, 0x62, 0x03, 0x87, 0x9a, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, - 0x9b, 0x83, 0x77, 0xc8, 0x81, 0x01, 0x00, 0x00, -} - -func (x MetricTagValue_DynamicValue) String() string { - s, ok := MetricTagValue_DynamicValue_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (this *MetricTagValue) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*MetricTagValue) - if !ok { - that2, ok := that.(MetricTagValue) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Static != that1.Static { - return false - } - if this.Dynamic != that1.Dynamic { - return false - } - return true -} -func (this *MetricTagValue) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.MetricTagValue{") - s = append(s, "Static: "+fmt.Sprintf("%#v", this.Static)+",\n") - s = append(s, "Dynamic: "+fmt.Sprintf("%#v", this.Dynamic)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringMetricTags(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *MetricTagValue) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MetricTagValue) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MetricTagValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Dynamic != 0 { - i = encodeVarintMetricTags(dAtA, i, uint64(m.Dynamic)) - i-- - dAtA[i] = 0x10 - } - if len(m.Static) > 0 { - i -= len(m.Static) - copy(dAtA[i:], m.Static) - i = encodeVarintMetricTags(dAtA, i, uint64(len(m.Static))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintMetricTags(dAtA []byte, offset int, v uint64) int { - offset -= sovMetricTags(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *MetricTagValue) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Static) - if l > 0 { - n += 1 + l + sovMetricTags(uint64(l)) - } - if m.Dynamic != 0 { - n += 1 + sovMetricTags(uint64(m.Dynamic)) - } - return n -} - -func sovMetricTags(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozMetricTags(x uint64) (n int) { - return sovMetricTags(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *MetricTagValue) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&MetricTagValue{`, - `Static:` + fmt.Sprintf("%v", this.Static) + `,`, - `Dynamic:` + fmt.Sprintf("%v", this.Dynamic) + `,`, - `}`, - }, "") - return s -} -func valueToStringMetricTags(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *MetricTagValue) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMetricTags - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MetricTagValue: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MetricTagValue: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Static", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMetricTags - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthMetricTags - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMetricTags - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Static = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Dynamic", wireType) - } - m.Dynamic = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMetricTags - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Dynamic |= MetricTagValue_DynamicValue(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipMetricTags(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMetricTags - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipMetricTags(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowMetricTags - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowMetricTags - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowMetricTags - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthMetricTags - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupMetricTags - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthMetricTags - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthMetricTags = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMetricTags = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupMetricTags = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/modification_tag.gogoproto.go b/protomodels/modification_tag.gogoproto.go deleted file mode 100644 index e9eb7dcb..00000000 --- a/protomodels/modification_tag.gogoproto.go +++ /dev/null @@ -1,419 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: modification_tag.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type ModificationTag struct { - Epoch string `protobuf:"bytes,1,opt,name=epoch,proto3" json:"epoch"` - Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` -} - -func (m *ModificationTag) Reset() { *m = ModificationTag{} } -func (*ModificationTag) ProtoMessage() {} -func (*ModificationTag) Descriptor() ([]byte, []int) { - return fileDescriptor_b84c9c806e96b4e3, []int{0} -} -func (m *ModificationTag) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ModificationTag) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ModificationTag.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ModificationTag) XXX_Merge(src proto.Message) { - xxx_messageInfo_ModificationTag.Merge(m, src) -} -func (m *ModificationTag) XXX_Size() int { - return m.Size() -} -func (m *ModificationTag) XXX_DiscardUnknown() { - xxx_messageInfo_ModificationTag.DiscardUnknown(m) -} - -var xxx_messageInfo_ModificationTag proto.InternalMessageInfo - -func (m *ModificationTag) GetEpoch() string { - if m != nil { - return m.Epoch - } - return "" -} - -func (m *ModificationTag) GetIndex() uint32 { - if m != nil { - return m.Index - } - return 0 -} - -func init() { - proto.RegisterType((*ModificationTag)(nil), "models.ModificationTag") -} - -func init() { proto.RegisterFile("modification_tag.proto", fileDescriptor_b84c9c806e96b4e3) } - -var fileDescriptor_b84c9c806e96b4e3 = []byte{ - // 203 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcb, 0xcd, 0x4f, 0xc9, - 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x8b, 0x2f, 0x49, 0x4c, 0xd7, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x96, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7, 0x07, 0x4b, 0x27, 0x95, - 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xa6, 0x14, 0xcc, 0xc5, 0xef, 0x8b, 0x64, 0x60, - 0x48, 0x62, 0xba, 0x90, 0x3c, 0x17, 0x6b, 0x6a, 0x41, 0x7e, 0x72, 0x86, 0x04, 0xa3, 0x02, 0xa3, - 0x06, 0xa7, 0x13, 0xe7, 0xab, 0x7b, 0xf2, 0x10, 0x81, 0x20, 0x08, 0x05, 0x52, 0x90, 0x99, 0x97, - 0x92, 0x5a, 0x21, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x0b, 0x51, 0x00, 0x16, 0x08, 0x82, 0x50, 0x4e, - 0x26, 0x17, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, - 0x39, 0xc6, 0x15, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, - 0x23, 0x39, 0xc6, 0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, - 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0x92, 0xd8, 0xc0, 0x2e, 0x32, 0x06, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x12, 0xa6, 0xaa, 0xa3, 0xe2, 0x00, 0x00, 0x00, -} - -func (this *ModificationTag) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ModificationTag) - if !ok { - that2, ok := that.(ModificationTag) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Epoch != that1.Epoch { - return false - } - if this.Index != that1.Index { - return false - } - return true -} -func (this *ModificationTag) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ModificationTag{") - s = append(s, "Epoch: "+fmt.Sprintf("%#v", this.Epoch)+",\n") - s = append(s, "Index: "+fmt.Sprintf("%#v", this.Index)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringModificationTag(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *ModificationTag) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ModificationTag) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ModificationTag) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Index != 0 { - i = encodeVarintModificationTag(dAtA, i, uint64(m.Index)) - i-- - dAtA[i] = 0x10 - } - if len(m.Epoch) > 0 { - i -= len(m.Epoch) - copy(dAtA[i:], m.Epoch) - i = encodeVarintModificationTag(dAtA, i, uint64(len(m.Epoch))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintModificationTag(dAtA []byte, offset int, v uint64) int { - offset -= sovModificationTag(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *ModificationTag) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Epoch) - if l > 0 { - n += 1 + l + sovModificationTag(uint64(l)) - } - if m.Index != 0 { - n += 1 + sovModificationTag(uint64(m.Index)) - } - return n -} - -func sovModificationTag(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozModificationTag(x uint64) (n int) { - return sovModificationTag(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *ModificationTag) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ModificationTag{`, - `Epoch:` + fmt.Sprintf("%v", this.Epoch) + `,`, - `Index:` + fmt.Sprintf("%v", this.Index) + `,`, - `}`, - }, "") - return s -} -func valueToStringModificationTag(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *ModificationTag) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowModificationTag - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ModificationTag: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ModificationTag: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Epoch", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowModificationTag - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthModificationTag - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthModificationTag - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Epoch = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - m.Index = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowModificationTag - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Index |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipModificationTag(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthModificationTag - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipModificationTag(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowModificationTag - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowModificationTag - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowModificationTag - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthModificationTag - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupModificationTag - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthModificationTag - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthModificationTag = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowModificationTag = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupModificationTag = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/network.gogoproto.go b/protomodels/network.gogoproto.go deleted file mode 100644 index 5865fb94..00000000 --- a/protomodels/network.gogoproto.go +++ /dev/null @@ -1,522 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: network.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Network struct { - Properties map[string]string `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` -} - -func (m *Network) Reset() { *m = Network{} } -func (*Network) ProtoMessage() {} -func (*Network) Descriptor() ([]byte, []int) { - return fileDescriptor_8571034d60397816, []int{0} -} -func (m *Network) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Network) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Network.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Network) XXX_Merge(src proto.Message) { - xxx_messageInfo_Network.Merge(m, src) -} -func (m *Network) XXX_Size() int { - return m.Size() -} -func (m *Network) XXX_DiscardUnknown() { - xxx_messageInfo_Network.DiscardUnknown(m) -} - -var xxx_messageInfo_Network proto.InternalMessageInfo - -func (m *Network) GetProperties() map[string]string { - if m != nil { - return m.Properties - } - return nil -} - -func init() { - proto.RegisterType((*Network)(nil), "models.Network") - proto.RegisterMapType((map[string]string)(nil), "models.Network.PropertiesEntry") -} - -func init() { proto.RegisterFile("network.proto", fileDescriptor_8571034d60397816) } - -var fileDescriptor_8571034d60397816 = []byte{ - // 247 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcd, 0x4b, 0x2d, 0x29, - 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, - 0x29, 0x96, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, - 0x4f, 0xcf, 0xd7, 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xa6, - 0xb4, 0x98, 0x91, 0x8b, 0xdd, 0x0f, 0x62, 0x90, 0x50, 0x24, 0x17, 0x57, 0x41, 0x51, 0x7e, 0x41, - 0x6a, 0x51, 0x49, 0x66, 0x6a, 0xb1, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0xbc, 0x1e, 0xc4, - 0x5c, 0x3d, 0xa8, 0x22, 0xbd, 0x00, 0xb8, 0x0a, 0xd7, 0xbc, 0x92, 0xa2, 0x4a, 0x27, 0x89, 0x57, - 0xf7, 0xe4, 0x45, 0x10, 0xda, 0x74, 0xf2, 0x73, 0x33, 0x4b, 0x52, 0x73, 0x0b, 0x4a, 0x2a, 0x83, - 0x90, 0x0c, 0x93, 0xb2, 0xe5, 0xe2, 0x47, 0xd3, 0x28, 0x24, 0xc0, 0xc5, 0x9c, 0x9d, 0x5a, 0x29, - 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0x62, 0x0a, 0x89, 0x70, 0xb1, 0x96, 0x25, 0xe6, 0x94, - 0xa6, 0x4a, 0x30, 0x81, 0xc5, 0x20, 0x1c, 0x2b, 0x26, 0x0b, 0x46, 0x27, 0x93, 0x0b, 0x0f, 0xe5, - 0x18, 0x6f, 0x3c, 0x94, 0x63, 0xf8, 0xf0, 0x50, 0x8e, 0xb1, 0xe1, 0x91, 0x1c, 0xe3, 0x8a, 0x47, - 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8b, - 0x47, 0x72, 0x0c, 0x1f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, - 0x8d, 0xc7, 0x72, 0x0c, 0x49, 0x6c, 0x60, 0x2f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, - 0x3c, 0x9d, 0x4b, 0x2a, 0x01, 0x00, 0x00, -} - -func (this *Network) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Network) - if !ok { - that2, ok := that.(Network) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.Properties) != len(that1.Properties) { - return false - } - for i := range this.Properties { - if this.Properties[i] != that1.Properties[i] { - return false - } - } - return true -} -func (this *Network) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.Network{") - keysForProperties := make([]string, 0, len(this.Properties)) - for k, _ := range this.Properties { - keysForProperties = append(keysForProperties, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForProperties) - mapStringForProperties := "map[string]string{" - for _, k := range keysForProperties { - mapStringForProperties += fmt.Sprintf("%#v: %#v,", k, this.Properties[k]) - } - mapStringForProperties += "}" - if this.Properties != nil { - s = append(s, "Properties: "+mapStringForProperties+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringNetwork(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *Network) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Network) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Network) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Properties) > 0 { - for k := range m.Properties { - v := m.Properties[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintNetwork(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintNetwork(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintNetwork(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func encodeVarintNetwork(dAtA []byte, offset int, v uint64) int { - offset -= sovNetwork(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Network) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Properties) > 0 { - for k, v := range m.Properties { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovNetwork(uint64(len(k))) + 1 + len(v) + sovNetwork(uint64(len(v))) - n += mapEntrySize + 1 + sovNetwork(uint64(mapEntrySize)) - } - } - return n -} - -func sovNetwork(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozNetwork(x uint64) (n int) { - return sovNetwork(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *Network) String() string { - if this == nil { - return "nil" - } - keysForProperties := make([]string, 0, len(this.Properties)) - for k, _ := range this.Properties { - keysForProperties = append(keysForProperties, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForProperties) - mapStringForProperties := "map[string]string{" - for _, k := range keysForProperties { - mapStringForProperties += fmt.Sprintf("%v: %v,", k, this.Properties[k]) - } - mapStringForProperties += "}" - s := strings.Join([]string{`&Network{`, - `Properties:` + mapStringForProperties + `,`, - `}`, - }, "") - return s -} -func valueToStringNetwork(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *Network) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowNetwork - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Network: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Network: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Properties", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowNetwork - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthNetwork - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthNetwork - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Properties == nil { - m.Properties = make(map[string]string) - } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowNetwork - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowNetwork - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthNetwork - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthNetwork - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowNetwork - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthNetwork - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthNetwork - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipNetwork(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthNetwork - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.Properties[mapkey] = mapvalue - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipNetwork(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthNetwork - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipNetwork(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowNetwork - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowNetwork - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowNetwork - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthNetwork - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupNetwork - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthNetwork - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthNetwork = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowNetwork = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupNetwork = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/ping.gogoproto.go b/protomodels/ping.gogoproto.go deleted file mode 100644 index eeab9ae6..00000000 --- a/protomodels/ping.gogoproto.go +++ /dev/null @@ -1,368 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ping.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type PingResponse struct { - Available bool `protobuf:"varint,1,opt,name=available,proto3" json:"available"` -} - -func (m *PingResponse) Reset() { *m = PingResponse{} } -func (*PingResponse) ProtoMessage() {} -func (*PingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6d51d96c3ad891f5, []int{0} -} -func (m *PingResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *PingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_PingResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *PingResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PingResponse.Merge(m, src) -} -func (m *PingResponse) XXX_Size() int { - return m.Size() -} -func (m *PingResponse) XXX_DiscardUnknown() { - xxx_messageInfo_PingResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_PingResponse proto.InternalMessageInfo - -func (m *PingResponse) GetAvailable() bool { - if m != nil { - return m.Available - } - return false -} - -func init() { - proto.RegisterType((*PingResponse)(nil), "models.PingResponse") -} - -func init() { proto.RegisterFile("ping.proto", fileDescriptor_6d51d96c3ad891f5) } - -var fileDescriptor_6d51d96c3ad891f5 = []byte{ - // 181 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0xc8, 0xcc, 0x4b, - 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x96, 0xd2, - 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7, - 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xa6, 0x64, 0xcd, 0xc5, - 0x13, 0x90, 0x99, 0x97, 0x1e, 0x94, 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x2a, 0xa4, 0xcd, 0xc5, - 0x99, 0x58, 0x96, 0x98, 0x99, 0x93, 0x98, 0x94, 0x93, 0x2a, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe1, - 0xc4, 0xfb, 0xea, 0x9e, 0x3c, 0x42, 0x30, 0x08, 0xc1, 0x74, 0x32, 0xb9, 0xf0, 0x50, 0x8e, 0xe1, - 0xc6, 0x43, 0x39, 0x86, 0x0f, 0x0f, 0xe5, 0x18, 0x1b, 0x1e, 0xc9, 0x31, 0xae, 0x78, 0x24, 0xc7, - 0x78, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xbe, 0x78, 0x24, - 0xc7, 0xf0, 0xe1, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, - 0x2c, 0xc7, 0x90, 0xc4, 0x06, 0xb6, 0xd9, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x41, 0x03, - 0x47, 0xbe, 0x00, 0x00, 0x00, -} - -func (this *PingResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*PingResponse) - if !ok { - that2, ok := that.(PingResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Available != that1.Available { - return false - } - return true -} -func (this *PingResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.PingResponse{") - s = append(s, "Available: "+fmt.Sprintf("%#v", this.Available)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringPing(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *PingResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *PingResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *PingResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Available { - i-- - if m.Available { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintPing(dAtA []byte, offset int, v uint64) int { - offset -= sovPing(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *PingResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Available { - n += 2 - } - return n -} - -func sovPing(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozPing(x uint64) (n int) { - return sovPing(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *PingResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&PingResponse{`, - `Available:` + fmt.Sprintf("%v", this.Available) + `,`, - `}`, - }, "") - return s -} -func valueToStringPing(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *PingResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPing - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: PingResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: PingResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Available", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPing - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Available = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipPing(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthPing - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipPing(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPing - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPing - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPing - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthPing - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupPing - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthPing - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthPing = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowPing = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupPing = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/security_group.gogoproto.go b/protomodels/security_group.gogoproto.go deleted file mode 100644 index cd7ee310..00000000 --- a/protomodels/security_group.gogoproto.go +++ /dev/null @@ -1,1282 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: security_group.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type PortRange struct { - Start uint32 `protobuf:"varint,1,opt,name=start,proto3" json:"start"` - End uint32 `protobuf:"varint,2,opt,name=end,proto3" json:"end"` -} - -func (m *PortRange) Reset() { *m = PortRange{} } -func (*PortRange) ProtoMessage() {} -func (*PortRange) Descriptor() ([]byte, []int) { - return fileDescriptor_ff465b8f55f128fd, []int{0} -} -func (m *PortRange) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *PortRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_PortRange.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *PortRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_PortRange.Merge(m, src) -} -func (m *PortRange) XXX_Size() int { - return m.Size() -} -func (m *PortRange) XXX_DiscardUnknown() { - xxx_messageInfo_PortRange.DiscardUnknown(m) -} - -var xxx_messageInfo_PortRange proto.InternalMessageInfo - -func (m *PortRange) GetStart() uint32 { - if m != nil { - return m.Start - } - return 0 -} - -func (m *PortRange) GetEnd() uint32 { - if m != nil { - return m.End - } - return 0 -} - -type ICMPInfo struct { - Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type"` - Code int32 `protobuf:"varint,2,opt,name=code,proto3" json:"code"` -} - -func (m *ICMPInfo) Reset() { *m = ICMPInfo{} } -func (*ICMPInfo) ProtoMessage() {} -func (*ICMPInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ff465b8f55f128fd, []int{1} -} -func (m *ICMPInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ICMPInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ICMPInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ICMPInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_ICMPInfo.Merge(m, src) -} -func (m *ICMPInfo) XXX_Size() int { - return m.Size() -} -func (m *ICMPInfo) XXX_DiscardUnknown() { - xxx_messageInfo_ICMPInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_ICMPInfo proto.InternalMessageInfo - -func (m *ICMPInfo) GetType() int32 { - if m != nil { - return m.Type - } - return 0 -} - -func (m *ICMPInfo) GetCode() int32 { - if m != nil { - return m.Code - } - return 0 -} - -type SecurityGroupRule struct { - Protocol string `protobuf:"bytes,1,opt,name=protocol,proto3" json:"protocol,omitempty"` - Destinations []string `protobuf:"bytes,2,rep,name=destinations,proto3" json:"destinations,omitempty"` - Ports []uint32 `protobuf:"varint,3,rep,name=ports,proto3" json:"ports,omitempty"` - PortRange *PortRange `protobuf:"bytes,4,opt,name=port_range,json=portRange,proto3" json:"port_range,omitempty"` - IcmpInfo *ICMPInfo `protobuf:"bytes,5,opt,name=icmp_info,json=icmpInfo,proto3" json:"icmp_info,omitempty"` - Log bool `protobuf:"varint,6,opt,name=log,proto3" json:"log"` - Annotations []string `protobuf:"bytes,7,rep,name=annotations,proto3" json:"annotations,omitempty"` -} - -func (m *SecurityGroupRule) Reset() { *m = SecurityGroupRule{} } -func (*SecurityGroupRule) ProtoMessage() {} -func (*SecurityGroupRule) Descriptor() ([]byte, []int) { - return fileDescriptor_ff465b8f55f128fd, []int{2} -} -func (m *SecurityGroupRule) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *SecurityGroupRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_SecurityGroupRule.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *SecurityGroupRule) XXX_Merge(src proto.Message) { - xxx_messageInfo_SecurityGroupRule.Merge(m, src) -} -func (m *SecurityGroupRule) XXX_Size() int { - return m.Size() -} -func (m *SecurityGroupRule) XXX_DiscardUnknown() { - xxx_messageInfo_SecurityGroupRule.DiscardUnknown(m) -} - -var xxx_messageInfo_SecurityGroupRule proto.InternalMessageInfo - -func (m *SecurityGroupRule) GetProtocol() string { - if m != nil { - return m.Protocol - } - return "" -} - -func (m *SecurityGroupRule) GetDestinations() []string { - if m != nil { - return m.Destinations - } - return nil -} - -func (m *SecurityGroupRule) GetPorts() []uint32 { - if m != nil { - return m.Ports - } - return nil -} - -func (m *SecurityGroupRule) GetPortRange() *PortRange { - if m != nil { - return m.PortRange - } - return nil -} - -func (m *SecurityGroupRule) GetIcmpInfo() *ICMPInfo { - if m != nil { - return m.IcmpInfo - } - return nil -} - -func (m *SecurityGroupRule) GetLog() bool { - if m != nil { - return m.Log - } - return false -} - -func (m *SecurityGroupRule) GetAnnotations() []string { - if m != nil { - return m.Annotations - } - return nil -} - -func init() { - proto.RegisterType((*PortRange)(nil), "models.PortRange") - proto.RegisterType((*ICMPInfo)(nil), "models.ICMPInfo") - proto.RegisterType((*SecurityGroupRule)(nil), "models.SecurityGroupRule") -} - -func init() { proto.RegisterFile("security_group.proto", fileDescriptor_ff465b8f55f128fd) } - -var fileDescriptor_ff465b8f55f128fd = []byte{ - // 402 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xb1, 0x6e, 0xdb, 0x30, - 0x10, 0x86, 0x45, 0x2b, 0x76, 0x24, 0xa6, 0x01, 0x12, 0xa2, 0x03, 0x13, 0x14, 0x94, 0xa0, 0x49, - 0x4b, 0x94, 0xa2, 0xed, 0x13, 0xa8, 0x40, 0x83, 0x0c, 0x05, 0x02, 0xf6, 0x01, 0x0c, 0x59, 0xa2, - 0x55, 0x01, 0x32, 0x4f, 0x90, 0xa8, 0x21, 0x5b, 0xf7, 0x2e, 0x7d, 0x8c, 0x3e, 0x4a, 0x47, 0x8f, - 0x99, 0x8c, 0x5a, 0x5e, 0x0a, 0x4f, 0x79, 0x84, 0x82, 0x27, 0xc7, 0x68, 0x97, 0x13, 0xff, 0xff, - 0xd7, 0x1d, 0xee, 0x3e, 0xfa, 0xba, 0x53, 0x79, 0xdf, 0x56, 0xe6, 0x71, 0x5e, 0xb6, 0xd0, 0x37, - 0x49, 0xd3, 0x82, 0x01, 0x36, 0x5b, 0x41, 0xa1, 0xea, 0xee, 0xfa, 0xa6, 0xac, 0xcc, 0xd7, 0x7e, - 0x91, 0xe4, 0xb0, 0xba, 0x2d, 0xa1, 0x84, 0x5b, 0x8c, 0x17, 0xfd, 0x12, 0x15, 0x0a, 0x7c, 0x8d, - 0x6d, 0xd1, 0x1d, 0xf5, 0x1f, 0xa0, 0x35, 0x32, 0xd3, 0xa5, 0x62, 0x01, 0x9d, 0x76, 0x26, 0x6b, - 0x0d, 0x27, 0x21, 0x89, 0xcf, 0x53, 0x7f, 0xbf, 0x09, 0x46, 0x43, 0x8e, 0x1f, 0x76, 0x45, 0x5d, - 0xa5, 0x0b, 0x3e, 0xc1, 0xf8, 0x74, 0xbf, 0x09, 0xac, 0x94, 0xb6, 0x44, 0x9f, 0xa8, 0x77, 0xff, - 0xf1, 0xf3, 0xc3, 0xbd, 0x5e, 0x02, 0x7b, 0x43, 0x4f, 0xcc, 0x63, 0xa3, 0x70, 0xcc, 0x34, 0xf5, - 0xf6, 0x9b, 0x00, 0xb5, 0xc4, 0x6a, 0xd3, 0x1c, 0x0a, 0x85, 0x53, 0x0e, 0xa9, 0xd5, 0x12, 0x6b, - 0xf4, 0x7d, 0x42, 0x2f, 0xbf, 0x1c, 0x0e, 0xbc, 0xb3, 0xf7, 0xc9, 0xbe, 0x56, 0xec, 0x9a, 0x7a, - 0xb8, 0x6f, 0x0e, 0x35, 0x4e, 0xf5, 0xe5, 0x51, 0xb3, 0x88, 0xbe, 0x2a, 0x54, 0x67, 0x2a, 0x9d, - 0x99, 0x0a, 0x74, 0xc7, 0x27, 0xa1, 0x1b, 0xfb, 0xf2, 0x3f, 0x8f, 0x71, 0x3a, 0x6d, 0xa0, 0x35, - 0x1d, 0x77, 0x43, 0x37, 0x3e, 0x4f, 0x27, 0x17, 0x8e, 0x1c, 0x0d, 0xf6, 0x96, 0x52, 0xfb, 0x98, - 0xb7, 0x96, 0x00, 0x3f, 0x09, 0x49, 0x7c, 0xf6, 0xee, 0x32, 0x19, 0x61, 0x26, 0x47, 0x34, 0xd2, - 0x6f, 0x8e, 0x94, 0x6e, 0xa8, 0x5f, 0xe5, 0xab, 0x66, 0x5e, 0xe9, 0x25, 0xf0, 0x29, 0x36, 0x5c, - 0xbc, 0x34, 0xbc, 0x20, 0x90, 0x9e, 0xfd, 0x05, 0x61, 0x5c, 0x51, 0xb7, 0x86, 0x92, 0xcf, 0x42, - 0x12, 0x7b, 0x23, 0xb3, 0x1a, 0x4a, 0x69, 0x0b, 0x0b, 0xe9, 0x59, 0xa6, 0x35, 0x98, 0xc3, 0xe2, - 0xa7, 0xb8, 0xf8, 0xbf, 0x56, 0xfa, 0x61, 0xbd, 0x15, 0xce, 0xd3, 0x56, 0x38, 0xcf, 0x5b, 0x41, - 0xbe, 0x0d, 0x82, 0xfc, 0x1c, 0x04, 0xf9, 0x35, 0x08, 0xb2, 0x1e, 0x04, 0xf9, 0x3d, 0x08, 0xf2, - 0x67, 0x10, 0xce, 0xf3, 0x20, 0xc8, 0x8f, 0x9d, 0x70, 0xd6, 0x3b, 0xe1, 0x3c, 0xed, 0x84, 0xb3, - 0x98, 0x21, 0x9b, 0xf7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xd0, 0x92, 0x85, 0x2a, 0x02, - 0x00, 0x00, -} - -func (this *PortRange) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*PortRange) - if !ok { - that2, ok := that.(PortRange) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Start != that1.Start { - return false - } - if this.End != that1.End { - return false - } - return true -} -func (this *ICMPInfo) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ICMPInfo) - if !ok { - that2, ok := that.(ICMPInfo) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Type != that1.Type { - return false - } - if this.Code != that1.Code { - return false - } - return true -} -func (this *SecurityGroupRule) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*SecurityGroupRule) - if !ok { - that2, ok := that.(SecurityGroupRule) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Protocol != that1.Protocol { - return false - } - if len(this.Destinations) != len(that1.Destinations) { - return false - } - for i := range this.Destinations { - if this.Destinations[i] != that1.Destinations[i] { - return false - } - } - if len(this.Ports) != len(that1.Ports) { - return false - } - for i := range this.Ports { - if this.Ports[i] != that1.Ports[i] { - return false - } - } - if !this.PortRange.Equal(that1.PortRange) { - return false - } - if !this.IcmpInfo.Equal(that1.IcmpInfo) { - return false - } - if this.Log != that1.Log { - return false - } - if len(this.Annotations) != len(that1.Annotations) { - return false - } - for i := range this.Annotations { - if this.Annotations[i] != that1.Annotations[i] { - return false - } - } - return true -} -func (this *PortRange) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.PortRange{") - s = append(s, "Start: "+fmt.Sprintf("%#v", this.Start)+",\n") - s = append(s, "End: "+fmt.Sprintf("%#v", this.End)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ICMPInfo) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.ICMPInfo{") - s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n") - s = append(s, "Code: "+fmt.Sprintf("%#v", this.Code)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *SecurityGroupRule) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 11) - s = append(s, "&models.SecurityGroupRule{") - s = append(s, "Protocol: "+fmt.Sprintf("%#v", this.Protocol)+",\n") - s = append(s, "Destinations: "+fmt.Sprintf("%#v", this.Destinations)+",\n") - s = append(s, "Ports: "+fmt.Sprintf("%#v", this.Ports)+",\n") - if this.PortRange != nil { - s = append(s, "PortRange: "+fmt.Sprintf("%#v", this.PortRange)+",\n") - } - if this.IcmpInfo != nil { - s = append(s, "IcmpInfo: "+fmt.Sprintf("%#v", this.IcmpInfo)+",\n") - } - s = append(s, "Log: "+fmt.Sprintf("%#v", this.Log)+",\n") - s = append(s, "Annotations: "+fmt.Sprintf("%#v", this.Annotations)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringSecurityGroup(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *PortRange) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *PortRange) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *PortRange) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.End != 0 { - i = encodeVarintSecurityGroup(dAtA, i, uint64(m.End)) - i-- - dAtA[i] = 0x10 - } - if m.Start != 0 { - i = encodeVarintSecurityGroup(dAtA, i, uint64(m.Start)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *ICMPInfo) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ICMPInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ICMPInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Code != 0 { - i = encodeVarintSecurityGroup(dAtA, i, uint64(m.Code)) - i-- - dAtA[i] = 0x10 - } - if m.Type != 0 { - i = encodeVarintSecurityGroup(dAtA, i, uint64(m.Type)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *SecurityGroupRule) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *SecurityGroupRule) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SecurityGroupRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Annotations) > 0 { - for iNdEx := len(m.Annotations) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Annotations[iNdEx]) - copy(dAtA[i:], m.Annotations[iNdEx]) - i = encodeVarintSecurityGroup(dAtA, i, uint64(len(m.Annotations[iNdEx]))) - i-- - dAtA[i] = 0x3a - } - } - if m.Log { - i-- - if m.Log { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - } - if m.IcmpInfo != nil { - { - size, err := m.IcmpInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintSecurityGroup(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if m.PortRange != nil { - { - size, err := m.PortRange.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintSecurityGroup(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if len(m.Ports) > 0 { - for iNdEx := len(m.Ports) - 1; iNdEx >= 0; iNdEx-- { - i = encodeVarintSecurityGroup(dAtA, i, uint64(m.Ports[iNdEx])) - i-- - dAtA[i] = 0x18 - } - } - if len(m.Destinations) > 0 { - for iNdEx := len(m.Destinations) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Destinations[iNdEx]) - copy(dAtA[i:], m.Destinations[iNdEx]) - i = encodeVarintSecurityGroup(dAtA, i, uint64(len(m.Destinations[iNdEx]))) - i-- - dAtA[i] = 0x12 - } - } - if len(m.Protocol) > 0 { - i -= len(m.Protocol) - copy(dAtA[i:], m.Protocol) - i = encodeVarintSecurityGroup(dAtA, i, uint64(len(m.Protocol))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintSecurityGroup(dAtA []byte, offset int, v uint64) int { - offset -= sovSecurityGroup(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *PortRange) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Start != 0 { - n += 1 + sovSecurityGroup(uint64(m.Start)) - } - if m.End != 0 { - n += 1 + sovSecurityGroup(uint64(m.End)) - } - return n -} - -func (m *ICMPInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Type != 0 { - n += 1 + sovSecurityGroup(uint64(m.Type)) - } - if m.Code != 0 { - n += 1 + sovSecurityGroup(uint64(m.Code)) - } - return n -} - -func (m *SecurityGroupRule) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Protocol) - if l > 0 { - n += 1 + l + sovSecurityGroup(uint64(l)) - } - if len(m.Destinations) > 0 { - for _, s := range m.Destinations { - l = len(s) - n += 1 + l + sovSecurityGroup(uint64(l)) - } - } - if len(m.Ports) > 0 { - for _, e := range m.Ports { - n += 1 + sovSecurityGroup(uint64(e)) - } - } - if m.PortRange != nil { - l = m.PortRange.Size() - n += 1 + l + sovSecurityGroup(uint64(l)) - } - if m.IcmpInfo != nil { - l = m.IcmpInfo.Size() - n += 1 + l + sovSecurityGroup(uint64(l)) - } - if m.Log { - n += 2 - } - if len(m.Annotations) > 0 { - for _, s := range m.Annotations { - l = len(s) - n += 1 + l + sovSecurityGroup(uint64(l)) - } - } - return n -} - -func sovSecurityGroup(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozSecurityGroup(x uint64) (n int) { - return sovSecurityGroup(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *PortRange) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&PortRange{`, - `Start:` + fmt.Sprintf("%v", this.Start) + `,`, - `End:` + fmt.Sprintf("%v", this.End) + `,`, - `}`, - }, "") - return s -} -func (this *ICMPInfo) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ICMPInfo{`, - `Type:` + fmt.Sprintf("%v", this.Type) + `,`, - `Code:` + fmt.Sprintf("%v", this.Code) + `,`, - `}`, - }, "") - return s -} -func (this *SecurityGroupRule) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&SecurityGroupRule{`, - `Protocol:` + fmt.Sprintf("%v", this.Protocol) + `,`, - `Destinations:` + fmt.Sprintf("%v", this.Destinations) + `,`, - `Ports:` + fmt.Sprintf("%v", this.Ports) + `,`, - `PortRange:` + strings.Replace(this.PortRange.String(), "PortRange", "PortRange", 1) + `,`, - `IcmpInfo:` + strings.Replace(this.IcmpInfo.String(), "ICMPInfo", "ICMPInfo", 1) + `,`, - `Log:` + fmt.Sprintf("%v", this.Log) + `,`, - `Annotations:` + fmt.Sprintf("%v", this.Annotations) + `,`, - `}`, - }, "") - return s -} -func valueToStringSecurityGroup(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *PortRange) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: PortRange: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: PortRange: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Start", wireType) - } - m.Start = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Start |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field End", wireType) - } - m.End = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.End |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipSecurityGroup(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSecurityGroup - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ICMPInfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ICMPInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ICMPInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - m.Type = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Type |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) - } - m.Code = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Code |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipSecurityGroup(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSecurityGroup - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *SecurityGroupRule) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: SecurityGroupRule: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SecurityGroupRule: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Protocol", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSecurityGroup - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSecurityGroup - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Protocol = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Destinations", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSecurityGroup - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSecurityGroup - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Destinations = append(m.Destinations, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 3: - if wireType == 0 { - var v uint32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Ports = append(m.Ports, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthSecurityGroup - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthSecurityGroup - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - var count int - for _, integer := range dAtA[iNdEx:postIndex] { - if integer < 128 { - count++ - } - } - elementCount = count - if elementCount != 0 && len(m.Ports) == 0 { - m.Ports = make([]uint32, 0, elementCount) - } - for iNdEx < postIndex { - var v uint32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Ports = append(m.Ports, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field Ports", wireType) - } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PortRange", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSecurityGroup - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSecurityGroup - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.PortRange == nil { - m.PortRange = &PortRange{} - } - if err := m.PortRange.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IcmpInfo", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSecurityGroup - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSecurityGroup - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.IcmpInfo == nil { - m.IcmpInfo = &ICMPInfo{} - } - if err := m.IcmpInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Log", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Log = bool(v != 0) - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Annotations", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSecurityGroup - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSecurityGroup - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Annotations = append(m.Annotations, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipSecurityGroup(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSecurityGroup - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipSecurityGroup(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSecurityGroup - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthSecurityGroup - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupSecurityGroup - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthSecurityGroup - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthSecurityGroup = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowSecurityGroup = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupSecurityGroup = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/sidecar.gogoproto.go b/protomodels/sidecar.gogoproto.go deleted file mode 100644 index e7b39886..00000000 --- a/protomodels/sidecar.gogoproto.go +++ /dev/null @@ -1,472 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sidecar.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Sidecar struct { - Action *Action `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,json=diskMb,proto3" json:"disk_mb"` - MemoryMb int32 `protobuf:"varint,3,opt,name=memory_mb,json=memoryMb,proto3" json:"memory_mb"` -} - -func (m *Sidecar) Reset() { *m = Sidecar{} } -func (*Sidecar) ProtoMessage() {} -func (*Sidecar) Descriptor() ([]byte, []int) { - return fileDescriptor_179ad3b13e6397ec, []int{0} -} -func (m *Sidecar) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Sidecar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Sidecar.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Sidecar) XXX_Merge(src proto.Message) { - xxx_messageInfo_Sidecar.Merge(m, src) -} -func (m *Sidecar) XXX_Size() int { - return m.Size() -} -func (m *Sidecar) XXX_DiscardUnknown() { - xxx_messageInfo_Sidecar.DiscardUnknown(m) -} - -var xxx_messageInfo_Sidecar proto.InternalMessageInfo - -func (m *Sidecar) GetAction() *Action { - if m != nil { - return m.Action - } - return nil -} - -func (m *Sidecar) GetDiskMb() int32 { - if m != nil { - return m.DiskMb - } - return 0 -} - -func (m *Sidecar) GetMemoryMb() int32 { - if m != nil { - return m.MemoryMb - } - return 0 -} - -func init() { - proto.RegisterType((*Sidecar)(nil), "models.Sidecar") -} - -func init() { proto.RegisterFile("sidecar.proto", fileDescriptor_179ad3b13e6397ec) } - -var fileDescriptor_179ad3b13e6397ec = []byte{ - // 239 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2d, 0xce, 0x4c, 0x49, - 0x4d, 0x4e, 0x2c, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, - 0x29, 0x96, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, - 0x4f, 0xcf, 0xd7, 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0x26, - 0xc5, 0x9b, 0x98, 0x5c, 0x92, 0x99, 0x9f, 0x57, 0x0c, 0xe1, 0x2a, 0x35, 0x33, 0x72, 0xb1, 0x07, - 0x43, 0xcc, 0x15, 0x52, 0xe3, 0x62, 0x83, 0x48, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0xf1, - 0xe9, 0x41, 0xac, 0xd0, 0x73, 0x04, 0x8b, 0x06, 0x41, 0x65, 0x85, 0x54, 0xb8, 0xd8, 0x53, 0x32, - 0x8b, 0xb3, 0xe3, 0x73, 0x93, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x9d, 0xb8, 0x5f, 0xdd, 0x93, - 0x87, 0x09, 0x05, 0xb1, 0x81, 0x18, 0xbe, 0x49, 0x42, 0x5a, 0x5c, 0x9c, 0xb9, 0xa9, 0xb9, 0xf9, - 0x45, 0x95, 0x20, 0x75, 0xcc, 0x60, 0x75, 0xbc, 0xaf, 0xee, 0xc9, 0x23, 0x04, 0x83, 0x38, 0x20, - 0x4c, 0xdf, 0x24, 0x27, 0x93, 0x0b, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63, 0xf8, 0xf0, 0x50, - 0x8e, 0xb1, 0xe1, 0x91, 0x1c, 0xe3, 0x8a, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, - 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8b, 0x47, 0x72, 0x0c, 0x1f, 0x1e, 0xc9, 0x31, 0x4e, - 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x49, 0x6c, 0x60, 0x2f, - 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x28, 0x34, 0x4f, 0x19, 0x01, 0x00, 0x00, -} - -func (this *Sidecar) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Sidecar) - if !ok { - that2, ok := that.(Sidecar) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Action.Equal(that1.Action) { - return false - } - if this.DiskMb != that1.DiskMb { - return false - } - if this.MemoryMb != that1.MemoryMb { - return false - } - return true -} -func (this *Sidecar) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.Sidecar{") - if this.Action != nil { - s = append(s, "Action: "+fmt.Sprintf("%#v", this.Action)+",\n") - } - s = append(s, "DiskMb: "+fmt.Sprintf("%#v", this.DiskMb)+",\n") - s = append(s, "MemoryMb: "+fmt.Sprintf("%#v", this.MemoryMb)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringSidecar(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *Sidecar) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Sidecar) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Sidecar) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.MemoryMb != 0 { - i = encodeVarintSidecar(dAtA, i, uint64(m.MemoryMb)) - i-- - dAtA[i] = 0x18 - } - if m.DiskMb != 0 { - i = encodeVarintSidecar(dAtA, i, uint64(m.DiskMb)) - i-- - dAtA[i] = 0x10 - } - if m.Action != nil { - { - size, err := m.Action.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintSidecar(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintSidecar(dAtA []byte, offset int, v uint64) int { - offset -= sovSidecar(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Sidecar) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Action != nil { - l = m.Action.Size() - n += 1 + l + sovSidecar(uint64(l)) - } - if m.DiskMb != 0 { - n += 1 + sovSidecar(uint64(m.DiskMb)) - } - if m.MemoryMb != 0 { - n += 1 + sovSidecar(uint64(m.MemoryMb)) - } - return n -} - -func sovSidecar(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozSidecar(x uint64) (n int) { - return sovSidecar(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *Sidecar) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Sidecar{`, - `Action:` + strings.Replace(fmt.Sprintf("%v", this.Action), "Action", "Action", 1) + `,`, - `DiskMb:` + fmt.Sprintf("%v", this.DiskMb) + `,`, - `MemoryMb:` + fmt.Sprintf("%v", this.MemoryMb) + `,`, - `}`, - }, "") - return s -} -func valueToStringSidecar(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *Sidecar) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSidecar - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Sidecar: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Sidecar: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSidecar - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSidecar - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSidecar - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Action == nil { - m.Action = &Action{} - } - if err := m.Action.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DiskMb", wireType) - } - m.DiskMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSidecar - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DiskMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MemoryMb", wireType) - } - m.MemoryMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSidecar - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MemoryMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipSidecar(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSidecar - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipSidecar(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSidecar - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSidecar - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSidecar - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthSidecar - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupSidecar - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthSidecar - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthSidecar = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowSidecar = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupSidecar = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/task.gogoproto.go b/protomodels/task.gogoproto.go deleted file mode 100644 index 11fd879d..00000000 --- a/protomodels/task.gogoproto.go +++ /dev/null @@ -1,3018 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: task.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strconv "strconv" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type Task_State int32 - -const ( - Task_Invalid Task_State = 0 - Task_Pending Task_State = 1 - Task_Running Task_State = 2 - Task_Completed Task_State = 3 - Task_Resolving Task_State = 4 -) - -var Task_State_name = map[int32]string{ - 0: "Invalid", - 1: "Pending", - 2: "Running", - 3: "Completed", - 4: "Resolving", -} - -var Task_State_value = map[string]int32{ - "Invalid": 0, - "Pending": 1, - "Running": 2, - "Completed": 3, - "Resolving": 4, -} - -func (Task_State) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_ce5d8dd45b4a91ff, []int{1, 0} -} - -type TaskDefinition struct { - RootFs string `protobuf:"bytes,1,opt,name=root_fs,json=rootFs,proto3" json:"rootfs"` - EnvironmentVariables []*EnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=environmentVariables,proto3" json:"env,omitempty"` - Action *Action `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"` - DiskMb int32 `protobuf:"varint,4,opt,name=disk_mb,json=diskMb,proto3" json:"disk_mb"` - MemoryMb int32 `protobuf:"varint,5,opt,name=memory_mb,json=memoryMb,proto3" json:"memory_mb"` - CpuWeight uint32 `protobuf:"varint,6,opt,name=cpu_weight,json=cpuWeight,proto3" json:"cpu_weight"` - Privileged bool `protobuf:"varint,7,opt,name=privileged,proto3" json:"privileged"` - LogSource string `protobuf:"bytes,8,opt,name=log_source,json=logSource,proto3" json:"log_source"` - LogGuid string `protobuf:"bytes,9,opt,name=log_guid,json=logGuid,proto3" json:"log_guid"` - MetricsGuid string `protobuf:"bytes,10,opt,name=metrics_guid,json=metricsGuid,proto3" json:"metrics_guid"` - ResultFile string `protobuf:"bytes,11,opt,name=result_file,json=resultFile,proto3" json:"result_file"` - CompletionCallbackUrl string `protobuf:"bytes,12,opt,name=completion_callback_url,json=completionCallbackUrl,proto3" json:"completion_callback_url,omitempty"` - Annotation string `protobuf:"bytes,13,opt,name=annotation,proto3" json:"annotation,omitempty"` - EgressRules []*SecurityGroupRule `protobuf:"bytes,14,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` - CachedDependencies []*CachedDependency `protobuf:"bytes,15,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` - LegacyDownloadUser string `protobuf:"bytes,16,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` // Deprecated: Do not use. - TrustedSystemCertificatesPath string `protobuf:"bytes,17,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*VolumeMount `protobuf:"bytes,18,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` - Network *Network `protobuf:"bytes,19,opt,name=network,proto3" json:"network,omitempty"` - PlacementTags []string `protobuf:"bytes,20,rep,name=placement_tags,json=placementTags,proto3" json:"placement_tags,omitempty"` - MaxPids int32 `protobuf:"varint,21,opt,name=max_pids,json=maxPids,proto3" json:"max_pids"` - CertificateProperties *CertificateProperties `protobuf:"bytes,22,opt,name=certificate_properties,json=certificateProperties,proto3" json:"certificate_properties,omitempty"` - ImageUsername string `protobuf:"bytes,23,opt,name=image_username,json=imageUsername,proto3" json:"image_username"` - ImagePassword string `protobuf:"bytes,24,opt,name=image_password,json=imagePassword,proto3" json:"image_password"` - ImageLayers []*ImageLayer `protobuf:"bytes,25,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` - LogRateLimit *LogRateLimit `protobuf:"bytes,26,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` - MetricTags map[string]*MetricTagValue `protobuf:"bytes,27,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` -} - -func (m *TaskDefinition) Reset() { *m = TaskDefinition{} } -func (*TaskDefinition) ProtoMessage() {} -func (*TaskDefinition) Descriptor() ([]byte, []int) { - return fileDescriptor_ce5d8dd45b4a91ff, []int{0} -} -func (m *TaskDefinition) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskDefinition.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskDefinition) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskDefinition.Merge(m, src) -} -func (m *TaskDefinition) XXX_Size() int { - return m.Size() -} -func (m *TaskDefinition) XXX_DiscardUnknown() { - xxx_messageInfo_TaskDefinition.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskDefinition proto.InternalMessageInfo - -func (m *TaskDefinition) GetRootFs() string { - if m != nil { - return m.RootFs - } - return "" -} - -func (m *TaskDefinition) GetEnvironmentVariables() []*EnvironmentVariable { - if m != nil { - return m.EnvironmentVariables - } - return nil -} - -func (m *TaskDefinition) GetAction() *Action { - if m != nil { - return m.Action - } - return nil -} - -func (m *TaskDefinition) GetDiskMb() int32 { - if m != nil { - return m.DiskMb - } - return 0 -} - -func (m *TaskDefinition) GetMemoryMb() int32 { - if m != nil { - return m.MemoryMb - } - return 0 -} - -func (m *TaskDefinition) GetCpuWeight() uint32 { - if m != nil { - return m.CpuWeight - } - return 0 -} - -func (m *TaskDefinition) GetPrivileged() bool { - if m != nil { - return m.Privileged - } - return false -} - -func (m *TaskDefinition) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *TaskDefinition) GetLogGuid() string { - if m != nil { - return m.LogGuid - } - return "" -} - -func (m *TaskDefinition) GetMetricsGuid() string { - if m != nil { - return m.MetricsGuid - } - return "" -} - -func (m *TaskDefinition) GetResultFile() string { - if m != nil { - return m.ResultFile - } - return "" -} - -func (m *TaskDefinition) GetCompletionCallbackUrl() string { - if m != nil { - return m.CompletionCallbackUrl - } - return "" -} - -func (m *TaskDefinition) GetAnnotation() string { - if m != nil { - return m.Annotation - } - return "" -} - -func (m *TaskDefinition) GetEgressRules() []*SecurityGroupRule { - if m != nil { - return m.EgressRules - } - return nil -} - -func (m *TaskDefinition) GetCachedDependencies() []*CachedDependency { - if m != nil { - return m.CachedDependencies - } - return nil -} - -// Deprecated: Do not use. -func (m *TaskDefinition) GetLegacyDownloadUser() string { - if m != nil { - return m.LegacyDownloadUser - } - return "" -} - -func (m *TaskDefinition) GetTrustedSystemCertificatesPath() string { - if m != nil { - return m.TrustedSystemCertificatesPath - } - return "" -} - -func (m *TaskDefinition) GetVolumeMounts() []*VolumeMount { - if m != nil { - return m.VolumeMounts - } - return nil -} - -func (m *TaskDefinition) GetNetwork() *Network { - if m != nil { - return m.Network - } - return nil -} - -func (m *TaskDefinition) GetPlacementTags() []string { - if m != nil { - return m.PlacementTags - } - return nil -} - -func (m *TaskDefinition) GetMaxPids() int32 { - if m != nil { - return m.MaxPids - } - return 0 -} - -func (m *TaskDefinition) GetCertificateProperties() *CertificateProperties { - if m != nil { - return m.CertificateProperties - } - return nil -} - -func (m *TaskDefinition) GetImageUsername() string { - if m != nil { - return m.ImageUsername - } - return "" -} - -func (m *TaskDefinition) GetImagePassword() string { - if m != nil { - return m.ImagePassword - } - return "" -} - -func (m *TaskDefinition) GetImageLayers() []*ImageLayer { - if m != nil { - return m.ImageLayers - } - return nil -} - -func (m *TaskDefinition) GetLogRateLimit() *LogRateLimit { - if m != nil { - return m.LogRateLimit - } - return nil -} - -func (m *TaskDefinition) GetMetricTags() map[string]*MetricTagValue { - if m != nil { - return m.MetricTags - } - return nil -} - -type Task struct { - *TaskDefinition `protobuf:"bytes,1,opt,name=task_definition,json=taskDefinition,proto3,embedded=task_definition" json:""` - TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` - Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain"` - CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt,proto3" json:"created_at"` - UpdatedAt int64 `protobuf:"varint,5,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at"` - FirstCompletedAt int64 `protobuf:"varint,6,opt,name=first_completed_at,json=firstCompletedAt,proto3" json:"first_completed_at"` - State Task_State `protobuf:"varint,7,opt,name=state,proto3,enum=models.Task_State" json:"state"` - CellId string `protobuf:"bytes,8,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` - Result string `protobuf:"bytes,9,opt,name=result,proto3" json:"result"` - Failed bool `protobuf:"varint,10,opt,name=failed,proto3" json:"failed"` - FailureReason string `protobuf:"bytes,11,opt,name=failure_reason,json=failureReason,proto3" json:"failure_reason"` - RejectionCount int32 `protobuf:"varint,12,opt,name=rejection_count,json=rejectionCount,proto3" json:"rejection_count"` - RejectionReason string `protobuf:"bytes,13,opt,name=rejection_reason,json=rejectionReason,proto3" json:"rejection_reason"` -} - -func (m *Task) Reset() { *m = Task{} } -func (*Task) ProtoMessage() {} -func (*Task) Descriptor() ([]byte, []int) { - return fileDescriptor_ce5d8dd45b4a91ff, []int{1} -} -func (m *Task) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Task.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Task) XXX_Merge(src proto.Message) { - xxx_messageInfo_Task.Merge(m, src) -} -func (m *Task) XXX_Size() int { - return m.Size() -} -func (m *Task) XXX_DiscardUnknown() { - xxx_messageInfo_Task.DiscardUnknown(m) -} - -var xxx_messageInfo_Task proto.InternalMessageInfo - -func (m *Task) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -func (m *Task) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *Task) GetCreatedAt() int64 { - if m != nil { - return m.CreatedAt - } - return 0 -} - -func (m *Task) GetUpdatedAt() int64 { - if m != nil { - return m.UpdatedAt - } - return 0 -} - -func (m *Task) GetFirstCompletedAt() int64 { - if m != nil { - return m.FirstCompletedAt - } - return 0 -} - -func (m *Task) GetState() Task_State { - if m != nil { - return m.State - } - return Task_Invalid -} - -func (m *Task) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -func (m *Task) GetResult() string { - if m != nil { - return m.Result - } - return "" -} - -func (m *Task) GetFailed() bool { - if m != nil { - return m.Failed - } - return false -} - -func (m *Task) GetFailureReason() string { - if m != nil { - return m.FailureReason - } - return "" -} - -func (m *Task) GetRejectionCount() int32 { - if m != nil { - return m.RejectionCount - } - return 0 -} - -func (m *Task) GetRejectionReason() string { - if m != nil { - return m.RejectionReason - } - return "" -} - -func init() { - proto.RegisterEnum("models.Task_State", Task_State_name, Task_State_value) - proto.RegisterType((*TaskDefinition)(nil), "models.TaskDefinition") - proto.RegisterMapType((map[string]*MetricTagValue)(nil), "models.TaskDefinition.MetricTagsEntry") - proto.RegisterType((*Task)(nil), "models.Task") -} - -func init() { proto.RegisterFile("task.proto", fileDescriptor_ce5d8dd45b4a91ff) } - -var fileDescriptor_ce5d8dd45b4a91ff = []byte{ - // 1351 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x56, 0xcd, 0x6e, 0xdb, 0xc6, - 0x16, 0x36, 0xed, 0x48, 0xb6, 0x46, 0x3f, 0x96, 0xc7, 0x3f, 0x61, 0x9c, 0x1b, 0x51, 0xf0, 0xbd, - 0x37, 0x75, 0x83, 0xc4, 0x29, 0x92, 0xb4, 0x48, 0x83, 0x00, 0x85, 0x65, 0x27, 0x86, 0x01, 0xbb, - 0x30, 0xc6, 0x71, 0xba, 0x24, 0x46, 0xe4, 0x88, 0x9e, 0x9a, 0xe4, 0x10, 0x33, 0x43, 0x39, 0xda, - 0xf5, 0x11, 0xfa, 0x14, 0x45, 0x1f, 0xa5, 0x4b, 0x2f, 0xb3, 0x22, 0x1a, 0x67, 0x53, 0x68, 0x95, - 0x47, 0x28, 0x66, 0x38, 0xa4, 0x24, 0xc7, 0x2b, 0x9d, 0xf3, 0x7d, 0xdf, 0x99, 0x9f, 0x33, 0x3c, - 0xe7, 0x08, 0x00, 0x89, 0xc5, 0xc5, 0x4e, 0xc2, 0x99, 0x64, 0xb0, 0x1a, 0x31, 0x9f, 0x84, 0x62, - 0xf3, 0x49, 0x40, 0xe5, 0x79, 0xda, 0xdf, 0xf1, 0x58, 0xf4, 0x34, 0x60, 0x01, 0x7b, 0xaa, 0xe9, - 0x7e, 0x3a, 0xd0, 0x9e, 0x76, 0xb4, 0x95, 0x87, 0x6d, 0x36, 0xb1, 0x27, 0x29, 0x8b, 0x85, 0x71, - 0xef, 0x93, 0x78, 0x48, 0x39, 0x8b, 0x23, 0x12, 0x4b, 0x77, 0x88, 0x39, 0xc5, 0xfd, 0x90, 0x14, - 0xe4, 0x9a, 0x20, 0x5e, 0xca, 0xa9, 0x1c, 0xb9, 0x01, 0x67, 0x69, 0x62, 0xd0, 0xbb, 0x1e, 0xf6, - 0xce, 0x89, 0xef, 0xfa, 0x24, 0x21, 0xb1, 0x4f, 0x62, 0x6f, 0x64, 0x08, 0x38, 0x64, 0x61, 0x1a, - 0x11, 0x37, 0x62, 0x69, 0x2c, 0x8b, 0xed, 0x62, 0x22, 0x2f, 0x19, 0x37, 0x87, 0xde, 0xfc, 0x8f, - 0x47, 0xb8, 0xa4, 0x03, 0xea, 0x61, 0x49, 0xdc, 0x84, 0xb3, 0x44, 0xb9, 0xe5, 0x7e, 0x2b, 0x34, - 0xc2, 0x01, 0x71, 0x43, 0x3c, 0x22, 0xbc, 0x38, 0x42, 0xc8, 0x02, 0x97, 0x2b, 0x75, 0x48, 0x23, - 0x5a, 0xac, 0xba, 0x12, 0x11, 0xc9, 0xa9, 0xe7, 0x4a, 0x1c, 0x98, 0xd8, 0xad, 0x3f, 0x1a, 0xa0, - 0xf5, 0x0e, 0x8b, 0x8b, 0x7d, 0x32, 0xa0, 0x31, 0x55, 0x57, 0x84, 0xff, 0x05, 0x8b, 0x9c, 0x31, - 0xe9, 0x0e, 0x84, 0x6d, 0x75, 0xad, 0xed, 0x5a, 0x0f, 0x8c, 0x33, 0xa7, 0xaa, 0xa0, 0x81, 0x40, - 0xfa, 0xf7, 0xad, 0x80, 0x1e, 0x58, 0xbf, 0x35, 0x05, 0xf6, 0x7c, 0x77, 0x61, 0xbb, 0xfe, 0xec, - 0xfe, 0x4e, 0x9e, 0xe6, 0x9d, 0x37, 0x13, 0xd1, 0x7b, 0xa3, 0xe9, 0xad, 0x8c, 0x33, 0xa7, 0x49, - 0xe2, 0xe1, 0x63, 0x16, 0x51, 0x49, 0xa2, 0x44, 0x8e, 0xd0, 0x1a, 0xf9, 0x5a, 0x27, 0xe0, 0x43, - 0x50, 0xcd, 0xd3, 0x6e, 0x2f, 0x74, 0xad, 0xed, 0xfa, 0xb3, 0x56, 0xb1, 0xea, 0xae, 0x46, 0x91, - 0x61, 0xe1, 0xff, 0xc0, 0xa2, 0x4f, 0xc5, 0x85, 0x1b, 0xf5, 0xed, 0x3b, 0x5d, 0x6b, 0xbb, 0xd2, - 0xab, 0x8f, 0x33, 0xa7, 0x80, 0x50, 0x55, 0x19, 0xc7, 0x7d, 0xf8, 0x08, 0xd4, 0x22, 0x12, 0x31, - 0x3e, 0x52, 0xba, 0x8a, 0xd6, 0x35, 0xc7, 0x99, 0x33, 0x01, 0xd1, 0x52, 0x6e, 0x1e, 0xf7, 0xe1, - 0x13, 0x00, 0xbc, 0x24, 0x75, 0x2f, 0x09, 0x0d, 0xce, 0xa5, 0x5d, 0xed, 0x5a, 0xdb, 0xcd, 0x5e, - 0x6b, 0x9c, 0x39, 0x53, 0x28, 0xaa, 0x79, 0x49, 0xfa, 0x8b, 0x36, 0xe1, 0x0e, 0x00, 0x09, 0xa7, - 0x43, 0x1a, 0x92, 0x80, 0xf8, 0xf6, 0x62, 0xd7, 0xda, 0x5e, 0xca, 0xe5, 0x13, 0x14, 0x4d, 0xd9, - 0x6a, 0x79, 0xf5, 0x40, 0x82, 0xa5, 0xdc, 0x23, 0xf6, 0x92, 0xce, 0xb2, 0xd6, 0x4f, 0x50, 0x54, - 0x0b, 0x59, 0x70, 0xaa, 0x4d, 0xf8, 0x0d, 0x58, 0x52, 0x44, 0x90, 0x52, 0xdf, 0xae, 0x69, 0x71, - 0x63, 0x9c, 0x39, 0x25, 0x86, 0x16, 0x43, 0x16, 0x1c, 0xa4, 0xd4, 0x87, 0xcf, 0x41, 0x23, 0x7f, - 0x62, 0x91, 0x8b, 0x81, 0x16, 0xb7, 0xc7, 0x99, 0x33, 0x83, 0xa3, 0xba, 0xf1, 0x74, 0xd0, 0x77, - 0xa0, 0xce, 0x89, 0x48, 0x43, 0xe9, 0x0e, 0x68, 0x48, 0xec, 0xba, 0x8e, 0x59, 0x1e, 0x67, 0xce, - 0x34, 0x8c, 0x40, 0xee, 0xbc, 0xa5, 0x21, 0x81, 0x3f, 0x80, 0xbb, 0x1e, 0x8b, 0x92, 0x90, 0xa8, - 0xec, 0xbb, 0x1e, 0x0e, 0xc3, 0x3e, 0xf6, 0x2e, 0xdc, 0x94, 0x87, 0x76, 0x43, 0x45, 0xa3, 0xf5, - 0x09, 0xbd, 0x67, 0xd8, 0x33, 0x1e, 0xc2, 0x0e, 0x00, 0x38, 0x8e, 0x99, 0xc4, 0xfa, 0x4d, 0x9b, - 0x5a, 0x3a, 0x85, 0xc0, 0xd7, 0xa0, 0x41, 0x02, 0x4e, 0x84, 0x70, 0x79, 0xaa, 0xbe, 0xa5, 0x96, - 0xfe, 0x96, 0xee, 0x15, 0xaf, 0x7e, 0x6a, 0xca, 0xea, 0x40, 0x55, 0x15, 0x4a, 0x43, 0x82, 0xea, - 0xb9, 0x5c, 0xd9, 0x02, 0x1e, 0x82, 0xd5, 0x9b, 0x25, 0x46, 0x89, 0xb0, 0x97, 0xf5, 0x22, 0x76, - 0xb1, 0xc8, 0x9e, 0x96, 0xec, 0x97, 0x45, 0x88, 0xa0, 0x37, 0x8b, 0x50, 0x22, 0xe0, 0x0b, 0xb0, - 0x16, 0x92, 0x00, 0x7b, 0x23, 0xd7, 0x67, 0x97, 0x71, 0xc8, 0xb0, 0xef, 0xa6, 0x82, 0x70, 0xbb, - 0xad, 0x73, 0x33, 0x6f, 0x5b, 0x08, 0xe6, 0xfc, 0xbe, 0xa1, 0xcf, 0x04, 0xe1, 0xf0, 0x00, 0x74, - 0x25, 0x4f, 0x85, 0x24, 0xbe, 0x2b, 0x46, 0x42, 0x92, 0xc8, 0x9d, 0x2a, 0x5b, 0xe1, 0x26, 0x58, - 0x9e, 0xdb, 0x2b, 0xfa, 0xd2, 0x0f, 0x8c, 0xee, 0x54, 0xcb, 0xf6, 0xa6, 0x54, 0x27, 0x58, 0x9e, - 0xc3, 0x97, 0xa0, 0x39, 0xdd, 0x13, 0x84, 0x0d, 0xf5, 0x1d, 0x56, 0x8b, 0x3b, 0xbc, 0xd7, 0xe4, - 0xb1, 0xe2, 0x50, 0x63, 0x38, 0x71, 0x04, 0xfc, 0x16, 0x2c, 0x9a, 0xce, 0x61, 0xaf, 0xea, 0x92, - 0x59, 0x2e, 0x62, 0x7e, 0xce, 0x61, 0x54, 0xf0, 0xf0, 0xff, 0xa0, 0x95, 0x84, 0xd8, 0x23, 0xba, - 0x7e, 0x55, 0x47, 0xb0, 0xd7, 0xba, 0x0b, 0xdb, 0x35, 0xd4, 0x2c, 0xd1, 0x77, 0x38, 0x10, 0xea, - 0xdb, 0x8b, 0xf0, 0x07, 0x37, 0xa1, 0xbe, 0xb0, 0xd7, 0x75, 0xd1, 0xe8, 0x6f, 0xaf, 0xc0, 0xd0, - 0x62, 0x84, 0x3f, 0x9c, 0x50, 0x5f, 0xc0, 0x77, 0x60, 0xe3, 0xf6, 0x2e, 0x65, 0x6f, 0xe8, 0x93, - 0x3c, 0x28, 0x5f, 0x60, 0xa2, 0x3a, 0x29, 0x45, 0x68, 0xdd, 0xbb, 0x0d, 0x86, 0x3f, 0x82, 0x56, - 0xde, 0xdd, 0x54, 0xfe, 0x63, 0x1c, 0x11, 0xfb, 0xae, 0x7e, 0x03, 0x38, 0xce, 0x9c, 0x1b, 0x0c, - 0x6a, 0x6a, 0xff, 0xcc, 0xb8, 0x93, 0xd0, 0x04, 0x0b, 0x71, 0xc9, 0xb8, 0x6f, 0xdb, 0x37, 0x43, - 0x0b, 0xc6, 0x84, 0x9e, 0x18, 0x17, 0x7e, 0x0f, 0x1a, 0x53, 0x3d, 0x55, 0xd8, 0xf7, 0x74, 0xfe, - 0x61, 0x71, 0x83, 0x43, 0xc5, 0x1d, 0x29, 0x0a, 0xd5, 0x69, 0x69, 0x0b, 0xf8, 0x0a, 0xb4, 0x66, - 0xfb, 0xae, 0xbd, 0xa9, 0xaf, 0xbe, 0x56, 0x04, 0x1e, 0xb1, 0x00, 0x61, 0x49, 0x8e, 0x14, 0x87, - 0x1a, 0xe1, 0x94, 0x07, 0x0f, 0x40, 0x7d, 0xaa, 0x3b, 0xdb, 0xf7, 0xf5, 0x8e, 0x0f, 0x8b, 0xc0, - 0xd9, 0x16, 0xbd, 0x73, 0xac, 0x95, 0xea, 0x7d, 0xde, 0xc4, 0x92, 0x8f, 0x10, 0x88, 0x4a, 0x60, - 0xf3, 0x0c, 0x2c, 0xdf, 0xa0, 0x61, 0x1b, 0x2c, 0x5c, 0x90, 0x51, 0xde, 0xcd, 0x91, 0x32, 0xe1, - 0x63, 0x50, 0x19, 0xe2, 0x30, 0x25, 0xf6, 0xbc, 0x3e, 0xe0, 0x46, 0xb1, 0x4f, 0x19, 0xf9, 0x5e, - 0xb1, 0x28, 0x17, 0xbd, 0x9a, 0x7f, 0x69, 0x6d, 0x7d, 0xa9, 0x80, 0x3b, 0xea, 0x14, 0xf0, 0x10, - 0x2c, 0xab, 0x71, 0xea, 0xfa, 0xe5, 0x71, 0xf4, 0xc2, 0x53, 0x8b, 0xcc, 0x1e, 0xb6, 0xb7, 0x74, - 0x95, 0x39, 0xd6, 0x38, 0x73, 0xe6, 0x50, 0x4b, 0xce, 0x4e, 0x9a, 0x47, 0xa0, 0xa6, 0x97, 0xd2, - 0xbd, 0x6a, 0x5e, 0x3f, 0x8e, 0xee, 0xc8, 0x25, 0x88, 0x96, 0x94, 0xa9, 0xbb, 0xd4, 0x16, 0xa8, - 0xfa, 0x2c, 0xc2, 0x34, 0x9f, 0x05, 0x66, 0x28, 0xe5, 0x08, 0x32, 0xbf, 0xba, 0x6b, 0x73, 0x82, - 0x55, 0x01, 0x62, 0xa9, 0x47, 0xc1, 0x82, 0xe9, 0xda, 0x25, 0x8a, 0x6a, 0xc6, 0xde, 0x95, 0x4a, - 0x9e, 0x26, 0x7e, 0x21, 0xaf, 0x4c, 0xe4, 0x13, 0x14, 0xd5, 0x8c, 0xbd, 0x2b, 0xe1, 0x3e, 0x80, - 0x03, 0xca, 0x85, 0x74, 0x4d, 0x73, 0xcb, 0xc3, 0xaa, 0x3a, 0x6c, 0x63, 0x9c, 0x39, 0xb7, 0xb0, - 0xa8, 0xad, 0xb1, 0xbd, 0x02, 0xda, 0x95, 0xf0, 0x39, 0xa8, 0x08, 0x89, 0x25, 0xd1, 0x53, 0xa2, - 0x35, 0xf9, 0xa6, 0x54, 0xd2, 0x76, 0x4e, 0x15, 0xd3, 0xab, 0x8d, 0x33, 0x27, 0x17, 0xa1, 0xfc, - 0x47, 0x0d, 0x38, 0x8f, 0x84, 0xa1, 0x4b, 0x7d, 0x33, 0x2c, 0xf4, 0x80, 0x33, 0x10, 0xaa, 0x2a, - 0xe3, 0x50, 0xa7, 0x28, 0x6f, 0xd2, 0x66, 0x48, 0xe4, 0x73, 0x5b, 0x23, 0xc8, 0xfc, 0x2a, 0xcd, - 0x00, 0xd3, 0x90, 0xe4, 0xb3, 0x61, 0x29, 0xd7, 0xe4, 0x08, 0x32, 0xbf, 0xaa, 0x70, 0x94, 0x95, - 0x72, 0xe2, 0x72, 0x82, 0x05, 0x8b, 0xcd, 0x4c, 0xd0, 0x85, 0x33, 0xcb, 0xa0, 0xa6, 0xf1, 0x91, - 0x76, 0xe1, 0x6b, 0xb0, 0xcc, 0xc9, 0xaf, 0xc4, 0xcb, 0x07, 0x83, 0xea, 0x49, 0x7a, 0x22, 0x54, - 0x7a, 0xab, 0xe3, 0xcc, 0xb9, 0x49, 0xa1, 0x56, 0x09, 0xec, 0x29, 0x1f, 0xfe, 0x04, 0xda, 0x13, - 0x89, 0xd9, 0x5a, 0x4f, 0x89, 0xde, 0xda, 0x38, 0x73, 0xbe, 0xe2, 0xd0, 0x64, 0xc1, 0x7c, 0xfb, - 0xad, 0x23, 0x50, 0xd1, 0x29, 0x84, 0x75, 0xb0, 0x78, 0x18, 0x0f, 0x71, 0x48, 0xfd, 0xf6, 0x9c, - 0x72, 0x4e, 0x48, 0xec, 0xd3, 0x38, 0x68, 0x5b, 0xca, 0x41, 0x69, 0x1c, 0x2b, 0x67, 0x1e, 0x36, - 0x41, 0xad, 0x7c, 0x9b, 0xf6, 0x82, 0x72, 0x11, 0x11, 0x2c, 0x1c, 0x2a, 0xf6, 0x4e, 0xef, 0xc5, - 0xd5, 0xa7, 0x8e, 0xf5, 0xf1, 0x53, 0x67, 0xee, 0xcb, 0xa7, 0x8e, 0xf5, 0xdb, 0x75, 0xc7, 0xfa, - 0xf3, 0xba, 0x63, 0xfd, 0x75, 0xdd, 0xb1, 0xae, 0xae, 0x3b, 0xd6, 0xdf, 0xd7, 0x1d, 0xeb, 0x9f, - 0xeb, 0xce, 0xdc, 0x97, 0xeb, 0x8e, 0xf5, 0xfb, 0xe7, 0xce, 0xdc, 0xd5, 0xe7, 0xce, 0xdc, 0xc7, - 0xcf, 0x9d, 0xb9, 0x7e, 0x55, 0xff, 0xb1, 0x7a, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, - 0x48, 0xdf, 0x94, 0x75, 0x0a, 0x00, 0x00, -} - -func (x Task_State) String() string { - s, ok := Task_State_name[int32(x)] - if ok { - return s - } - return strconv.Itoa(int(x)) -} -func (this *TaskDefinition) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskDefinition) - if !ok { - that2, ok := that.(TaskDefinition) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.RootFs != that1.RootFs { - return false - } - if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { - return false - } - for i := range this.EnvironmentVariables { - if !this.EnvironmentVariables[i].Equal(that1.EnvironmentVariables[i]) { - return false - } - } - if !this.Action.Equal(that1.Action) { - return false - } - if this.DiskMb != that1.DiskMb { - return false - } - if this.MemoryMb != that1.MemoryMb { - return false - } - if this.CpuWeight != that1.CpuWeight { - return false - } - if this.Privileged != that1.Privileged { - return false - } - if this.LogSource != that1.LogSource { - return false - } - if this.LogGuid != that1.LogGuid { - return false - } - if this.MetricsGuid != that1.MetricsGuid { - return false - } - if this.ResultFile != that1.ResultFile { - return false - } - if this.CompletionCallbackUrl != that1.CompletionCallbackUrl { - return false - } - if this.Annotation != that1.Annotation { - return false - } - if len(this.EgressRules) != len(that1.EgressRules) { - return false - } - for i := range this.EgressRules { - if !this.EgressRules[i].Equal(that1.EgressRules[i]) { - return false - } - } - if len(this.CachedDependencies) != len(that1.CachedDependencies) { - return false - } - for i := range this.CachedDependencies { - if !this.CachedDependencies[i].Equal(that1.CachedDependencies[i]) { - return false - } - } - if this.LegacyDownloadUser != that1.LegacyDownloadUser { - return false - } - if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { - return false - } - if len(this.VolumeMounts) != len(that1.VolumeMounts) { - return false - } - for i := range this.VolumeMounts { - if !this.VolumeMounts[i].Equal(that1.VolumeMounts[i]) { - return false - } - } - if !this.Network.Equal(that1.Network) { - return false - } - if len(this.PlacementTags) != len(that1.PlacementTags) { - return false - } - for i := range this.PlacementTags { - if this.PlacementTags[i] != that1.PlacementTags[i] { - return false - } - } - if this.MaxPids != that1.MaxPids { - return false - } - if !this.CertificateProperties.Equal(that1.CertificateProperties) { - return false - } - if this.ImageUsername != that1.ImageUsername { - return false - } - if this.ImagePassword != that1.ImagePassword { - return false - } - if len(this.ImageLayers) != len(that1.ImageLayers) { - return false - } - for i := range this.ImageLayers { - if !this.ImageLayers[i].Equal(that1.ImageLayers[i]) { - return false - } - } - if !this.LogRateLimit.Equal(that1.LogRateLimit) { - return false - } - if len(this.MetricTags) != len(that1.MetricTags) { - return false - } - for i := range this.MetricTags { - if !this.MetricTags[i].Equal(that1.MetricTags[i]) { - return false - } - } - return true -} -func (this *Task) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Task) - if !ok { - that2, ok := that.(Task) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.TaskDefinition.Equal(that1.TaskDefinition) { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - if this.Domain != that1.Domain { - return false - } - if this.CreatedAt != that1.CreatedAt { - return false - } - if this.UpdatedAt != that1.UpdatedAt { - return false - } - if this.FirstCompletedAt != that1.FirstCompletedAt { - return false - } - if this.State != that1.State { - return false - } - if this.CellId != that1.CellId { - return false - } - if this.Result != that1.Result { - return false - } - if this.Failed != that1.Failed { - return false - } - if this.FailureReason != that1.FailureReason { - return false - } - if this.RejectionCount != that1.RejectionCount { - return false - } - if this.RejectionReason != that1.RejectionReason { - return false - } - return true -} -func (this *TaskDefinition) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 31) - s = append(s, "&models.TaskDefinition{") - s = append(s, "RootFs: "+fmt.Sprintf("%#v", this.RootFs)+",\n") - if this.EnvironmentVariables != nil { - s = append(s, "EnvironmentVariables: "+fmt.Sprintf("%#v", this.EnvironmentVariables)+",\n") - } - if this.Action != nil { - s = append(s, "Action: "+fmt.Sprintf("%#v", this.Action)+",\n") - } - s = append(s, "DiskMb: "+fmt.Sprintf("%#v", this.DiskMb)+",\n") - s = append(s, "MemoryMb: "+fmt.Sprintf("%#v", this.MemoryMb)+",\n") - s = append(s, "CpuWeight: "+fmt.Sprintf("%#v", this.CpuWeight)+",\n") - s = append(s, "Privileged: "+fmt.Sprintf("%#v", this.Privileged)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "LogGuid: "+fmt.Sprintf("%#v", this.LogGuid)+",\n") - s = append(s, "MetricsGuid: "+fmt.Sprintf("%#v", this.MetricsGuid)+",\n") - s = append(s, "ResultFile: "+fmt.Sprintf("%#v", this.ResultFile)+",\n") - s = append(s, "CompletionCallbackUrl: "+fmt.Sprintf("%#v", this.CompletionCallbackUrl)+",\n") - s = append(s, "Annotation: "+fmt.Sprintf("%#v", this.Annotation)+",\n") - if this.EgressRules != nil { - s = append(s, "EgressRules: "+fmt.Sprintf("%#v", this.EgressRules)+",\n") - } - if this.CachedDependencies != nil { - s = append(s, "CachedDependencies: "+fmt.Sprintf("%#v", this.CachedDependencies)+",\n") - } - s = append(s, "LegacyDownloadUser: "+fmt.Sprintf("%#v", this.LegacyDownloadUser)+",\n") - s = append(s, "TrustedSystemCertificatesPath: "+fmt.Sprintf("%#v", this.TrustedSystemCertificatesPath)+",\n") - if this.VolumeMounts != nil { - s = append(s, "VolumeMounts: "+fmt.Sprintf("%#v", this.VolumeMounts)+",\n") - } - if this.Network != nil { - s = append(s, "Network: "+fmt.Sprintf("%#v", this.Network)+",\n") - } - s = append(s, "PlacementTags: "+fmt.Sprintf("%#v", this.PlacementTags)+",\n") - s = append(s, "MaxPids: "+fmt.Sprintf("%#v", this.MaxPids)+",\n") - if this.CertificateProperties != nil { - s = append(s, "CertificateProperties: "+fmt.Sprintf("%#v", this.CertificateProperties)+",\n") - } - s = append(s, "ImageUsername: "+fmt.Sprintf("%#v", this.ImageUsername)+",\n") - s = append(s, "ImagePassword: "+fmt.Sprintf("%#v", this.ImagePassword)+",\n") - if this.ImageLayers != nil { - s = append(s, "ImageLayers: "+fmt.Sprintf("%#v", this.ImageLayers)+",\n") - } - if this.LogRateLimit != nil { - s = append(s, "LogRateLimit: "+fmt.Sprintf("%#v", this.LogRateLimit)+",\n") - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%#v: %#v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - if this.MetricTags != nil { - s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *Task) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 17) - s = append(s, "&models.Task{") - if this.TaskDefinition != nil { - s = append(s, "TaskDefinition: "+fmt.Sprintf("%#v", this.TaskDefinition)+",\n") - } - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "CreatedAt: "+fmt.Sprintf("%#v", this.CreatedAt)+",\n") - s = append(s, "UpdatedAt: "+fmt.Sprintf("%#v", this.UpdatedAt)+",\n") - s = append(s, "FirstCompletedAt: "+fmt.Sprintf("%#v", this.FirstCompletedAt)+",\n") - s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "Result: "+fmt.Sprintf("%#v", this.Result)+",\n") - s = append(s, "Failed: "+fmt.Sprintf("%#v", this.Failed)+",\n") - s = append(s, "FailureReason: "+fmt.Sprintf("%#v", this.FailureReason)+",\n") - s = append(s, "RejectionCount: "+fmt.Sprintf("%#v", this.RejectionCount)+",\n") - s = append(s, "RejectionReason: "+fmt.Sprintf("%#v", this.RejectionReason)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringTask(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *TaskDefinition) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskDefinition) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskDefinition) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.MetricTags) > 0 { - for k := range m.MetricTags { - v := m.MetricTags[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintTask(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintTask(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xda - } - } - if m.LogRateLimit != nil { - { - size, err := m.LogRateLimit.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd2 - } - if len(m.ImageLayers) > 0 { - for iNdEx := len(m.ImageLayers) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ImageLayers[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xca - } - } - if len(m.ImagePassword) > 0 { - i -= len(m.ImagePassword) - copy(dAtA[i:], m.ImagePassword) - i = encodeVarintTask(dAtA, i, uint64(len(m.ImagePassword))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xc2 - } - if len(m.ImageUsername) > 0 { - i -= len(m.ImageUsername) - copy(dAtA[i:], m.ImageUsername) - i = encodeVarintTask(dAtA, i, uint64(len(m.ImageUsername))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xba - } - if m.CertificateProperties != nil { - { - size, err := m.CertificateProperties.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb2 - } - if m.MaxPids != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.MaxPids)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa8 - } - if len(m.PlacementTags) > 0 { - for iNdEx := len(m.PlacementTags) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.PlacementTags[iNdEx]) - copy(dAtA[i:], m.PlacementTags[iNdEx]) - i = encodeVarintTask(dAtA, i, uint64(len(m.PlacementTags[iNdEx]))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa2 - } - } - if m.Network != nil { - { - size, err := m.Network.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x9a - } - if len(m.VolumeMounts) > 0 { - for iNdEx := len(m.VolumeMounts) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.VolumeMounts[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x92 - } - } - if len(m.TrustedSystemCertificatesPath) > 0 { - i -= len(m.TrustedSystemCertificatesPath) - copy(dAtA[i:], m.TrustedSystemCertificatesPath) - i = encodeVarintTask(dAtA, i, uint64(len(m.TrustedSystemCertificatesPath))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x8a - } - if len(m.LegacyDownloadUser) > 0 { - i -= len(m.LegacyDownloadUser) - copy(dAtA[i:], m.LegacyDownloadUser) - i = encodeVarintTask(dAtA, i, uint64(len(m.LegacyDownloadUser))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 - } - if len(m.CachedDependencies) > 0 { - for iNdEx := len(m.CachedDependencies) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.CachedDependencies[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - } - if len(m.EgressRules) > 0 { - for iNdEx := len(m.EgressRules) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.EgressRules[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x72 - } - } - if len(m.Annotation) > 0 { - i -= len(m.Annotation) - copy(dAtA[i:], m.Annotation) - i = encodeVarintTask(dAtA, i, uint64(len(m.Annotation))) - i-- - dAtA[i] = 0x6a - } - if len(m.CompletionCallbackUrl) > 0 { - i -= len(m.CompletionCallbackUrl) - copy(dAtA[i:], m.CompletionCallbackUrl) - i = encodeVarintTask(dAtA, i, uint64(len(m.CompletionCallbackUrl))) - i-- - dAtA[i] = 0x62 - } - if len(m.ResultFile) > 0 { - i -= len(m.ResultFile) - copy(dAtA[i:], m.ResultFile) - i = encodeVarintTask(dAtA, i, uint64(len(m.ResultFile))) - i-- - dAtA[i] = 0x5a - } - if len(m.MetricsGuid) > 0 { - i -= len(m.MetricsGuid) - copy(dAtA[i:], m.MetricsGuid) - i = encodeVarintTask(dAtA, i, uint64(len(m.MetricsGuid))) - i-- - dAtA[i] = 0x52 - } - if len(m.LogGuid) > 0 { - i -= len(m.LogGuid) - copy(dAtA[i:], m.LogGuid) - i = encodeVarintTask(dAtA, i, uint64(len(m.LogGuid))) - i-- - dAtA[i] = 0x4a - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintTask(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x42 - } - if m.Privileged { - i-- - if m.Privileged { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.CpuWeight != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.CpuWeight)) - i-- - dAtA[i] = 0x30 - } - if m.MemoryMb != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.MemoryMb)) - i-- - dAtA[i] = 0x28 - } - if m.DiskMb != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.DiskMb)) - i-- - dAtA[i] = 0x20 - } - if m.Action != nil { - { - size, err := m.Action.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if len(m.EnvironmentVariables) > 0 { - for iNdEx := len(m.EnvironmentVariables) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.EnvironmentVariables[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.RootFs) > 0 { - i -= len(m.RootFs) - copy(dAtA[i:], m.RootFs) - i = encodeVarintTask(dAtA, i, uint64(len(m.RootFs))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *Task) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Task) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Task) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.RejectionReason) > 0 { - i -= len(m.RejectionReason) - copy(dAtA[i:], m.RejectionReason) - i = encodeVarintTask(dAtA, i, uint64(len(m.RejectionReason))) - i-- - dAtA[i] = 0x6a - } - if m.RejectionCount != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.RejectionCount)) - i-- - dAtA[i] = 0x60 - } - if len(m.FailureReason) > 0 { - i -= len(m.FailureReason) - copy(dAtA[i:], m.FailureReason) - i = encodeVarintTask(dAtA, i, uint64(len(m.FailureReason))) - i-- - dAtA[i] = 0x5a - } - if m.Failed { - i-- - if m.Failed { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x50 - } - if len(m.Result) > 0 { - i -= len(m.Result) - copy(dAtA[i:], m.Result) - i = encodeVarintTask(dAtA, i, uint64(len(m.Result))) - i-- - dAtA[i] = 0x4a - } - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintTask(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0x42 - } - if m.State != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.State)) - i-- - dAtA[i] = 0x38 - } - if m.FirstCompletedAt != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.FirstCompletedAt)) - i-- - dAtA[i] = 0x30 - } - if m.UpdatedAt != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.UpdatedAt)) - i-- - dAtA[i] = 0x28 - } - if m.CreatedAt != 0 { - i = encodeVarintTask(dAtA, i, uint64(m.CreatedAt)) - i-- - dAtA[i] = 0x20 - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintTask(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0x1a - } - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTask(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0x12 - } - if m.TaskDefinition != nil { - { - size, err := m.TaskDefinition.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTask(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintTask(dAtA []byte, offset int, v uint64) int { - offset -= sovTask(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *TaskDefinition) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.RootFs) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - if len(m.EnvironmentVariables) > 0 { - for _, e := range m.EnvironmentVariables { - l = e.Size() - n += 1 + l + sovTask(uint64(l)) - } - } - if m.Action != nil { - l = m.Action.Size() - n += 1 + l + sovTask(uint64(l)) - } - if m.DiskMb != 0 { - n += 1 + sovTask(uint64(m.DiskMb)) - } - if m.MemoryMb != 0 { - n += 1 + sovTask(uint64(m.MemoryMb)) - } - if m.CpuWeight != 0 { - n += 1 + sovTask(uint64(m.CpuWeight)) - } - if m.Privileged { - n += 2 - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.LogGuid) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.MetricsGuid) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.ResultFile) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.CompletionCallbackUrl) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.Annotation) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - if len(m.EgressRules) > 0 { - for _, e := range m.EgressRules { - l = e.Size() - n += 1 + l + sovTask(uint64(l)) - } - } - if len(m.CachedDependencies) > 0 { - for _, e := range m.CachedDependencies { - l = e.Size() - n += 1 + l + sovTask(uint64(l)) - } - } - l = len(m.LegacyDownloadUser) - if l > 0 { - n += 2 + l + sovTask(uint64(l)) - } - l = len(m.TrustedSystemCertificatesPath) - if l > 0 { - n += 2 + l + sovTask(uint64(l)) - } - if len(m.VolumeMounts) > 0 { - for _, e := range m.VolumeMounts { - l = e.Size() - n += 2 + l + sovTask(uint64(l)) - } - } - if m.Network != nil { - l = m.Network.Size() - n += 2 + l + sovTask(uint64(l)) - } - if len(m.PlacementTags) > 0 { - for _, s := range m.PlacementTags { - l = len(s) - n += 2 + l + sovTask(uint64(l)) - } - } - if m.MaxPids != 0 { - n += 2 + sovTask(uint64(m.MaxPids)) - } - if m.CertificateProperties != nil { - l = m.CertificateProperties.Size() - n += 2 + l + sovTask(uint64(l)) - } - l = len(m.ImageUsername) - if l > 0 { - n += 2 + l + sovTask(uint64(l)) - } - l = len(m.ImagePassword) - if l > 0 { - n += 2 + l + sovTask(uint64(l)) - } - if len(m.ImageLayers) > 0 { - for _, e := range m.ImageLayers { - l = e.Size() - n += 2 + l + sovTask(uint64(l)) - } - } - if m.LogRateLimit != nil { - l = m.LogRateLimit.Size() - n += 2 + l + sovTask(uint64(l)) - } - if len(m.MetricTags) > 0 { - for k, v := range m.MetricTags { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovTask(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovTask(uint64(len(k))) + l - n += mapEntrySize + 2 + sovTask(uint64(mapEntrySize)) - } - } - return n -} - -func (m *Task) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.TaskDefinition != nil { - l = m.TaskDefinition.Size() - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - if m.CreatedAt != 0 { - n += 1 + sovTask(uint64(m.CreatedAt)) - } - if m.UpdatedAt != 0 { - n += 1 + sovTask(uint64(m.UpdatedAt)) - } - if m.FirstCompletedAt != 0 { - n += 1 + sovTask(uint64(m.FirstCompletedAt)) - } - if m.State != 0 { - n += 1 + sovTask(uint64(m.State)) - } - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - l = len(m.Result) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - if m.Failed { - n += 2 - } - l = len(m.FailureReason) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - if m.RejectionCount != 0 { - n += 1 + sovTask(uint64(m.RejectionCount)) - } - l = len(m.RejectionReason) - if l > 0 { - n += 1 + l + sovTask(uint64(l)) - } - return n -} - -func sovTask(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozTask(x uint64) (n int) { - return sovTask(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *TaskDefinition) String() string { - if this == nil { - return "nil" - } - repeatedStringForEnvironmentVariables := "[]*EnvironmentVariable{" - for _, f := range this.EnvironmentVariables { - repeatedStringForEnvironmentVariables += strings.Replace(fmt.Sprintf("%v", f), "EnvironmentVariable", "EnvironmentVariable", 1) + "," - } - repeatedStringForEnvironmentVariables += "}" - repeatedStringForEgressRules := "[]*SecurityGroupRule{" - for _, f := range this.EgressRules { - repeatedStringForEgressRules += strings.Replace(fmt.Sprintf("%v", f), "SecurityGroupRule", "SecurityGroupRule", 1) + "," - } - repeatedStringForEgressRules += "}" - repeatedStringForCachedDependencies := "[]*CachedDependency{" - for _, f := range this.CachedDependencies { - repeatedStringForCachedDependencies += strings.Replace(fmt.Sprintf("%v", f), "CachedDependency", "CachedDependency", 1) + "," - } - repeatedStringForCachedDependencies += "}" - repeatedStringForVolumeMounts := "[]*VolumeMount{" - for _, f := range this.VolumeMounts { - repeatedStringForVolumeMounts += strings.Replace(fmt.Sprintf("%v", f), "VolumeMount", "VolumeMount", 1) + "," - } - repeatedStringForVolumeMounts += "}" - repeatedStringForImageLayers := "[]*ImageLayer{" - for _, f := range this.ImageLayers { - repeatedStringForImageLayers += strings.Replace(fmt.Sprintf("%v", f), "ImageLayer", "ImageLayer", 1) + "," - } - repeatedStringForImageLayers += "}" - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%v: %v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - s := strings.Join([]string{`&TaskDefinition{`, - `RootFs:` + fmt.Sprintf("%v", this.RootFs) + `,`, - `EnvironmentVariables:` + repeatedStringForEnvironmentVariables + `,`, - `Action:` + strings.Replace(fmt.Sprintf("%v", this.Action), "Action", "Action", 1) + `,`, - `DiskMb:` + fmt.Sprintf("%v", this.DiskMb) + `,`, - `MemoryMb:` + fmt.Sprintf("%v", this.MemoryMb) + `,`, - `CpuWeight:` + fmt.Sprintf("%v", this.CpuWeight) + `,`, - `Privileged:` + fmt.Sprintf("%v", this.Privileged) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `LogGuid:` + fmt.Sprintf("%v", this.LogGuid) + `,`, - `MetricsGuid:` + fmt.Sprintf("%v", this.MetricsGuid) + `,`, - `ResultFile:` + fmt.Sprintf("%v", this.ResultFile) + `,`, - `CompletionCallbackUrl:` + fmt.Sprintf("%v", this.CompletionCallbackUrl) + `,`, - `Annotation:` + fmt.Sprintf("%v", this.Annotation) + `,`, - `EgressRules:` + repeatedStringForEgressRules + `,`, - `CachedDependencies:` + repeatedStringForCachedDependencies + `,`, - `LegacyDownloadUser:` + fmt.Sprintf("%v", this.LegacyDownloadUser) + `,`, - `TrustedSystemCertificatesPath:` + fmt.Sprintf("%v", this.TrustedSystemCertificatesPath) + `,`, - `VolumeMounts:` + repeatedStringForVolumeMounts + `,`, - `Network:` + strings.Replace(fmt.Sprintf("%v", this.Network), "Network", "Network", 1) + `,`, - `PlacementTags:` + fmt.Sprintf("%v", this.PlacementTags) + `,`, - `MaxPids:` + fmt.Sprintf("%v", this.MaxPids) + `,`, - `CertificateProperties:` + strings.Replace(fmt.Sprintf("%v", this.CertificateProperties), "CertificateProperties", "CertificateProperties", 1) + `,`, - `ImageUsername:` + fmt.Sprintf("%v", this.ImageUsername) + `,`, - `ImagePassword:` + fmt.Sprintf("%v", this.ImagePassword) + `,`, - `ImageLayers:` + repeatedStringForImageLayers + `,`, - `LogRateLimit:` + strings.Replace(fmt.Sprintf("%v", this.LogRateLimit), "LogRateLimit", "LogRateLimit", 1) + `,`, - `MetricTags:` + mapStringForMetricTags + `,`, - `}`, - }, "") - return s -} -func (this *Task) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Task{`, - `TaskDefinition:` + strings.Replace(this.TaskDefinition.String(), "TaskDefinition", "TaskDefinition", 1) + `,`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `CreatedAt:` + fmt.Sprintf("%v", this.CreatedAt) + `,`, - `UpdatedAt:` + fmt.Sprintf("%v", this.UpdatedAt) + `,`, - `FirstCompletedAt:` + fmt.Sprintf("%v", this.FirstCompletedAt) + `,`, - `State:` + fmt.Sprintf("%v", this.State) + `,`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `Result:` + fmt.Sprintf("%v", this.Result) + `,`, - `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, - `FailureReason:` + fmt.Sprintf("%v", this.FailureReason) + `,`, - `RejectionCount:` + fmt.Sprintf("%v", this.RejectionCount) + `,`, - `RejectionReason:` + fmt.Sprintf("%v", this.RejectionReason) + `,`, - `}`, - }, "") - return s -} -func valueToStringTask(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *TaskDefinition) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskDefinition: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskDefinition: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RootFs", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RootFs = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EnvironmentVariables", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EnvironmentVariables = append(m.EnvironmentVariables, &EnvironmentVariable{}) - if err := m.EnvironmentVariables[len(m.EnvironmentVariables)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Action == nil { - m.Action = &Action{} - } - if err := m.Action.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DiskMb", wireType) - } - m.DiskMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DiskMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MemoryMb", wireType) - } - m.MemoryMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MemoryMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CpuWeight", wireType) - } - m.CpuWeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CpuWeight |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Privileged", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Privileged = bool(v != 0) - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 10: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricsGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MetricsGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ResultFile", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ResultFile = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 12: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CompletionCallbackUrl", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CompletionCallbackUrl = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 13: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Annotation", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Annotation = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 14: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EgressRules", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EgressRules = append(m.EgressRules, &SecurityGroupRule{}) - if err := m.EgressRules[len(m.EgressRules)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedDependencies", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CachedDependencies = append(m.CachedDependencies, &CachedDependency{}) - if err := m.CachedDependencies[len(m.CachedDependencies)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 16: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LegacyDownloadUser", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LegacyDownloadUser = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 17: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TrustedSystemCertificatesPath", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TrustedSystemCertificatesPath = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 18: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VolumeMounts", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.VolumeMounts = append(m.VolumeMounts, &VolumeMount{}) - if err := m.VolumeMounts[len(m.VolumeMounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 19: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Network", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Network == nil { - m.Network = &Network{} - } - if err := m.Network.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 20: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PlacementTags", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PlacementTags = append(m.PlacementTags, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 21: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxPids", wireType) - } - m.MaxPids = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxPids |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 22: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CertificateProperties", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CertificateProperties == nil { - m.CertificateProperties = &CertificateProperties{} - } - if err := m.CertificateProperties.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 23: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImageUsername", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImageUsername = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 24: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImagePassword", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImagePassword = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 25: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImageLayers", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImageLayers = append(m.ImageLayers, &ImageLayer{}) - if err := m.ImageLayers[len(m.ImageLayers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 26: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogRateLimit", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.LogRateLimit == nil { - m.LogRateLimit = &LogRateLimit{} - } - if err := m.LogRateLimit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 27: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricTags", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MetricTags == nil { - m.MetricTags = make(map[string]*MetricTagValue) - } - var mapkey string - var mapvalue *MetricTagValue - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthTask - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthTask - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthTask - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthTask - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &MetricTagValue{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipTask(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTask - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.MetricTags[mapkey] = mapvalue - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTask(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTask - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Task) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Task: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Task: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskDefinition", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TaskDefinition == nil { - m.TaskDefinition = &TaskDefinition{} - } - if err := m.TaskDefinition.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CreatedAt", wireType) - } - m.CreatedAt = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CreatedAt |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field UpdatedAt", wireType) - } - m.UpdatedAt = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.UpdatedAt |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field FirstCompletedAt", wireType) - } - m.FirstCompletedAt = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.FirstCompletedAt |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field State", wireType) - } - m.State = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.State |= Task_State(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Result = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Failed", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Failed = bool(v != 0) - case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FailureReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FailureReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field RejectionCount", wireType) - } - m.RejectionCount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.RejectionCount |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 13: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RejectionReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTask - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTask - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTask - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RejectionReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTask(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTask - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipTask(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTask - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTask - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTask - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthTask - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTask - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthTask - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthTask = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTask = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupTask = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/task_requests.gogoproto.go b/protomodels/task_requests.gogoproto.go deleted file mode 100644 index 2d41c1b3..00000000 --- a/protomodels/task_requests.gogoproto.go +++ /dev/null @@ -1,4016 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: task_requests.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type TaskLifecycleResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` -} - -func (m *TaskLifecycleResponse) Reset() { *m = TaskLifecycleResponse{} } -func (*TaskLifecycleResponse) ProtoMessage() {} -func (*TaskLifecycleResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{0} -} -func (m *TaskLifecycleResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskLifecycleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskLifecycleResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskLifecycleResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskLifecycleResponse.Merge(m, src) -} -func (m *TaskLifecycleResponse) XXX_Size() int { - return m.Size() -} -func (m *TaskLifecycleResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TaskLifecycleResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskLifecycleResponse proto.InternalMessageInfo - -func (m *TaskLifecycleResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -type DesireTaskRequest struct { - TaskDefinition *TaskDefinition `protobuf:"bytes,1,opt,name=task_definition,json=taskDefinition,proto3" json:"task_definition"` - TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` - Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain"` -} - -func (m *DesireTaskRequest) Reset() { *m = DesireTaskRequest{} } -func (*DesireTaskRequest) ProtoMessage() {} -func (*DesireTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{1} -} -func (m *DesireTaskRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesireTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesireTaskRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesireTaskRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesireTaskRequest.Merge(m, src) -} -func (m *DesireTaskRequest) XXX_Size() int { - return m.Size() -} -func (m *DesireTaskRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DesireTaskRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DesireTaskRequest proto.InternalMessageInfo - -func (m *DesireTaskRequest) GetTaskDefinition() *TaskDefinition { - if m != nil { - return m.TaskDefinition - } - return nil -} - -func (m *DesireTaskRequest) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -func (m *DesireTaskRequest) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -type StartTaskRequest struct { - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` -} - -func (m *StartTaskRequest) Reset() { *m = StartTaskRequest{} } -func (*StartTaskRequest) ProtoMessage() {} -func (*StartTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{2} -} -func (m *StartTaskRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *StartTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_StartTaskRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *StartTaskRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartTaskRequest.Merge(m, src) -} -func (m *StartTaskRequest) XXX_Size() int { - return m.Size() -} -func (m *StartTaskRequest) XXX_DiscardUnknown() { - xxx_messageInfo_StartTaskRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_StartTaskRequest proto.InternalMessageInfo - -func (m *StartTaskRequest) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -func (m *StartTaskRequest) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -type StartTaskResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ShouldStart bool `protobuf:"varint,2,opt,name=should_start,json=shouldStart,proto3" json:"should_start"` -} - -func (m *StartTaskResponse) Reset() { *m = StartTaskResponse{} } -func (*StartTaskResponse) ProtoMessage() {} -func (*StartTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{3} -} -func (m *StartTaskResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *StartTaskResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_StartTaskResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *StartTaskResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartTaskResponse.Merge(m, src) -} -func (m *StartTaskResponse) XXX_Size() int { - return m.Size() -} -func (m *StartTaskResponse) XXX_DiscardUnknown() { - xxx_messageInfo_StartTaskResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_StartTaskResponse proto.InternalMessageInfo - -func (m *StartTaskResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *StartTaskResponse) GetShouldStart() bool { - if m != nil { - return m.ShouldStart - } - return false -} - -// Deprecated: Do not use. -type FailTaskRequest struct { - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` - FailureReason string `protobuf:"bytes,2,opt,name=failure_reason,json=failureReason,proto3" json:"failure_reason"` -} - -func (m *FailTaskRequest) Reset() { *m = FailTaskRequest{} } -func (*FailTaskRequest) ProtoMessage() {} -func (*FailTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{4} -} -func (m *FailTaskRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FailTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FailTaskRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *FailTaskRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_FailTaskRequest.Merge(m, src) -} -func (m *FailTaskRequest) XXX_Size() int { - return m.Size() -} -func (m *FailTaskRequest) XXX_DiscardUnknown() { - xxx_messageInfo_FailTaskRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_FailTaskRequest proto.InternalMessageInfo - -func (m *FailTaskRequest) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -func (m *FailTaskRequest) GetFailureReason() string { - if m != nil { - return m.FailureReason - } - return "" -} - -type RejectTaskRequest struct { - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` - RejectionReason string `protobuf:"bytes,2,opt,name=rejection_reason,json=rejectionReason,proto3" json:"rejection_reason"` -} - -func (m *RejectTaskRequest) Reset() { *m = RejectTaskRequest{} } -func (*RejectTaskRequest) ProtoMessage() {} -func (*RejectTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{5} -} -func (m *RejectTaskRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RejectTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RejectTaskRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RejectTaskRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RejectTaskRequest.Merge(m, src) -} -func (m *RejectTaskRequest) XXX_Size() int { - return m.Size() -} -func (m *RejectTaskRequest) XXX_DiscardUnknown() { - xxx_messageInfo_RejectTaskRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_RejectTaskRequest proto.InternalMessageInfo - -func (m *RejectTaskRequest) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -func (m *RejectTaskRequest) GetRejectionReason() string { - if m != nil { - return m.RejectionReason - } - return "" -} - -type TaskGuidRequest struct { - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` -} - -func (m *TaskGuidRequest) Reset() { *m = TaskGuidRequest{} } -func (*TaskGuidRequest) ProtoMessage() {} -func (*TaskGuidRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{6} -} -func (m *TaskGuidRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskGuidRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskGuidRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskGuidRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskGuidRequest.Merge(m, src) -} -func (m *TaskGuidRequest) XXX_Size() int { - return m.Size() -} -func (m *TaskGuidRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TaskGuidRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskGuidRequest proto.InternalMessageInfo - -func (m *TaskGuidRequest) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -type CompleteTaskRequest struct { - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` - Failed bool `protobuf:"varint,3,opt,name=failed,proto3" json:"failed"` - FailureReason string `protobuf:"bytes,4,opt,name=failure_reason,json=failureReason,proto3" json:"failure_reason"` - Result string `protobuf:"bytes,5,opt,name=result,proto3" json:"result"` -} - -func (m *CompleteTaskRequest) Reset() { *m = CompleteTaskRequest{} } -func (*CompleteTaskRequest) ProtoMessage() {} -func (*CompleteTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{7} -} -func (m *CompleteTaskRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CompleteTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CompleteTaskRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *CompleteTaskRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CompleteTaskRequest.Merge(m, src) -} -func (m *CompleteTaskRequest) XXX_Size() int { - return m.Size() -} -func (m *CompleteTaskRequest) XXX_DiscardUnknown() { - xxx_messageInfo_CompleteTaskRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_CompleteTaskRequest proto.InternalMessageInfo - -func (m *CompleteTaskRequest) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -func (m *CompleteTaskRequest) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -func (m *CompleteTaskRequest) GetFailed() bool { - if m != nil { - return m.Failed - } - return false -} - -func (m *CompleteTaskRequest) GetFailureReason() string { - if m != nil { - return m.FailureReason - } - return "" -} - -func (m *CompleteTaskRequest) GetResult() string { - if m != nil { - return m.Result - } - return "" -} - -type TaskCallbackResponse struct { - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` - Failed bool `protobuf:"varint,2,opt,name=failed,proto3" json:"failed"` - FailureReason string `protobuf:"bytes,3,opt,name=failure_reason,json=failureReason,proto3" json:"failure_reason"` - Result string `protobuf:"bytes,4,opt,name=result,proto3" json:"result"` - Annotation string `protobuf:"bytes,5,opt,name=annotation,proto3" json:"annotation,omitempty"` - CreatedAt int64 `protobuf:"varint,6,opt,name=created_at,json=createdAt,proto3" json:"created_at"` -} - -func (m *TaskCallbackResponse) Reset() { *m = TaskCallbackResponse{} } -func (*TaskCallbackResponse) ProtoMessage() {} -func (*TaskCallbackResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{8} -} -func (m *TaskCallbackResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskCallbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskCallbackResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskCallbackResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskCallbackResponse.Merge(m, src) -} -func (m *TaskCallbackResponse) XXX_Size() int { - return m.Size() -} -func (m *TaskCallbackResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TaskCallbackResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskCallbackResponse proto.InternalMessageInfo - -func (m *TaskCallbackResponse) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -func (m *TaskCallbackResponse) GetFailed() bool { - if m != nil { - return m.Failed - } - return false -} - -func (m *TaskCallbackResponse) GetFailureReason() string { - if m != nil { - return m.FailureReason - } - return "" -} - -func (m *TaskCallbackResponse) GetResult() string { - if m != nil { - return m.Result - } - return "" -} - -func (m *TaskCallbackResponse) GetAnnotation() string { - if m != nil { - return m.Annotation - } - return "" -} - -func (m *TaskCallbackResponse) GetCreatedAt() int64 { - if m != nil { - return m.CreatedAt - } - return 0 -} - -type TasksRequest struct { - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,json=cellId,proto3" json:"cell_id"` -} - -func (m *TasksRequest) Reset() { *m = TasksRequest{} } -func (*TasksRequest) ProtoMessage() {} -func (*TasksRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{9} -} -func (m *TasksRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TasksRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TasksRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TasksRequest.Merge(m, src) -} -func (m *TasksRequest) XXX_Size() int { - return m.Size() -} -func (m *TasksRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TasksRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_TasksRequest proto.InternalMessageInfo - -func (m *TasksRequest) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *TasksRequest) GetCellId() string { - if m != nil { - return m.CellId - } - return "" -} - -type TasksResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Tasks []*Task `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks,omitempty"` -} - -func (m *TasksResponse) Reset() { *m = TasksResponse{} } -func (*TasksResponse) ProtoMessage() {} -func (*TasksResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{10} -} -func (m *TasksResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TasksResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TasksResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TasksResponse.Merge(m, src) -} -func (m *TasksResponse) XXX_Size() int { - return m.Size() -} -func (m *TasksResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TasksResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_TasksResponse proto.InternalMessageInfo - -func (m *TasksResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *TasksResponse) GetTasks() []*Task { - if m != nil { - return m.Tasks - } - return nil -} - -type TaskByGuidRequest struct { - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` -} - -func (m *TaskByGuidRequest) Reset() { *m = TaskByGuidRequest{} } -func (*TaskByGuidRequest) ProtoMessage() {} -func (*TaskByGuidRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{11} -} -func (m *TaskByGuidRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskByGuidRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskByGuidRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskByGuidRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskByGuidRequest.Merge(m, src) -} -func (m *TaskByGuidRequest) XXX_Size() int { - return m.Size() -} -func (m *TaskByGuidRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TaskByGuidRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskByGuidRequest proto.InternalMessageInfo - -func (m *TaskByGuidRequest) GetTaskGuid() string { - if m != nil { - return m.TaskGuid - } - return "" -} - -type TaskResponse struct { - Error *Error `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Task *Task `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"` -} - -func (m *TaskResponse) Reset() { *m = TaskResponse{} } -func (*TaskResponse) ProtoMessage() {} -func (*TaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_13f778b8a0251259, []int{12} -} -func (m *TaskResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TaskResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TaskResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TaskResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskResponse.Merge(m, src) -} -func (m *TaskResponse) XXX_Size() int { - return m.Size() -} -func (m *TaskResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TaskResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_TaskResponse proto.InternalMessageInfo - -func (m *TaskResponse) GetError() *Error { - if m != nil { - return m.Error - } - return nil -} - -func (m *TaskResponse) GetTask() *Task { - if m != nil { - return m.Task - } - return nil -} - -func init() { - proto.RegisterType((*TaskLifecycleResponse)(nil), "models.TaskLifecycleResponse") - proto.RegisterType((*DesireTaskRequest)(nil), "models.DesireTaskRequest") - proto.RegisterType((*StartTaskRequest)(nil), "models.StartTaskRequest") - proto.RegisterType((*StartTaskResponse)(nil), "models.StartTaskResponse") - proto.RegisterType((*FailTaskRequest)(nil), "models.FailTaskRequest") - proto.RegisterType((*RejectTaskRequest)(nil), "models.RejectTaskRequest") - proto.RegisterType((*TaskGuidRequest)(nil), "models.TaskGuidRequest") - proto.RegisterType((*CompleteTaskRequest)(nil), "models.CompleteTaskRequest") - proto.RegisterType((*TaskCallbackResponse)(nil), "models.TaskCallbackResponse") - proto.RegisterType((*TasksRequest)(nil), "models.TasksRequest") - proto.RegisterType((*TasksResponse)(nil), "models.TasksResponse") - proto.RegisterType((*TaskByGuidRequest)(nil), "models.TaskByGuidRequest") - proto.RegisterType((*TaskResponse)(nil), "models.TaskResponse") -} - -func init() { proto.RegisterFile("task_requests.proto", fileDescriptor_13f778b8a0251259) } - -var fileDescriptor_13f778b8a0251259 = []byte{ - // 663 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xce, 0x26, 0x6d, 0x68, 0x27, 0x4d, 0xd3, 0xb8, 0x05, 0x59, 0x3d, 0xac, 0x23, 0xc3, 0x21, - 0x42, 0x6a, 0x2a, 0xb5, 0x5c, 0x40, 0xa0, 0x8a, 0xb4, 0x80, 0x90, 0x38, 0x2d, 0x45, 0xea, 0x2d, - 0xda, 0xd8, 0x9b, 0xd4, 0xd4, 0xf1, 0x16, 0xef, 0xfa, 0x50, 0x89, 0x43, 0x1f, 0x81, 0x03, 0x0f, - 0xc1, 0x2b, 0xf0, 0x06, 0x1c, 0x7b, 0xec, 0xc9, 0xa2, 0xee, 0x05, 0xf9, 0xd4, 0x47, 0x40, 0xbb, - 0x76, 0x9b, 0x1f, 0x28, 0x6a, 0x22, 0x71, 0xda, 0x9d, 0x6f, 0xc6, 0xdf, 0xcc, 0x37, 0x3b, 0x99, - 0xc0, 0xaa, 0xa4, 0xe2, 0xa8, 0x13, 0xb2, 0x4f, 0x11, 0x13, 0x52, 0xb4, 0x8e, 0x43, 0x2e, 0xb9, - 0x51, 0x1e, 0x70, 0x97, 0xf9, 0x62, 0x7d, 0xa3, 0xef, 0xc9, 0xc3, 0xa8, 0xdb, 0x72, 0xf8, 0x60, - 0xb3, 0xcf, 0xfb, 0x7c, 0x53, 0xbb, 0xbb, 0x51, 0x4f, 0x5b, 0xda, 0xd0, 0xb7, 0xec, 0xb3, 0x75, - 0x50, 0x5c, 0xf9, 0xbd, 0xc2, 0xc2, 0x90, 0x87, 0x99, 0x61, 0x3f, 0x87, 0xfb, 0xfb, 0x54, 0x1c, - 0xbd, 0xf3, 0x7a, 0xcc, 0x39, 0x71, 0x7c, 0x46, 0x98, 0x38, 0xe6, 0x81, 0x60, 0xc6, 0x43, 0x98, - 0xd7, 0x71, 0x26, 0x6a, 0xa0, 0x66, 0x65, 0xab, 0xda, 0xca, 0x12, 0xb7, 0x5e, 0x29, 0x90, 0x64, - 0x3e, 0xfb, 0x3b, 0x82, 0xfa, 0x1e, 0x13, 0x5e, 0xc8, 0x14, 0x09, 0xc9, 0x4a, 0x35, 0xf6, 0xa1, - 0xa6, 0x4b, 0x77, 0x59, 0xcf, 0x0b, 0x3c, 0xe9, 0xf1, 0x20, 0x27, 0x79, 0x70, 0x4d, 0xa2, 0xa2, - 0xf7, 0x6e, 0xbc, 0xed, 0xd5, 0x34, 0xb6, 0x26, 0x3f, 0x21, 0xcb, 0x72, 0x2c, 0xc8, 0x78, 0x0c, - 0x8b, 0x3a, 0xa4, 0x1f, 0x79, 0xae, 0x59, 0x6c, 0xa0, 0xe6, 0x62, 0xbb, 0x9a, 0xc6, 0xd6, 0x10, - 0x24, 0x0b, 0xea, 0xfa, 0x26, 0xf2, 0x5c, 0xc3, 0x86, 0xb2, 0xcb, 0x07, 0xd4, 0x0b, 0xcc, 0x92, - 0x0e, 0x84, 0x34, 0xb6, 0x72, 0x84, 0xe4, 0xa7, 0xed, 0xc2, 0xca, 0x7b, 0x49, 0x43, 0x39, 0x5a, - 0xf9, 0x58, 0x0e, 0xf4, 0xef, 0x1c, 0x8f, 0xe0, 0x9e, 0xc3, 0x7c, 0xbf, 0x73, 0x53, 0x4d, 0x25, - 0x8d, 0xad, 0x6b, 0x88, 0x94, 0xd5, 0xe5, 0xad, 0x6b, 0x0f, 0xa0, 0x3e, 0x92, 0x65, 0x8a, 0xde, - 0x1a, 0xdb, 0xb0, 0x24, 0x0e, 0x79, 0xe4, 0xbb, 0x1d, 0xa1, 0x08, 0x74, 0x92, 0x85, 0xf6, 0x4a, - 0x1a, 0x5b, 0x63, 0x38, 0xa9, 0x64, 0x96, 0xce, 0x62, 0x7f, 0x86, 0xda, 0x6b, 0xea, 0xf9, 0xb3, - 0x6a, 0x7a, 0x0a, 0xcb, 0x3d, 0xea, 0xf9, 0x51, 0xc8, 0x3a, 0x21, 0xa3, 0x82, 0x07, 0xb9, 0x34, - 0x23, 0x8d, 0xad, 0x09, 0x0f, 0xa9, 0xe6, 0x36, 0xd1, 0xe6, 0xb3, 0xa2, 0x89, 0xec, 0x53, 0x04, - 0x75, 0xc2, 0x3e, 0x32, 0x67, 0xe6, 0xa6, 0xee, 0xc0, 0x4a, 0xa8, 0x09, 0x3c, 0x1e, 0x8c, 0x97, - 0xb0, 0x96, 0xc6, 0xd6, 0x1f, 0x3e, 0x52, 0xbb, 0x41, 0xb2, 0x32, 0xec, 0x17, 0x50, 0xdb, 0xcf, - 0xc9, 0x66, 0xc8, 0x6f, 0xa7, 0x08, 0x56, 0x77, 0xf9, 0xe0, 0xd8, 0x67, 0x92, 0xfd, 0xd7, 0xc1, - 0x50, 0x23, 0xaa, 0x1a, 0xc8, 0x5c, 0x3d, 0xa2, 0x0b, 0xd9, 0x88, 0x66, 0x08, 0xc9, 0xcf, 0xbf, - 0x3c, 0xc7, 0xdc, 0x1d, 0x9f, 0x43, 0xd1, 0x87, 0x4c, 0x44, 0xbe, 0x34, 0xe7, 0x87, 0xbf, 0x80, - 0x0c, 0x21, 0xf9, 0x69, 0x7f, 0x2d, 0xc2, 0x9a, 0x12, 0xb9, 0x4b, 0x7d, 0xbf, 0x4b, 0x9d, 0xe1, - 0x7c, 0x4e, 0xa3, 0x76, 0xa8, 0xa3, 0x38, 0x85, 0x8e, 0xd2, 0xf4, 0x3a, 0xe6, 0x6e, 0xd3, 0x61, - 0x60, 0x00, 0x1a, 0x04, 0x5c, 0x52, 0xbd, 0x6a, 0xb4, 0x5e, 0x32, 0x82, 0x18, 0x1b, 0x00, 0x4e, - 0xc8, 0xa8, 0x64, 0x6e, 0x87, 0x4a, 0xb3, 0xdc, 0x40, 0xcd, 0x52, 0x7b, 0x39, 0x8d, 0xad, 0x11, - 0x94, 0x2c, 0xe6, 0xf7, 0x97, 0xd2, 0x3e, 0x80, 0x25, 0xd5, 0x15, 0x71, 0xfd, 0xf6, 0xc3, 0x65, - 0x82, 0x6e, 0x5b, 0x26, 0x77, 0x5c, 0x06, 0x07, 0x50, 0xcd, 0x99, 0xa7, 0x59, 0x04, 0x36, 0xcc, - 0xab, 0x6e, 0x0b, 0xb3, 0xd8, 0x28, 0x35, 0x2b, 0x5b, 0x4b, 0xa3, 0x4b, 0x94, 0x64, 0x2e, 0x7b, - 0x07, 0xea, 0xca, 0x6c, 0x9f, 0xcc, 0x3a, 0xf8, 0x1f, 0x32, 0xd1, 0xd3, 0x55, 0xd6, 0x80, 0x39, - 0x45, 0xa0, 0x25, 0x4f, 0x16, 0xa6, 0x3d, 0xed, 0x27, 0x67, 0x17, 0xb8, 0x70, 0x7e, 0x81, 0x0b, - 0x57, 0x17, 0x18, 0x9d, 0x26, 0x18, 0x7d, 0x4b, 0x30, 0xfa, 0x91, 0x60, 0x74, 0x96, 0x60, 0xf4, - 0x33, 0xc1, 0xe8, 0x57, 0x82, 0x0b, 0x57, 0x09, 0x46, 0x5f, 0x2e, 0x71, 0xe1, 0xec, 0x12, 0x17, - 0xce, 0x2f, 0x71, 0xa1, 0x5b, 0xd6, 0xff, 0x4d, 0xdb, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x42, - 0xbf, 0x2a, 0x4c, 0x02, 0x07, 0x00, 0x00, -} - -func (this *TaskLifecycleResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskLifecycleResponse) - if !ok { - that2, ok := that.(TaskLifecycleResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - return true -} -func (this *DesireTaskRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesireTaskRequest) - if !ok { - that2, ok := that.(DesireTaskRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.TaskDefinition.Equal(that1.TaskDefinition) { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - if this.Domain != that1.Domain { - return false - } - return true -} -func (this *StartTaskRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*StartTaskRequest) - if !ok { - that2, ok := that.(StartTaskRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - if this.CellId != that1.CellId { - return false - } - return true -} -func (this *StartTaskResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*StartTaskResponse) - if !ok { - that2, ok := that.(StartTaskResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if this.ShouldStart != that1.ShouldStart { - return false - } - return true -} -func (this *FailTaskRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*FailTaskRequest) - if !ok { - that2, ok := that.(FailTaskRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - if this.FailureReason != that1.FailureReason { - return false - } - return true -} -func (this *RejectTaskRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*RejectTaskRequest) - if !ok { - that2, ok := that.(RejectTaskRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - if this.RejectionReason != that1.RejectionReason { - return false - } - return true -} -func (this *TaskGuidRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskGuidRequest) - if !ok { - that2, ok := that.(TaskGuidRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - return true -} -func (this *CompleteTaskRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*CompleteTaskRequest) - if !ok { - that2, ok := that.(CompleteTaskRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - if this.CellId != that1.CellId { - return false - } - if this.Failed != that1.Failed { - return false - } - if this.FailureReason != that1.FailureReason { - return false - } - if this.Result != that1.Result { - return false - } - return true -} -func (this *TaskCallbackResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskCallbackResponse) - if !ok { - that2, ok := that.(TaskCallbackResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - if this.Failed != that1.Failed { - return false - } - if this.FailureReason != that1.FailureReason { - return false - } - if this.Result != that1.Result { - return false - } - if this.Annotation != that1.Annotation { - return false - } - if this.CreatedAt != that1.CreatedAt { - return false - } - return true -} -func (this *TasksRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TasksRequest) - if !ok { - that2, ok := that.(TasksRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Domain != that1.Domain { - return false - } - if this.CellId != that1.CellId { - return false - } - return true -} -func (this *TasksResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TasksResponse) - if !ok { - that2, ok := that.(TasksResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if len(this.Tasks) != len(that1.Tasks) { - return false - } - for i := range this.Tasks { - if !this.Tasks[i].Equal(that1.Tasks[i]) { - return false - } - } - return true -} -func (this *TaskByGuidRequest) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskByGuidRequest) - if !ok { - that2, ok := that.(TaskByGuidRequest) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.TaskGuid != that1.TaskGuid { - return false - } - return true -} -func (this *TaskResponse) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*TaskResponse) - if !ok { - that2, ok := that.(TaskResponse) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Error.Equal(that1.Error) { - return false - } - if !this.Task.Equal(that1.Task) { - return false - } - return true -} -func (this *TaskLifecycleResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.TaskLifecycleResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesireTaskRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.DesireTaskRequest{") - if this.TaskDefinition != nil { - s = append(s, "TaskDefinition: "+fmt.Sprintf("%#v", this.TaskDefinition)+",\n") - } - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *StartTaskRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.StartTaskRequest{") - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *StartTaskResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.StartTaskResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - s = append(s, "ShouldStart: "+fmt.Sprintf("%#v", this.ShouldStart)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *FailTaskRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.FailTaskRequest{") - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "FailureReason: "+fmt.Sprintf("%#v", this.FailureReason)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *RejectTaskRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.RejectTaskRequest{") - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "RejectionReason: "+fmt.Sprintf("%#v", this.RejectionReason)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TaskGuidRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.TaskGuidRequest{") - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *CompleteTaskRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 9) - s = append(s, "&models.CompleteTaskRequest{") - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "Failed: "+fmt.Sprintf("%#v", this.Failed)+",\n") - s = append(s, "FailureReason: "+fmt.Sprintf("%#v", this.FailureReason)+",\n") - s = append(s, "Result: "+fmt.Sprintf("%#v", this.Result)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TaskCallbackResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 10) - s = append(s, "&models.TaskCallbackResponse{") - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "Failed: "+fmt.Sprintf("%#v", this.Failed)+",\n") - s = append(s, "FailureReason: "+fmt.Sprintf("%#v", this.FailureReason)+",\n") - s = append(s, "Result: "+fmt.Sprintf("%#v", this.Result)+",\n") - s = append(s, "Annotation: "+fmt.Sprintf("%#v", this.Annotation)+",\n") - s = append(s, "CreatedAt: "+fmt.Sprintf("%#v", this.CreatedAt)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TasksRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.TasksRequest{") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "CellId: "+fmt.Sprintf("%#v", this.CellId)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TasksResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.TasksResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.Tasks != nil { - s = append(s, "Tasks: "+fmt.Sprintf("%#v", this.Tasks)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TaskByGuidRequest) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.TaskByGuidRequest{") - s = append(s, "TaskGuid: "+fmt.Sprintf("%#v", this.TaskGuid)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *TaskResponse) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.TaskResponse{") - if this.Error != nil { - s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") - } - if this.Task != nil { - s = append(s, "Task: "+fmt.Sprintf("%#v", this.Task)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringTaskRequests(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *TaskLifecycleResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskLifecycleResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskLifecycleResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTaskRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesireTaskRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesireTaskRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesireTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0x1a - } - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0x12 - } - if m.TaskDefinition != nil { - { - size, err := m.TaskDefinition.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTaskRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *StartTaskRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *StartTaskRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StartTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0x12 - } - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *StartTaskResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *StartTaskResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StartTaskResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ShouldStart { - i-- - if m.ShouldStart { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTaskRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *FailTaskRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *FailTaskRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FailTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.FailureReason) > 0 { - i -= len(m.FailureReason) - copy(dAtA[i:], m.FailureReason) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.FailureReason))) - i-- - dAtA[i] = 0x12 - } - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *RejectTaskRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RejectTaskRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RejectTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.RejectionReason) > 0 { - i -= len(m.RejectionReason) - copy(dAtA[i:], m.RejectionReason) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.RejectionReason))) - i-- - dAtA[i] = 0x12 - } - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TaskGuidRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskGuidRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskGuidRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *CompleteTaskRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *CompleteTaskRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CompleteTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Result) > 0 { - i -= len(m.Result) - copy(dAtA[i:], m.Result) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.Result))) - i-- - dAtA[i] = 0x2a - } - if len(m.FailureReason) > 0 { - i -= len(m.FailureReason) - copy(dAtA[i:], m.FailureReason) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.FailureReason))) - i-- - dAtA[i] = 0x22 - } - if m.Failed { - i-- - if m.Failed { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 - } - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0x12 - } - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TaskCallbackResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskCallbackResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskCallbackResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.CreatedAt != 0 { - i = encodeVarintTaskRequests(dAtA, i, uint64(m.CreatedAt)) - i-- - dAtA[i] = 0x30 - } - if len(m.Annotation) > 0 { - i -= len(m.Annotation) - copy(dAtA[i:], m.Annotation) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.Annotation))) - i-- - dAtA[i] = 0x2a - } - if len(m.Result) > 0 { - i -= len(m.Result) - copy(dAtA[i:], m.Result) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.Result))) - i-- - dAtA[i] = 0x22 - } - if len(m.FailureReason) > 0 { - i -= len(m.FailureReason) - copy(dAtA[i:], m.FailureReason) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.FailureReason))) - i-- - dAtA[i] = 0x1a - } - if m.Failed { - i-- - if m.Failed { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TasksRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TasksRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TasksRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.CellId) > 0 { - i -= len(m.CellId) - copy(dAtA[i:], m.CellId) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.CellId))) - i-- - dAtA[i] = 0x12 - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TasksResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TasksResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TasksResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Tasks) > 0 { - for iNdEx := len(m.Tasks) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Tasks[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTaskRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTaskRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TaskByGuidRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskByGuidRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskByGuidRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TaskGuid) > 0 { - i -= len(m.TaskGuid) - copy(dAtA[i:], m.TaskGuid) - i = encodeVarintTaskRequests(dAtA, i, uint64(len(m.TaskGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TaskResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TaskResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TaskResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Task != nil { - { - size, err := m.Task.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTaskRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Error != nil { - { - size, err := m.Error.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTaskRequests(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintTaskRequests(dAtA []byte, offset int, v uint64) int { - offset -= sovTaskRequests(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *TaskLifecycleResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *DesireTaskRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.TaskDefinition != nil { - l = m.TaskDefinition.Size() - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *StartTaskRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *StartTaskResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovTaskRequests(uint64(l)) - } - if m.ShouldStart { - n += 2 - } - return n -} - -func (m *FailTaskRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.FailureReason) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *RejectTaskRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.RejectionReason) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *TaskGuidRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *CompleteTaskRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - if m.Failed { - n += 2 - } - l = len(m.FailureReason) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.Result) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *TaskCallbackResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - if m.Failed { - n += 2 - } - l = len(m.FailureReason) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.Result) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.Annotation) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - if m.CreatedAt != 0 { - n += 1 + sovTaskRequests(uint64(m.CreatedAt)) - } - return n -} - -func (m *TasksRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - l = len(m.CellId) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *TasksResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovTaskRequests(uint64(l)) - } - if len(m.Tasks) > 0 { - for _, e := range m.Tasks { - l = e.Size() - n += 1 + l + sovTaskRequests(uint64(l)) - } - } - return n -} - -func (m *TaskByGuidRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TaskGuid) - if l > 0 { - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func (m *TaskResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Error != nil { - l = m.Error.Size() - n += 1 + l + sovTaskRequests(uint64(l)) - } - if m.Task != nil { - l = m.Task.Size() - n += 1 + l + sovTaskRequests(uint64(l)) - } - return n -} - -func sovTaskRequests(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozTaskRequests(x uint64) (n int) { - return sovTaskRequests(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *TaskLifecycleResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskLifecycleResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `}`, - }, "") - return s -} -func (this *DesireTaskRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesireTaskRequest{`, - `TaskDefinition:` + strings.Replace(fmt.Sprintf("%v", this.TaskDefinition), "TaskDefinition", "TaskDefinition", 1) + `,`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `}`, - }, "") - return s -} -func (this *StartTaskRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&StartTaskRequest{`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `}`, - }, "") - return s -} -func (this *StartTaskResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&StartTaskResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `ShouldStart:` + fmt.Sprintf("%v", this.ShouldStart) + `,`, - `}`, - }, "") - return s -} -func (this *FailTaskRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&FailTaskRequest{`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `FailureReason:` + fmt.Sprintf("%v", this.FailureReason) + `,`, - `}`, - }, "") - return s -} -func (this *RejectTaskRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&RejectTaskRequest{`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `RejectionReason:` + fmt.Sprintf("%v", this.RejectionReason) + `,`, - `}`, - }, "") - return s -} -func (this *TaskGuidRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskGuidRequest{`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `}`, - }, "") - return s -} -func (this *CompleteTaskRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&CompleteTaskRequest{`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, - `FailureReason:` + fmt.Sprintf("%v", this.FailureReason) + `,`, - `Result:` + fmt.Sprintf("%v", this.Result) + `,`, - `}`, - }, "") - return s -} -func (this *TaskCallbackResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskCallbackResponse{`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, - `FailureReason:` + fmt.Sprintf("%v", this.FailureReason) + `,`, - `Result:` + fmt.Sprintf("%v", this.Result) + `,`, - `Annotation:` + fmt.Sprintf("%v", this.Annotation) + `,`, - `CreatedAt:` + fmt.Sprintf("%v", this.CreatedAt) + `,`, - `}`, - }, "") - return s -} -func (this *TasksRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TasksRequest{`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `CellId:` + fmt.Sprintf("%v", this.CellId) + `,`, - `}`, - }, "") - return s -} -func (this *TasksResponse) String() string { - if this == nil { - return "nil" - } - repeatedStringForTasks := "[]*Task{" - for _, f := range this.Tasks { - repeatedStringForTasks += strings.Replace(fmt.Sprintf("%v", f), "Task", "Task", 1) + "," - } - repeatedStringForTasks += "}" - s := strings.Join([]string{`&TasksResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `Tasks:` + repeatedStringForTasks + `,`, - `}`, - }, "") - return s -} -func (this *TaskByGuidRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskByGuidRequest{`, - `TaskGuid:` + fmt.Sprintf("%v", this.TaskGuid) + `,`, - `}`, - }, "") - return s -} -func (this *TaskResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&TaskResponse{`, - `Error:` + strings.Replace(fmt.Sprintf("%v", this.Error), "Error", "Error", 1) + `,`, - `Task:` + strings.Replace(fmt.Sprintf("%v", this.Task), "Task", "Task", 1) + `,`, - `}`, - }, "") - return s -} -func valueToStringTaskRequests(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *TaskLifecycleResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskLifecycleResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskLifecycleResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesireTaskRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesireTaskRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesireTaskRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskDefinition", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TaskDefinition == nil { - m.TaskDefinition = &TaskDefinition{} - } - if err := m.TaskDefinition.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: StartTaskRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: StartTaskRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: StartTaskResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: StartTaskResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ShouldStart", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.ShouldStart = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *FailTaskRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: FailTaskRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FailTaskRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FailureReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FailureReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RejectTaskRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RejectTaskRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RejectTaskRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RejectionReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RejectionReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TaskGuidRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskGuidRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskGuidRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *CompleteTaskRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CompleteTaskRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CompleteTaskRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Failed", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Failed = bool(v != 0) - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FailureReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FailureReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Result = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TaskCallbackResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskCallbackResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskCallbackResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Failed", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Failed = bool(v != 0) - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FailureReason", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FailureReason = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Result = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Annotation", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Annotation = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CreatedAt", wireType) - } - m.CreatedAt = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CreatedAt |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TasksRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TasksRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TasksRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CellId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CellId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TasksResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TasksResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TasksResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Tasks", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Tasks = append(m.Tasks, &Task{}) - if err := m.Tasks[len(m.Tasks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TaskByGuidRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskByGuidRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskByGuidRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TaskGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TaskGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TaskResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TaskResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TaskResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Error == nil { - m.Error = &Error{} - } - if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Task", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTaskRequests - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTaskRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Task == nil { - m.Task = &Task{} - } - if err := m.Task.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTaskRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTaskRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipTaskRequests(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTaskRequests - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthTaskRequests - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTaskRequests - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthTaskRequests - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthTaskRequests = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTaskRequests = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupTaskRequests = fmt.Errorf("proto: unexpected end of group") -) diff --git a/protomodels/volume_mount.gogoproto.go b/protomodels/volume_mount.gogoproto.go deleted file mode 100644 index 12d6513a..00000000 --- a/protomodels/volume_mount.gogoproto.go +++ /dev/null @@ -1,1061 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: volume_mount.proto - -package protomodels - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type SharedDevice struct { - VolumeId string `protobuf:"bytes,1,opt,name=volume_id,json=volumeId,proto3" json:"volume_id"` - MountConfig string `protobuf:"bytes,2,opt,name=mount_config,json=mountConfig,proto3" json:"mount_config"` -} - -func (m *SharedDevice) Reset() { *m = SharedDevice{} } -func (*SharedDevice) ProtoMessage() {} -func (*SharedDevice) Descriptor() ([]byte, []int) { - return fileDescriptor_bbde336a4634d84f, []int{0} -} -func (m *SharedDevice) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *SharedDevice) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_SharedDevice.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *SharedDevice) XXX_Merge(src proto.Message) { - xxx_messageInfo_SharedDevice.Merge(m, src) -} -func (m *SharedDevice) XXX_Size() int { - return m.Size() -} -func (m *SharedDevice) XXX_DiscardUnknown() { - xxx_messageInfo_SharedDevice.DiscardUnknown(m) -} - -var xxx_messageInfo_SharedDevice proto.InternalMessageInfo - -func (m *SharedDevice) GetVolumeId() string { - if m != nil { - return m.VolumeId - } - return "" -} - -func (m *SharedDevice) GetMountConfig() string { - if m != nil { - return m.MountConfig - } - return "" -} - -type VolumeMount struct { - Driver string `protobuf:"bytes,1,opt,name=driver,proto3" json:"driver"` - ContainerDir string `protobuf:"bytes,3,opt,name=container_dir,json=containerDir,proto3" json:"container_dir"` - Mode string `protobuf:"bytes,6,opt,name=mode,proto3" json:"mode"` - // oneof device { - Shared *SharedDevice `protobuf:"bytes,7,opt,name=shared,proto3" json:"shared"` -} - -func (m *VolumeMount) Reset() { *m = VolumeMount{} } -func (*VolumeMount) ProtoMessage() {} -func (*VolumeMount) Descriptor() ([]byte, []int) { - return fileDescriptor_bbde336a4634d84f, []int{1} -} -func (m *VolumeMount) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *VolumeMount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_VolumeMount.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *VolumeMount) XXX_Merge(src proto.Message) { - xxx_messageInfo_VolumeMount.Merge(m, src) -} -func (m *VolumeMount) XXX_Size() int { - return m.Size() -} -func (m *VolumeMount) XXX_DiscardUnknown() { - xxx_messageInfo_VolumeMount.DiscardUnknown(m) -} - -var xxx_messageInfo_VolumeMount proto.InternalMessageInfo - -func (m *VolumeMount) GetDriver() string { - if m != nil { - return m.Driver - } - return "" -} - -func (m *VolumeMount) GetContainerDir() string { - if m != nil { - return m.ContainerDir - } - return "" -} - -func (m *VolumeMount) GetMode() string { - if m != nil { - return m.Mode - } - return "" -} - -func (m *VolumeMount) GetShared() *SharedDevice { - if m != nil { - return m.Shared - } - return nil -} - -type VolumePlacement struct { - DriverNames []string `protobuf:"bytes,1,rep,name=driver_names,json=driverNames,proto3" json:"driver_names"` -} - -func (m *VolumePlacement) Reset() { *m = VolumePlacement{} } -func (*VolumePlacement) ProtoMessage() {} -func (*VolumePlacement) Descriptor() ([]byte, []int) { - return fileDescriptor_bbde336a4634d84f, []int{2} -} -func (m *VolumePlacement) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *VolumePlacement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_VolumePlacement.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *VolumePlacement) XXX_Merge(src proto.Message) { - xxx_messageInfo_VolumePlacement.Merge(m, src) -} -func (m *VolumePlacement) XXX_Size() int { - return m.Size() -} -func (m *VolumePlacement) XXX_DiscardUnknown() { - xxx_messageInfo_VolumePlacement.DiscardUnknown(m) -} - -var xxx_messageInfo_VolumePlacement proto.InternalMessageInfo - -func (m *VolumePlacement) GetDriverNames() []string { - if m != nil { - return m.DriverNames - } - return nil -} - -func init() { - proto.RegisterType((*SharedDevice)(nil), "models.SharedDevice") - proto.RegisterType((*VolumeMount)(nil), "models.VolumeMount") - proto.RegisterType((*VolumePlacement)(nil), "models.VolumePlacement") -} - -func init() { proto.RegisterFile("volume_mount.proto", fileDescriptor_bbde336a4634d84f) } - -var fileDescriptor_bbde336a4634d84f = []byte{ - // 381 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x6a, 0xa3, 0x40, - 0x18, 0xc7, 0x9d, 0xc4, 0xb8, 0x66, 0x4c, 0x58, 0x77, 0xd8, 0x83, 0x2c, 0xcb, 0x18, 0x3c, 0x85, - 0x85, 0x35, 0xd0, 0x94, 0xd2, 0x73, 0x1a, 0x0a, 0x0d, 0xb4, 0x14, 0x0b, 0xbd, 0x8a, 0xd1, 0x89, - 0x19, 0x88, 0x4e, 0x31, 0x9a, 0x73, 0x1f, 0xa1, 0x8f, 0xd1, 0x47, 0xe9, 0x31, 0xd0, 0x4b, 0x4e, - 0xd2, 0x98, 0x4b, 0xf1, 0x94, 0x47, 0x28, 0xce, 0xd8, 0x36, 0xb9, 0x38, 0xf3, 0xfb, 0x7f, 0x7f, - 0x3f, 0xbf, 0xef, 0x2f, 0x44, 0x2b, 0xb6, 0xc8, 0x22, 0xe2, 0x46, 0x2c, 0x8b, 0x53, 0xfb, 0x21, - 0x61, 0x29, 0x43, 0x4a, 0xc4, 0x02, 0xb2, 0x58, 0xfe, 0xf9, 0x1f, 0xd2, 0x74, 0x9e, 0x4d, 0x6d, - 0x9f, 0x45, 0x83, 0x90, 0x85, 0x6c, 0xc0, 0xcb, 0xd3, 0x6c, 0xc6, 0x89, 0x03, 0xbf, 0x89, 0xd7, - 0x2c, 0x06, 0x3b, 0x77, 0x73, 0x2f, 0x21, 0xc1, 0x98, 0xac, 0xa8, 0x4f, 0xd0, 0x3f, 0xd8, 0xae, - 0x9b, 0xd3, 0xc0, 0x00, 0x3d, 0xd0, 0x6f, 0x8f, 0xba, 0x65, 0x6e, 0x7e, 0x8b, 0x8e, 0x2a, 0xae, - 0x57, 0x01, 0x1a, 0xc2, 0x0e, 0x9f, 0xc0, 0xf5, 0x59, 0x3c, 0xa3, 0xa1, 0xd1, 0xe0, 0x76, 0xbd, - 0xcc, 0xcd, 0x23, 0xdd, 0xd1, 0x38, 0x5d, 0x70, 0xb0, 0x5e, 0x01, 0xd4, 0xee, 0x79, 0x87, 0xeb, - 0x4a, 0x45, 0x16, 0x54, 0x82, 0x84, 0xae, 0x48, 0x52, 0x7f, 0x0d, 0x96, 0xb9, 0x59, 0x2b, 0x4e, - 0x7d, 0xa2, 0x33, 0xd8, 0xf5, 0x59, 0x9c, 0x7a, 0x34, 0x26, 0x89, 0x1b, 0xd0, 0xc4, 0x68, 0x72, - 0xeb, 0xaf, 0x32, 0x37, 0x8f, 0x0b, 0x4e, 0xe7, 0x0b, 0xc7, 0x34, 0x41, 0x7f, 0xa1, 0x5c, 0xa5, - 0x62, 0x28, 0xdc, 0xae, 0x96, 0xb9, 0xc9, 0xd9, 0xe1, 0x4f, 0x74, 0x0e, 0x95, 0x25, 0x5f, 0xdd, - 0xf8, 0xd1, 0x03, 0x7d, 0xed, 0xe4, 0xb7, 0x2d, 0x22, 0xb4, 0x0f, 0x03, 0x11, 0xf3, 0x08, 0x9f, - 0x53, 0x9f, 0x13, 0x59, 0x6d, 0xe8, 0xcd, 0x89, 0xac, 0xca, 0x7a, 0x6b, 0x22, 0xab, 0x2d, 0x5d, - 0xb1, 0x2e, 0xe1, 0x4f, 0xb1, 0xd4, 0xed, 0xc2, 0xf3, 0x49, 0x44, 0xe2, 0xb4, 0x4a, 0x47, 0x8c, - 0xef, 0xc6, 0x5e, 0x44, 0x96, 0x06, 0xe8, 0x35, 0x3f, 0xd3, 0x39, 0xd4, 0x1d, 0x4d, 0xd0, 0x4d, - 0x05, 0xa3, 0xd3, 0xf5, 0x16, 0x83, 0xcd, 0x16, 0x4b, 0xfb, 0x2d, 0x06, 0x8f, 0x05, 0x06, 0xcf, - 0x05, 0x06, 0x2f, 0x05, 0x06, 0xeb, 0x02, 0x83, 0xb7, 0x02, 0x83, 0xf7, 0x02, 0x4b, 0xfb, 0x02, - 0x83, 0xa7, 0x1d, 0x96, 0xd6, 0x3b, 0x2c, 0x6d, 0x76, 0x58, 0x9a, 0x2a, 0xfc, 0x5f, 0x0e, 0x3f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x23, 0x60, 0xde, 0x18, 0x02, 0x00, 0x00, -} - -func (this *SharedDevice) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*SharedDevice) - if !ok { - that2, ok := that.(SharedDevice) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.VolumeId != that1.VolumeId { - return false - } - if this.MountConfig != that1.MountConfig { - return false - } - return true -} -func (this *VolumeMount) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*VolumeMount) - if !ok { - that2, ok := that.(VolumeMount) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Driver != that1.Driver { - return false - } - if this.ContainerDir != that1.ContainerDir { - return false - } - if this.Mode != that1.Mode { - return false - } - if !this.Shared.Equal(that1.Shared) { - return false - } - return true -} -func (this *VolumePlacement) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*VolumePlacement) - if !ok { - that2, ok := that.(VolumePlacement) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.DriverNames) != len(that1.DriverNames) { - return false - } - for i := range this.DriverNames { - if this.DriverNames[i] != that1.DriverNames[i] { - return false - } - } - return true -} -func (this *SharedDevice) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&models.SharedDevice{") - s = append(s, "VolumeId: "+fmt.Sprintf("%#v", this.VolumeId)+",\n") - s = append(s, "MountConfig: "+fmt.Sprintf("%#v", this.MountConfig)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *VolumeMount) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.VolumeMount{") - s = append(s, "Driver: "+fmt.Sprintf("%#v", this.Driver)+",\n") - s = append(s, "ContainerDir: "+fmt.Sprintf("%#v", this.ContainerDir)+",\n") - s = append(s, "Mode: "+fmt.Sprintf("%#v", this.Mode)+",\n") - if this.Shared != nil { - s = append(s, "Shared: "+fmt.Sprintf("%#v", this.Shared)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *VolumePlacement) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.VolumePlacement{") - s = append(s, "DriverNames: "+fmt.Sprintf("%#v", this.DriverNames)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringVolumeMount(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *SharedDevice) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *SharedDevice) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SharedDevice) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.MountConfig) > 0 { - i -= len(m.MountConfig) - copy(dAtA[i:], m.MountConfig) - i = encodeVarintVolumeMount(dAtA, i, uint64(len(m.MountConfig))) - i-- - dAtA[i] = 0x12 - } - if len(m.VolumeId) > 0 { - i -= len(m.VolumeId) - copy(dAtA[i:], m.VolumeId) - i = encodeVarintVolumeMount(dAtA, i, uint64(len(m.VolumeId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *VolumeMount) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *VolumeMount) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *VolumeMount) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Shared != nil { - { - size, err := m.Shared.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintVolumeMount(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } - if len(m.Mode) > 0 { - i -= len(m.Mode) - copy(dAtA[i:], m.Mode) - i = encodeVarintVolumeMount(dAtA, i, uint64(len(m.Mode))) - i-- - dAtA[i] = 0x32 - } - if len(m.ContainerDir) > 0 { - i -= len(m.ContainerDir) - copy(dAtA[i:], m.ContainerDir) - i = encodeVarintVolumeMount(dAtA, i, uint64(len(m.ContainerDir))) - i-- - dAtA[i] = 0x1a - } - if len(m.Driver) > 0 { - i -= len(m.Driver) - copy(dAtA[i:], m.Driver) - i = encodeVarintVolumeMount(dAtA, i, uint64(len(m.Driver))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *VolumePlacement) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *VolumePlacement) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *VolumePlacement) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.DriverNames) > 0 { - for iNdEx := len(m.DriverNames) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.DriverNames[iNdEx]) - copy(dAtA[i:], m.DriverNames[iNdEx]) - i = encodeVarintVolumeMount(dAtA, i, uint64(len(m.DriverNames[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func encodeVarintVolumeMount(dAtA []byte, offset int, v uint64) int { - offset -= sovVolumeMount(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *SharedDevice) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.VolumeId) - if l > 0 { - n += 1 + l + sovVolumeMount(uint64(l)) - } - l = len(m.MountConfig) - if l > 0 { - n += 1 + l + sovVolumeMount(uint64(l)) - } - return n -} - -func (m *VolumeMount) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Driver) - if l > 0 { - n += 1 + l + sovVolumeMount(uint64(l)) - } - l = len(m.ContainerDir) - if l > 0 { - n += 1 + l + sovVolumeMount(uint64(l)) - } - l = len(m.Mode) - if l > 0 { - n += 1 + l + sovVolumeMount(uint64(l)) - } - if m.Shared != nil { - l = m.Shared.Size() - n += 1 + l + sovVolumeMount(uint64(l)) - } - return n -} - -func (m *VolumePlacement) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.DriverNames) > 0 { - for _, s := range m.DriverNames { - l = len(s) - n += 1 + l + sovVolumeMount(uint64(l)) - } - } - return n -} - -func sovVolumeMount(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozVolumeMount(x uint64) (n int) { - return sovVolumeMount(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *SharedDevice) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&SharedDevice{`, - `VolumeId:` + fmt.Sprintf("%v", this.VolumeId) + `,`, - `MountConfig:` + fmt.Sprintf("%v", this.MountConfig) + `,`, - `}`, - }, "") - return s -} -func (this *VolumeMount) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&VolumeMount{`, - `Driver:` + fmt.Sprintf("%v", this.Driver) + `,`, - `ContainerDir:` + fmt.Sprintf("%v", this.ContainerDir) + `,`, - `Mode:` + fmt.Sprintf("%v", this.Mode) + `,`, - `Shared:` + strings.Replace(this.Shared.String(), "SharedDevice", "SharedDevice", 1) + `,`, - `}`, - }, "") - return s -} -func (this *VolumePlacement) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&VolumePlacement{`, - `DriverNames:` + fmt.Sprintf("%v", this.DriverNames) + `,`, - `}`, - }, "") - return s -} -func valueToStringVolumeMount(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *SharedDevice) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: SharedDevice: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SharedDevice: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VolumeId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVolumeMount - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVolumeMount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.VolumeId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MountConfig", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVolumeMount - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVolumeMount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MountConfig = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipVolumeMount(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthVolumeMount - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *VolumeMount) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: VolumeMount: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: VolumeMount: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Driver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVolumeMount - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVolumeMount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Driver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ContainerDir", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVolumeMount - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVolumeMount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ContainerDir = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Mode", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVolumeMount - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVolumeMount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Mode = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Shared", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthVolumeMount - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthVolumeMount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Shared == nil { - m.Shared = &SharedDevice{} - } - if err := m.Shared.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipVolumeMount(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthVolumeMount - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *VolumePlacement) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: VolumePlacement: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: VolumePlacement: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DriverNames", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthVolumeMount - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthVolumeMount - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DriverNames = append(m.DriverNames, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipVolumeMount(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthVolumeMount - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipVolumeMount(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVolumeMount - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthVolumeMount - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupVolumeMount - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthVolumeMount - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthVolumeMount = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowVolumeMount = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupVolumeMount = fmt.Errorf("proto: unexpected end of group") -) From 26de1cadedfe24fecbbdc18683a3072f2b02b4b7 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 10 May 2024 20:40:53 +0000 Subject: [PATCH 066/155] Add ToEventProto to Event interface and use it for Un/Marshalling --- events/event_source.go | 30 +++++++++++----------- models/events.go | 56 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 15 deletions(-) diff --git a/events/event_source.go b/events/event_source.go index a8271690..2378dcfd 100644 --- a/events/event_source.go +++ b/events/event_source.go @@ -8,8 +8,8 @@ import ( "strconv" "code.cloudfoundry.org/bbs/models" - "github.com/gogo/protobuf/proto" "github.com/vito/go-sse/sse" + "google.golang.org/protobuf/proto" ) var ( @@ -56,7 +56,7 @@ func (e closeError) Error() string { } func NewEventFromModelEvent(eventID int, event models.Event) (sse.Event, error) { - payload, err := proto.Marshal(event) + payload, err := proto.Marshal(event.ToEventProto()) if err != nil { return sse.Event{}, err } @@ -143,7 +143,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { switch rawEvent.Name { case models.EventTypeDesiredLRPCreated: event := new(models.DesiredLRPCreatedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -152,7 +152,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeDesiredLRPChanged: event := new(models.DesiredLRPChangedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -161,7 +161,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeDesiredLRPRemoved: event := new(models.DesiredLRPRemovedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -172,7 +172,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPCreated: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPCreatedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -183,7 +183,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPChanged: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPChangedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -194,7 +194,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPRemoved: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPRemovedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -203,7 +203,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPCrashed: event := new(models.ActualLRPCrashedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -212,7 +212,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeTaskCreated: event := new(models.TaskCreatedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -221,7 +221,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeTaskChanged: event := new(models.TaskChangedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -230,7 +230,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeTaskRemoved: event := new(models.TaskRemovedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -239,7 +239,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPInstanceCreated: event := new(models.ActualLRPInstanceCreatedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -248,7 +248,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPInstanceChanged: event := new(models.ActualLRPInstanceChangedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } @@ -257,7 +257,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPInstanceRemoved: event := new(models.ActualLRPInstanceRemovedEvent) - err := proto.Unmarshal(data, event) + err := proto.Unmarshal(data, event.ToEventProto()) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } diff --git a/models/events.go b/models/events.go index ba6f53bc..72e20f65 100644 --- a/models/events.go +++ b/models/events.go @@ -2,11 +2,13 @@ package models import ( "code.cloudfoundry.org/bbs/format" + "google.golang.org/protobuf/proto" ) type Event interface { EventType() string Key() string + ToEventProto() proto.Message } const ( @@ -81,6 +83,10 @@ func (event *DesiredLRPCreatedEvent) Key() string { return event.DesiredLrp.GetProcessGuid() } +func (event *DesiredLRPCreatedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func NewDesiredLRPChangedEvent(before, after *DesiredLRP, traceId string) *DesiredLRPChangedEvent { return &DesiredLRPChangedEvent{ Before: before, @@ -97,6 +103,10 @@ func (event *DesiredLRPChangedEvent) Key() string { return event.Before.GetProcessGuid() } +func (event *DesiredLRPChangedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func NewDesiredLRPRemovedEvent(desiredLRP *DesiredLRP, traceId string) *DesiredLRPRemovedEvent { return &DesiredLRPRemovedEvent{ DesiredLrp: desiredLRP, @@ -112,6 +122,10 @@ func (event DesiredLRPRemovedEvent) Key() string { return event.DesiredLrp.GetProcessGuid() } +func (event *DesiredLRPRemovedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + // FIXME: change the signature func NewActualLRPInstanceChangedEvent(before, after *ActualLRP, traceId string) *ActualLRPInstanceChangedEvent { var ( @@ -150,6 +164,10 @@ func (event *ActualLRPInstanceChangedEvent) Key() string { return event.GetActualLrpInstanceKey().GetInstanceGuid() } +func (event *ActualLRPInstanceChangedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + // Deprecated: use the ActualLRPInstance versions of this instead func NewActualLRPChangedEvent(before, after *ActualLRPGroup) *ActualLRPChangedEvent { return &ActualLRPChangedEvent{ @@ -172,6 +190,11 @@ func (event *ActualLRPChangedEvent) Key() string { return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() } +// Deprecated: use the ActualLRPInstance versions of this instead +func (event *ActualLRPChangedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func NewActualLRPCrashedEvent(before, after *ActualLRP) *ActualLRPCrashedEvent { return &ActualLRPCrashedEvent{ ActualLrpKey: after.ActualLrpKey, @@ -190,6 +213,10 @@ func (event *ActualLRPCrashedEvent) Key() string { return event.ActualLrpInstanceKey.InstanceGuid } +func (event *ActualLRPCrashedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + // Deprecated: use the ActualLRPInstance versions of this instead func NewActualLRPRemovedEvent(actualLRPGroup *ActualLRPGroup) *ActualLRPRemovedEvent { return &ActualLRPRemovedEvent{ @@ -211,6 +238,11 @@ func (event *ActualLRPRemovedEvent) Key() string { return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() } +// Deprecated: use the ActualLRPInstance versions of this instead +func (event *ActualLRPRemovedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func NewActualLRPInstanceRemovedEvent(actualLrp *ActualLRP, traceId string) *ActualLRPInstanceRemovedEvent { return &ActualLRPInstanceRemovedEvent{ ActualLrp: actualLrp, @@ -229,6 +261,10 @@ func (event *ActualLRPInstanceRemovedEvent) Key() string { return event.ActualLrp.GetActualLrpInstanceKey().GetInstanceGuid() } +func (event *ActualLRPInstanceRemovedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + // Deprecated: use the ActualLRPInstance versions of this instead func NewActualLRPCreatedEvent(actualLRPGroup *ActualLRPGroup) *ActualLRPCreatedEvent { return &ActualLRPCreatedEvent{ @@ -250,6 +286,10 @@ func (event *ActualLRPCreatedEvent) Key() string { return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() } +func (event *ActualLRPCreatedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func NewActualLRPInstanceCreatedEvent(actualLrp *ActualLRP, traceId string) *ActualLRPInstanceCreatedEvent { return &ActualLRPInstanceCreatedEvent{ ActualLrp: actualLrp, @@ -268,6 +308,10 @@ func (event *ActualLRPInstanceCreatedEvent) Key() string { return event.ActualLrp.GetActualLrpInstanceKey().GetInstanceGuid() } +func (event *ActualLRPInstanceCreatedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func (request *EventsByCellId) Validate() error { return nil } @@ -286,6 +330,10 @@ func (event *TaskCreatedEvent) Key() string { return event.Task.GetTaskGuid() } +func (event *TaskCreatedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func NewTaskChangedEvent(before, after *Task) *TaskChangedEvent { return &TaskChangedEvent{ Before: before, @@ -301,6 +349,10 @@ func (event *TaskChangedEvent) Key() string { return event.Before.GetTaskGuid() } +func (event *TaskChangedEvent) ToEventProto() proto.Message { + return event.ToProto() +} + func NewTaskRemovedEvent(task *Task) *TaskRemovedEvent { return &TaskRemovedEvent{ Task: task, @@ -314,3 +366,7 @@ func (event *TaskRemovedEvent) EventType() string { func (event TaskRemovedEvent) Key() string { return event.Task.GetTaskGuid() } + +func (event *TaskRemovedEvent) ToEventProto() proto.Message { + return event.ToProto() +} From ecfc8821ead7887f31c103862641d981c5f782ef Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 10 May 2024 20:41:41 +0000 Subject: [PATCH 067/155] Extract structs into variables and use ToProto to give back a proto.Message --- client.go | 115 ++++++++++++++++++++++++++----------------------- client_test.go | 113 ++++++++++++++++++++++++++---------------------- 2 files changed, 122 insertions(+), 106 deletions(-) diff --git a/client.go b/client.go index c210bdd5..ac781329 100644 --- a/client.go +++ b/client.go @@ -18,9 +18,9 @@ import ( cfhttp "code.cloudfoundry.org/cfhttp/v2" "code.cloudfoundry.org/lager/v3" "code.cloudfoundry.org/tlsconfig" - "github.com/gogo/protobuf/proto" "github.com/tedsuo/rata" "github.com/vito/go-sse/sse" + "google.golang.org/protobuf/proto" ) const ( @@ -327,7 +327,7 @@ type client struct { func (c *client) Ping(logger lager.Logger, traceID string) bool { response := models.PingResponse{} - err := c.doRequest(logger, traceID, PingRoute_r0, nil, nil, nil, &response) + err := c.doRequest(logger, traceID, PingRoute_r0, nil, nil, nil, response.ToProto()) if err != nil { return false } @@ -336,7 +336,7 @@ func (c *client) Ping(logger lager.Logger, traceID string) bool { func (c *client) Domains(logger lager.Logger, traceID string) ([]string, error) { response := models.DomainsResponse{} - err := c.doRequest(logger, traceID, DomainsRoute_r0, nil, nil, nil, &response) + err := c.doRequest(logger, traceID, DomainsRoute_r0, nil, nil, nil, response.ToProto()) if err != nil { return nil, err } @@ -349,7 +349,7 @@ func (c *client) UpsertDomain(logger lager.Logger, traceID string, domain string Ttl: uint32(ttl.Seconds()), } response := models.UpsertDomainResponse{} - err := c.doRequest(logger, traceID, UpsertDomainRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, UpsertDomainRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return err } @@ -363,10 +363,10 @@ func (c *client) ActualLRPs(logger lager.Logger, traceID string, filter models.A ProcessGuid: filter.ProcessGuid, } if filter.Index != nil { - request.SetIndex(*filter.Index) + request.SetIndex(filter.Index) } response := models.ActualLRPsResponse{} - err := c.doRequest(logger, traceID, ActualLRPsRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, ActualLRPsRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -381,7 +381,7 @@ func (c *client) ActualLRPGroups(logger lager.Logger, traceID string, filter mod CellId: filter.CellID, } response := models.ActualLRPGroupsResponse{} - err := c.doRequest(logger, traceID, ActualLRPGroupsRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, ActualLRPGroupsRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -395,7 +395,7 @@ func (c *client) ActualLRPGroupsByProcessGuid(logger lager.Logger, traceID strin ProcessGuid: processGuid, } response := models.ActualLRPGroupsResponse{} - err := c.doRequest(logger, traceID, ActualLRPGroupsByProcessGuidRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, ActualLRPGroupsByProcessGuidRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -410,7 +410,7 @@ func (c *client) ActualLRPGroupByProcessGuidAndIndex(logger lager.Logger, traceI Index: int32(index), } response := models.ActualLRPGroupResponse{} - err := c.doRequest(logger, traceID, ActualLRPGroupByProcessGuidAndIndexRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, ActualLRPGroupByProcessGuidAndIndexRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -425,7 +425,7 @@ func (c *client) ClaimActualLRP(logger lager.Logger, traceID string, key *models ActualLrpInstanceKey: instanceKey, } response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, ClaimActualLRPRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, ClaimActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return err } @@ -451,14 +451,15 @@ func (c *client) StartActualLRP(logger lager.Logger, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - request.SetRoutable(routable) - err := c.doRequest(logger, traceID, StartActualLRPRoute_r1, nil, nil, request, &response) + request.SetRoutable(&routable) + err := c.doRequest(logger, traceID, StartActualLRPRoute_r1, nil, nil, request.ToProto(), response.ToProto()) if err != nil && err == EndpointNotFoundErr { - err = c.doRequest(logger, traceID, StartActualLRPRoute_r0, nil, nil, &models.StartActualLRPRequest{ + startActualLrpRequest := &models.StartActualLRPRequest{ ActualLrpKey: key, ActualLrpInstanceKey: instanceKey, ActualLrpNetInfo: netInfo, - }, &response) + } + err = c.doRequest(logger, traceID, StartActualLRPRoute_r0, nil, nil, startActualLrpRequest.ToProto(), response.ToProto()) } if err != nil { @@ -474,7 +475,7 @@ func (c *client) CrashActualLRP(logger lager.Logger, traceID string, key *models ErrorMessage: errorMessage, } response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, CrashActualLRPRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, CrashActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return err @@ -488,7 +489,7 @@ func (c *client) FailActualLRP(logger lager.Logger, traceID string, key *models. ErrorMessage: errorMessage, } response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, FailActualLRPRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, FailActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return err @@ -501,7 +502,7 @@ func (c *client) RetireActualLRP(logger lager.Logger, traceID string, key *model ActualLrpKey: key, } response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, RetireActualLRPRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, RetireActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return err @@ -517,7 +518,7 @@ func (c *client) RemoveActualLRP(logger lager.Logger, traceID string, key *model } response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, RemoveActualLRPRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, RemoveActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return err } @@ -525,25 +526,28 @@ func (c *client) RemoveActualLRP(logger lager.Logger, traceID string, key *model } func (c *client) EvacuateClaimedActualLRP(logger lager.Logger, traceID string, key *models.ActualLRPKey, instanceKey *models.ActualLRPInstanceKey) (bool, error) { - return c.doEvacRequest(logger, traceID, EvacuateClaimedActualLRPRoute_r0, KeepContainer, &models.EvacuateClaimedActualLRPRequest{ + request := &models.EvacuateClaimedActualLRPRequest{ ActualLrpKey: key, ActualLrpInstanceKey: instanceKey, - }) + } + return c.doEvacRequest(logger, traceID, EvacuateClaimedActualLRPRoute_r0, KeepContainer, request.ToProto()) } func (c *client) EvacuateCrashedActualLRP(logger lager.Logger, traceID string, key *models.ActualLRPKey, instanceKey *models.ActualLRPInstanceKey, errorMessage string) (bool, error) { - return c.doEvacRequest(logger, traceID, EvacuateCrashedActualLRPRoute_r0, DeleteContainer, &models.EvacuateCrashedActualLRPRequest{ + request := &models.EvacuateCrashedActualLRPRequest{ ActualLrpKey: key, ActualLrpInstanceKey: instanceKey, ErrorMessage: errorMessage, - }) + } + return c.doEvacRequest(logger, traceID, EvacuateCrashedActualLRPRoute_r0, DeleteContainer, request.ToProto()) } func (c *client) EvacuateStoppedActualLRP(logger lager.Logger, traceID string, key *models.ActualLRPKey, instanceKey *models.ActualLRPInstanceKey) (bool, error) { - return c.doEvacRequest(logger, traceID, EvacuateStoppedActualLRPRoute_r0, DeleteContainer, &models.EvacuateStoppedActualLRPRequest{ + request := &models.EvacuateStoppedActualLRPRequest{ ActualLrpKey: key, ActualLrpInstanceKey: instanceKey, - }) + } + return c.doEvacRequest(logger, traceID, EvacuateStoppedActualLRPRoute_r0, DeleteContainer, request.ToProto()) } func (c *client) EvacuateRunningActualLRP(logger lager.Logger, @@ -564,14 +568,15 @@ func (c *client) EvacuateRunningActualLRP(logger lager.Logger, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - request.SetRoutable(routable) - keepContainer, err := c.doEvacRequest(logger, traceID, EvacuateRunningActualLRPRoute_r1, KeepContainer, request) + request.SetRoutable(&routable) + keepContainer, err := c.doEvacRequest(logger, traceID, EvacuateRunningActualLRPRoute_r1, KeepContainer, request.ToProto()) if err != nil && err == EndpointNotFoundErr { - keepContainer, err = c.doEvacRequest(logger, traceID, EvacuateRunningActualLRPRoute_r0, KeepContainer, &models.EvacuateRunningActualLRPRequest{ + evacRunningActualLrpRequest := &models.EvacuateRunningActualLRPRequest{ ActualLrpKey: key, ActualLrpInstanceKey: instanceKey, ActualLrpNetInfo: netInfo, - }) + } + keepContainer, err = c.doEvacRequest(logger, traceID, EvacuateRunningActualLRPRoute_r0, KeepContainer, evacRunningActualLrpRequest.ToProto()) } return keepContainer, err @@ -584,7 +589,7 @@ func (c *client) RemoveEvacuatingActualLRP(logger lager.Logger, traceID string, } response := models.RemoveEvacuatingActualLRPResponse{} - err := c.doRequest(logger, traceID, RemoveEvacuatingActualLRPRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, RemoveEvacuatingActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return err } @@ -595,7 +600,7 @@ func (c *client) RemoveEvacuatingActualLRP(logger lager.Logger, traceID string, func (c *client) DesiredLRPs(logger lager.Logger, traceID string, filter models.DesiredLRPFilter) ([]*models.DesiredLRP, error) { request := models.DesiredLRPsRequest(filter) response := models.DesiredLRPsResponse{} - err := c.doRequest(logger, traceID, DesiredLRPsRoute_r3, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, DesiredLRPsRoute_r3, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -608,7 +613,7 @@ func (c *client) DesiredLRPByProcessGuid(logger lager.Logger, traceID string, pr ProcessGuid: processGuid, } response := models.DesiredLRPResponse{} - err := c.doRequest(logger, traceID, DesiredLRPByProcessGuidRoute_r3, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, DesiredLRPByProcessGuidRoute_r3, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -619,7 +624,7 @@ func (c *client) DesiredLRPByProcessGuid(logger lager.Logger, traceID string, pr func (c *client) DesiredLRPSchedulingInfos(logger lager.Logger, traceID string, filter models.DesiredLRPFilter) ([]*models.DesiredLRPSchedulingInfo, error) { request := models.DesiredLRPsRequest(filter) response := models.DesiredLRPSchedulingInfosResponse{} - err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfosRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfosRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -632,7 +637,7 @@ func (c *client) DesiredLRPSchedulingInfoByProcessGuid(logger lager.Logger, trac ProcessGuid: processGuid, } response := models.DesiredLRPSchedulingInfoByProcessGuidResponse{} - err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfoByProcessGuid_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfoByProcessGuid_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -643,7 +648,7 @@ func (c *client) DesiredLRPSchedulingInfoByProcessGuid(logger lager.Logger, trac func (c *client) DesiredLRPRoutingInfos(logger lager.Logger, traceID string, filter models.DesiredLRPFilter) ([]*models.DesiredLRP, error) { request := models.DesiredLRPsRequest(filter) response := models.DesiredLRPsResponse{} - err := c.doRequest(logger, traceID, DesiredLRPRoutingInfosRoute_r0, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, DesiredLRPRoutingInfosRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -653,7 +658,7 @@ func (c *client) DesiredLRPRoutingInfos(logger lager.Logger, traceID string, fil func (c *client) doDesiredLRPLifecycleRequest(logger lager.Logger, traceID string, route string, request proto.Message) error { response := models.DesiredLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, route, nil, nil, request, &response) + err := c.doRequest(logger, traceID, route, nil, nil, request, response.ToProto()) if err != nil { return err } @@ -664,7 +669,7 @@ func (c *client) DesireLRP(logger lager.Logger, traceID string, desiredLRP *mode request := models.DesireLRPRequest{ DesiredLrp: desiredLRP, } - return c.doDesiredLRPLifecycleRequest(logger, traceID, DesireDesiredLRPRoute_r2, &request) + return c.doDesiredLRPLifecycleRequest(logger, traceID, DesireDesiredLRPRoute_r2, request.ToProto()) } func (c *client) UpdateDesiredLRP(logger lager.Logger, traceID string, processGuid string, update *models.DesiredLRPUpdate) error { @@ -672,20 +677,20 @@ func (c *client) UpdateDesiredLRP(logger lager.Logger, traceID string, processGu ProcessGuid: processGuid, Update: update, } - return c.doDesiredLRPLifecycleRequest(logger, traceID, UpdateDesiredLRPRoute_r0, &request) + return c.doDesiredLRPLifecycleRequest(logger, traceID, UpdateDesiredLRPRoute_r0, request.ToProto()) } func (c *client) RemoveDesiredLRP(logger lager.Logger, traceID string, processGuid string) error { request := models.RemoveDesiredLRPRequest{ ProcessGuid: processGuid, } - return c.doDesiredLRPLifecycleRequest(logger, traceID, RemoveDesiredLRPRoute_r0, &request) + return c.doDesiredLRPLifecycleRequest(logger, traceID, RemoveDesiredLRPRoute_r0, request.ToProto()) } func (c *client) Tasks(logger lager.Logger, traceID string) ([]*models.Task, error) { request := models.TasksRequest{} response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -699,7 +704,7 @@ func (c *client) TasksWithFilter(logger lager.Logger, traceID string, filter mod CellId: filter.CellID, } response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -711,7 +716,7 @@ func (c *client) TasksByDomain(logger lager.Logger, traceID string, domain strin Domain: domain, } response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -724,7 +729,7 @@ func (c *client) TasksByCellID(logger lager.Logger, traceID string, cellId strin CellId: cellId, } response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -737,7 +742,7 @@ func (c *client) TaskByGuid(logger lager.Logger, traceID string, taskGuid string TaskGuid: taskGuid, } response := models.TaskResponse{} - err := c.doRequest(logger, traceID, TaskByGuidRoute_r3, nil, nil, &request, &response) + err := c.doRequest(logger, traceID, TaskByGuidRoute_r3, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return nil, err } @@ -747,7 +752,7 @@ func (c *client) TaskByGuid(logger lager.Logger, traceID string, taskGuid string func (c *client) doTaskLifecycleRequest(logger lager.Logger, traceID string, route string, request proto.Message) error { response := models.TaskLifecycleResponse{} - err := c.doRequest(logger, traceID, route, nil, nil, request, &response) + err := c.doRequest(logger, traceID, route, nil, nil, request, response.ToProto()) if err != nil { return err } @@ -761,7 +766,7 @@ func (c *client) DesireTask(logger lager.Logger, traceID string, taskGuid, domai Domain: domain, TaskDefinition: taskDef, } - return c.doTaskLifecycleRequest(logger, traceID, route, &request) + return c.doTaskLifecycleRequest(logger, traceID, route, request.ToProto()) } func (c *client) StartTask(logger lager.Logger, traceID string, taskGuid string, cellId string) (bool, error) { @@ -770,7 +775,7 @@ func (c *client) StartTask(logger lager.Logger, traceID string, taskGuid string, CellId: cellId, } response := &models.StartTaskResponse{} - err := c.doRequest(logger, traceID, StartTaskRoute_r0, nil, nil, request, response) + err := c.doRequest(logger, traceID, StartTaskRoute_r0, nil, nil, request.ToProto(), response.ToProto()) if err != nil { return false, err } @@ -782,7 +787,7 @@ func (c *client) CancelTask(logger lager.Logger, traceID string, taskGuid string TaskGuid: taskGuid, } route := CancelTaskRoute_r0 - return c.doTaskLifecycleRequest(logger, traceID, route, &request) + return c.doTaskLifecycleRequest(logger, traceID, route, request.ToProto()) } func (c *client) ResolvingTask(logger lager.Logger, traceID string, taskGuid string) error { @@ -790,7 +795,7 @@ func (c *client) ResolvingTask(logger lager.Logger, traceID string, taskGuid str TaskGuid: taskGuid, } route := ResolvingTaskRoute_r0 - return c.doTaskLifecycleRequest(logger, traceID, route, &request) + return c.doTaskLifecycleRequest(logger, traceID, route, request.ToProto()) } func (c *client) DeleteTask(logger lager.Logger, traceID string, taskGuid string) error { @@ -798,7 +803,7 @@ func (c *client) DeleteTask(logger lager.Logger, traceID string, taskGuid string TaskGuid: taskGuid, } route := DeleteTaskRoute_r0 - return c.doTaskLifecycleRequest(logger, traceID, route, &request) + return c.doTaskLifecycleRequest(logger, traceID, route, request.ToProto()) } // Deprecated: use CancelTask instead @@ -808,7 +813,7 @@ func (c *client) FailTask(logger lager.Logger, traceID string, taskGuid string, FailureReason: failureReason, } route := FailTaskRoute_r0 - return c.doTaskLifecycleRequest(logger, traceID, route, &request) + return c.doTaskLifecycleRequest(logger, traceID, route, request.ToProto()) } func (c *client) RejectTask(logger lager.Logger, traceID string, taskGuid string, rejectionReason string) error { @@ -817,7 +822,7 @@ func (c *client) RejectTask(logger lager.Logger, traceID string, taskGuid string RejectionReason: rejectionReason, } route := RejectTaskRoute_r0 - return c.doTaskLifecycleRequest(logger, traceID, route, &request) + return c.doTaskLifecycleRequest(logger, traceID, route, request.ToProto()) } func (c *client) CompleteTask(logger lager.Logger, traceID string, taskGuid string, cellId string, failed bool, failureReason, result string) error { @@ -829,14 +834,14 @@ func (c *client) CompleteTask(logger lager.Logger, traceID string, taskGuid stri Result: result, } route := CompleteTaskRoute_r0 - return c.doTaskLifecycleRequest(logger, traceID, route, &request) + return c.doTaskLifecycleRequest(logger, traceID, route, request.ToProto()) } func (c *client) subscribeToEvents(route string, cellId string) (events.EventSource, error) { request := models.EventsByCellId{ CellId: cellId, } - messageBody, err := proto.Marshal(&request) + messageBody, err := proto.Marshal(request.ToProto()) if err != nil { return nil, err } @@ -889,7 +894,7 @@ func (c *client) SubscribeToInstanceEventsByCellID(logger lager.Logger, cellId s func (c *client) Cells(logger lager.Logger, traceID string) ([]*models.CellPresence, error) { response := models.CellsResponse{} - err := c.doRequest(logger, traceID, CellsRoute_r0, nil, nil, nil, &response) + err := c.doRequest(logger, traceID, CellsRoute_r0, nil, nil, nil, response.ToProto()) if err != nil { return nil, err } @@ -920,7 +925,7 @@ func (c *client) createRequest(traceID string, requestName string, params rata.P func (c *client) doEvacRequest(logger lager.Logger, traceID string, route string, defaultKeepContainer bool, request proto.Message) (bool, error) { var response models.EvacuationResponse - err := c.doRequest(logger, traceID, route, nil, nil, request, &response) + err := c.doRequest(logger, traceID, route, nil, nil, request, response.ToProto()) if err != nil { return defaultKeepContainer, err } diff --git a/client_test.go b/client_test.go index 37bc9968..c1e42668 100644 --- a/client_test.go +++ b/client_test.go @@ -61,33 +61,36 @@ var _ = Describe("Client", func() { It("populates the request", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) request := models.StartActualLRPRequest{ - ActualLrpKey: &actualLRP.ActualLRPKey, - ActualLrpInstanceKey: &actualLRP.ActualLRPInstanceKey, - ActualLrpNetInfo: &actualLRP.ActualLRPNetInfo, + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, ActualLrpInternalRoutes: actualLRP.ActualLrpInternalRoutes, MetricTags: actualLRP.MetricTags, AvailabilityZone: actualLRP.AvailabilityZone, } - request.SetRoutable(false) + routable := false + request.SetRoutable(&routable) + response := &models.ActualLRPLifecycleResponse{Error: nil} bbsServer.AppendHandlers( ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/start.r1"), ghttp.VerifyHeader(http.Header{"X-Vcap-Request-Id": []string{"some-trace-id"}}), - ghttp.VerifyProtoRepresenting(&request), - ghttp.RespondWithProto(200, &models.ActualLRPLifecycleResponse{Error: nil}), + ghttp.VerifyProtoRepresenting(request.ToProto()), + ghttp.RespondWithProto(200, response.ToProto()), ), ) - err := internalClient.StartActualLRP(logger, "some-trace-id", &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) + err := internalClient.StartActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) It("Calls the current endpoint", func() { + response := &models.ActualLRPLifecycleResponse{Error: nil} bbsServer.AppendHandlers( ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/start.r1"), ghttp.VerifyHeader(http.Header{"X-Vcap-Request-Id": []string{"some-trace-id"}}), - ghttp.RespondWithProto(200, &models.ActualLRPLifecycleResponse{Error: nil}), + ghttp.RespondWithProto(200, response.ToProto()), ), ) @@ -97,6 +100,15 @@ var _ = Describe("Client", func() { It("Falls back to the deprecated endpoint if the current endpoint returns a 404", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) + request := &models.StartActualLRPRequest{ + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, + ActualLrpInternalRoutes: nil, + MetricTags: nil, + AvailabilityZone: "", + } + response := &models.ActualLRPLifecycleResponse{Error: nil} bbsServer.AppendHandlers( ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/start.r1"), @@ -106,19 +118,12 @@ var _ = Describe("Client", func() { ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/start"), ghttp.VerifyHeader(http.Header{"X-Vcap-Request-Id": []string{"some-trace-id"}}), - ghttp.VerifyProtoRepresenting(&models.StartActualLRPRequest{ - ActualLrpKey: &actualLRP.ActualLRPKey, - ActualLrpInstanceKey: &actualLRP.ActualLRPInstanceKey, - ActualLrpNetInfo: &actualLRP.ActualLRPNetInfo, - ActualLrpInternalRoutes: nil, - MetricTags: nil, - AvailabilityZone: "", - }), - ghttp.RespondWithProto(200, &models.ActualLRPLifecycleResponse{Error: nil}), + ghttp.VerifyProtoRepresenting(request.ToProto()), + ghttp.RespondWithProto(200, response.ToProto()), ), ) - err := internalClient.StartActualLRP(logger, "some-trace-id", &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, actualLRP.GetRoutable(), actualLRP.AvailabilityZone) + err := internalClient.StartActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -157,32 +162,35 @@ var _ = Describe("Client", func() { Context("evacuateRunningActualLrp", func() { It("populates the request", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) + request := &models.EvacuateRunningActualLRPRequest{ + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, + ActualLrpInternalRoutes: actualLRP.ActualLrpInternalRoutes, + MetricTags: actualLRP.MetricTags, + AvailabilityZone: actualLRP.AvailabilityZone, + Routable: actualLRP.GetRoutable(), + } + response := &models.EvacuationResponse{KeepContainer: true, Error: nil} bbsServer.AppendHandlers( ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/evacuate_running.r1"), ghttp.VerifyHeader(http.Header{"X-Vcap-Request-Id": []string{"some-trace-id"}}), - ghttp.VerifyProtoRepresenting(&models.EvacuateRunningActualLRPRequest{ - ActualLrpKey: &actualLRP.ActualLRPKey, - ActualLrpInstanceKey: &actualLRP.ActualLRPInstanceKey, - ActualLrpNetInfo: &actualLRP.ActualLRPNetInfo, - ActualLrpInternalRoutes: actualLRP.ActualLrpInternalRoutes, - MetricTags: actualLRP.MetricTags, - AvailabilityZone: actualLRP.AvailabilityZone, - OptionalRoutable: &models.EvacuateRunningActualLRPRequest_Routable{Routable: actualLRP.GetRoutable()}, - }), - ghttp.RespondWithProto(200, &models.EvacuationResponse{KeepContainer: true, Error: nil}), + ghttp.VerifyProtoRepresenting(request.ToProto()), + ghttp.RespondWithProto(200, response.ToProto()), ), ) - _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, actualLRP.GetRoutable(), actualLRP.AvailabilityZone) + _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) It("Calls the current endpoint", func() { + response := &models.EvacuationResponse{KeepContainer: true, Error: nil} bbsServer.AppendHandlers( ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/evacuate_running.r1"), ghttp.VerifyHeader(http.Header{"X-Vcap-Request-Id": []string{"some-trace-id"}}), - ghttp.RespondWithProto(200, &models.EvacuationResponse{KeepContainer: true, Error: nil}), + ghttp.RespondWithProto(200, response.ToProto()), ), ) @@ -192,6 +200,16 @@ var _ = Describe("Client", func() { It("Falls back to the deprecated endpoint if the current endpoint returns a 404", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) + request := &models.EvacuateRunningActualLRPRequest{ + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, + ActualLrpInternalRoutes: nil, + MetricTags: nil, + Routable: nil, + AvailabilityZone: "", + } + response := &models.EvacuationResponse{KeepContainer: true, Error: nil} bbsServer.AppendHandlers( ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/evacuate_running.r1"), @@ -201,20 +219,12 @@ var _ = Describe("Client", func() { ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrps/evacuate_running"), ghttp.VerifyHeader(http.Header{"X-Vcap-Request-Id": []string{"some-trace-id"}}), - ghttp.VerifyProtoRepresenting(&models.EvacuateRunningActualLRPRequest{ - ActualLrpKey: &actualLRP.ActualLRPKey, - ActualLrpInstanceKey: &actualLRP.ActualLRPInstanceKey, - ActualLrpNetInfo: &actualLRP.ActualLRPNetInfo, - ActualLrpInternalRoutes: nil, - MetricTags: nil, - OptionalRoutable: nil, - AvailabilityZone: "", - }), - ghttp.RespondWithProto(200, &models.EvacuationResponse{KeepContainer: true, Error: nil}), + ghttp.VerifyProtoRepresenting(request.ToProto()), + ghttp.RespondWithProto(200, response.ToProto()), ), ) - _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) + _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -342,6 +352,16 @@ var _ = Describe("Client", func() { }) JustBeforeEach(func() { + response := &models.ActualLRPGroupsResponse{ + //lint:ignore SA1019 - testing of deprecated code + ActualLrpGroups: []*models.ActualLRPGroup{ + { + Instance: &models.ActualLRP{ + State: "running", + }, + }, + }, + } bbsServer.AppendHandlers( ghttp.CombineHandlers( ghttp.VerifyRequest("POST", "/v1/actual_lrp_groups/list"), @@ -350,16 +370,7 @@ var _ = Describe("Client", func() { <-blockCh }, //lint:ignore SA1019 - testing of deprecated code - ghttp.RespondWithProto(200, &models.ActualLRPGroupsResponse{ - //lint:ignore SA1019 - testing of deprecated code - ActualLrpGroups: []*models.ActualLRPGroup{ - { - Instance: &models.ActualLRP{ - State: "running", - }, - }, - }, - }), + ghttp.RespondWithProto(200, response.ToProto()), ), ) }) From be6b673c045003cb07745802ae04c57571aa24c2 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 14 May 2024 16:44:38 +0000 Subject: [PATCH 068/155] CodeGen: add nil checks for ToProto and FromProto methods Regen protos --- models/actions_bbs.pb.go | 88 +++++++++++++++++ models/actual_lrp_bbs.pb.go | 56 +++++++++++ models/actual_lrp_requests_bbs.pb.go | 112 ++++++++++++++++++++++ models/cached_dependency_bbs.pb.go | 8 ++ models/cells_bbs.pb.go | 32 +++++++ models/certificate_properties_bbs.pb.go | 8 ++ models/check_definition_bbs.pb.go | 32 +++++++ models/desired_lrp_bbs.pb.go | 48 ++++++++++ models/desired_lrp_requests_bbs.pb.go | 80 ++++++++++++++++ models/domain_bbs.pb.go | 24 +++++ models/environment_variables_bbs.pb.go | 8 ++ models/error_bbs.pb.go | 8 ++ models/evacuation_bbs.pb.go | 56 +++++++++++ models/events_bbs.pb.go | 120 ++++++++++++++++++++++++ models/image_layer_bbs.pb.go | 8 ++ models/log_rate_limit_bbs.pb.go | 8 ++ models/metric_tags_bbs.pb.go | 8 ++ models/modification_tag_bbs.pb.go | 8 ++ models/network_bbs.pb.go | 8 ++ models/ping_bbs.pb.go | 8 ++ models/security_group_bbs.pb.go | 24 +++++ models/sidecar_bbs.pb.go | 8 ++ models/task_bbs.pb.go | 16 ++++ models/task_requests_bbs.pb.go | 104 ++++++++++++++++++++ models/volume_mount_bbs.pb.go | 24 +++++ protoc-gen-go-bbs/bbs.go | 8 ++ 26 files changed, 912 insertions(+) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index b42f8963..a78d3168 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -170,6 +170,10 @@ func (m *Action) SetCodependentAction(value *CodependentAction) { } } func (x *Action) ToProto() *ProtoAction { + if x == nil { + return nil + } + proto := &ProtoAction{ DownloadAction: x.DownloadAction.ToProto(), UploadAction: x.UploadAction.ToProto(), @@ -185,6 +189,10 @@ func (x *Action) ToProto() *ProtoAction { } func (x *ProtoAction) FromProto() *Action { + if x == nil { + return nil + } + copysafe := &Action{ DownloadAction: x.DownloadAction.FromProto(), UploadAction: x.UploadAction.FromProto(), @@ -364,6 +372,10 @@ func (m *DownloadAction) SetChecksumValue(value string) { } } func (x *DownloadAction) ToProto() *ProtoDownloadAction { + if x == nil { + return nil + } + proto := &ProtoDownloadAction{ Artifact: x.Artifact, From: x.From, @@ -378,6 +390,10 @@ func (x *DownloadAction) ToProto() *ProtoDownloadAction { } func (x *ProtoDownloadAction) FromProto() *DownloadAction { + if x == nil { + return nil + } + copysafe := &DownloadAction{ Artifact: x.Artifact, From: x.From, @@ -511,6 +527,10 @@ func (m *UploadAction) SetUser(value string) { } } func (x *UploadAction) ToProto() *ProtoUploadAction { + if x == nil { + return nil + } + proto := &ProtoUploadAction{ Artifact: x.Artifact, From: x.From, @@ -522,6 +542,10 @@ func (x *UploadAction) ToProto() *ProtoUploadAction { } func (x *ProtoUploadAction) FromProto() *UploadAction { + if x == nil { + return nil + } + copysafe := &UploadAction{ Artifact: x.Artifact, From: x.From, @@ -707,6 +731,10 @@ func (m *RunAction) SetSuppressLogOutput(value bool) { } } func (x *RunAction) ToProto() *ProtoRunAction { + if x == nil { + return nil + } + proto := &ProtoRunAction{ Path: x.Path, Args: x.Args, @@ -721,6 +749,10 @@ func (x *RunAction) ToProto() *ProtoRunAction { } func (x *ProtoRunAction) FromProto() *RunAction { + if x == nil { + return nil + } + copysafe := &RunAction{ Path: x.Path, Args: x.Args, @@ -841,6 +873,10 @@ func (m *TimeoutAction) SetTimeoutMs(value int64) { } } func (x *TimeoutAction) ToProto() *ProtoTimeoutAction { + if x == nil { + return nil + } + proto := &ProtoTimeoutAction{ Action: x.Action.ToProto(), DeprecatedTimeoutNs: x.DeprecatedTimeoutNs, @@ -851,6 +887,10 @@ func (x *TimeoutAction) ToProto() *ProtoTimeoutAction { } func (x *ProtoTimeoutAction) FromProto() *TimeoutAction { + if x == nil { + return nil + } + copysafe := &TimeoutAction{ Action: x.Action.FromProto(), DeprecatedTimeoutNs: x.DeprecatedTimeoutNs, @@ -980,6 +1020,10 @@ func (m *EmitProgressAction) SetLogSource(value string) { } } func (x *EmitProgressAction) ToProto() *ProtoEmitProgressAction { + if x == nil { + return nil + } + proto := &ProtoEmitProgressAction{ Action: x.Action.ToProto(), StartMessage: x.StartMessage, @@ -991,6 +1035,10 @@ func (x *EmitProgressAction) ToProto() *ProtoEmitProgressAction { } func (x *ProtoEmitProgressAction) FromProto() *EmitProgressAction { + if x == nil { + return nil + } + copysafe := &EmitProgressAction{ Action: x.Action.FromProto(), StartMessage: x.StartMessage, @@ -1076,6 +1124,10 @@ func (m *TryAction) SetLogSource(value string) { } } func (x *TryAction) ToProto() *ProtoTryAction { + if x == nil { + return nil + } + proto := &ProtoTryAction{ Action: x.Action.ToProto(), LogSource: x.LogSource, @@ -1084,6 +1136,10 @@ func (x *TryAction) ToProto() *ProtoTryAction { } func (x *ProtoTryAction) FromProto() *TryAction { + if x == nil { + return nil + } + copysafe := &TryAction{ Action: x.Action.FromProto(), LogSource: x.LogSource, @@ -1171,6 +1227,10 @@ func (m *ParallelAction) SetLogSource(value string) { } } func (x *ParallelAction) ToProto() *ProtoParallelAction { + if x == nil { + return nil + } + proto := &ProtoParallelAction{ Actions: ActionToProtoSlice(x.Actions), LogSource: x.LogSource, @@ -1179,6 +1239,10 @@ func (x *ParallelAction) ToProto() *ProtoParallelAction { } func (x *ProtoParallelAction) FromProto() *ParallelAction { + if x == nil { + return nil + } + copysafe := &ParallelAction{ Actions: ActionFromProtoSlice(x.Actions), LogSource: x.LogSource, @@ -1266,6 +1330,10 @@ func (m *SerialAction) SetLogSource(value string) { } } func (x *SerialAction) ToProto() *ProtoSerialAction { + if x == nil { + return nil + } + proto := &ProtoSerialAction{ Actions: ActionToProtoSlice(x.Actions), LogSource: x.LogSource, @@ -1274,6 +1342,10 @@ func (x *SerialAction) ToProto() *ProtoSerialAction { } func (x *ProtoSerialAction) FromProto() *SerialAction { + if x == nil { + return nil + } + copysafe := &SerialAction{ Actions: ActionFromProtoSlice(x.Actions), LogSource: x.LogSource, @@ -1361,6 +1433,10 @@ func (m *CodependentAction) SetLogSource(value string) { } } func (x *CodependentAction) ToProto() *ProtoCodependentAction { + if x == nil { + return nil + } + proto := &ProtoCodependentAction{ Actions: ActionToProtoSlice(x.Actions), LogSource: x.LogSource, @@ -1369,6 +1445,10 @@ func (x *CodependentAction) ToProto() *ProtoCodependentAction { } func (x *ProtoCodependentAction) FromProto() *CodependentAction { + if x == nil { + return nil + } + copysafe := &CodependentAction{ Actions: ActionFromProtoSlice(x.Actions), LogSource: x.LogSource, @@ -1459,6 +1539,10 @@ func (m *ResourceLimits) SetNproc(value *uint64) { } } func (x *ResourceLimits) ToProto() *ProtoResourceLimits { + if x == nil { + return nil + } + proto := &ProtoResourceLimits{ Nofile: x.Nofile, Nproc: x.Nproc, @@ -1467,6 +1551,10 @@ func (x *ResourceLimits) ToProto() *ProtoResourceLimits { } func (x *ProtoResourceLimits) FromProto() *ResourceLimits { + if x == nil { + return nil + } + copysafe := &ResourceLimits{ Nofile: x.Nofile, Nproc: x.Nproc, diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index dfa456f4..941d0b6e 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -69,6 +69,10 @@ func (m *ActualLRPGroup) SetEvacuating(value *ActualLRP) { } } func (x *ActualLRPGroup) ToProto() *ProtoActualLRPGroup { + if x == nil { + return nil + } + proto := &ProtoActualLRPGroup{ Instance: x.Instance.ToProto(), Evacuating: x.Evacuating.ToProto(), @@ -77,6 +81,10 @@ func (x *ActualLRPGroup) ToProto() *ProtoActualLRPGroup { } func (x *ProtoActualLRPGroup) FromProto() *ActualLRPGroup { + if x == nil { + return nil + } + copysafe := &ActualLRPGroup{ Instance: x.Instance.FromProto(), Evacuating: x.Evacuating.FromProto(), @@ -189,6 +197,10 @@ func (m *PortMapping) SetHostTlsProxyPort(value uint32) { } } func (x *PortMapping) ToProto() *ProtoPortMapping { + if x == nil { + return nil + } + proto := &ProtoPortMapping{ ContainerPort: x.ContainerPort, HostPort: x.HostPort, @@ -199,6 +211,10 @@ func (x *PortMapping) ToProto() *ProtoPortMapping { } func (x *ProtoPortMapping) FromProto() *PortMapping { + if x == nil { + return nil + } + copysafe := &PortMapping{ ContainerPort: x.ContainerPort, HostPort: x.HostPort, @@ -298,6 +314,10 @@ func (m *ActualLRPKey) SetDomain(value string) { } } func (x *ActualLRPKey) ToProto() *ProtoActualLRPKey { + if x == nil { + return nil + } + proto := &ProtoActualLRPKey{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -307,6 +327,10 @@ func (x *ActualLRPKey) ToProto() *ProtoActualLRPKey { } func (x *ProtoActualLRPKey) FromProto() *ActualLRPKey { + if x == nil { + return nil + } + copysafe := &ActualLRPKey{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -390,6 +414,10 @@ func (m *ActualLRPInstanceKey) SetCellId(value string) { } } func (x *ActualLRPInstanceKey) ToProto() *ProtoActualLRPInstanceKey { + if x == nil { + return nil + } + proto := &ProtoActualLRPInstanceKey{ InstanceGuid: x.InstanceGuid, CellId: x.CellId, @@ -398,6 +426,10 @@ func (x *ActualLRPInstanceKey) ToProto() *ProtoActualLRPInstanceKey { } func (x *ProtoActualLRPInstanceKey) FromProto() *ActualLRPInstanceKey { + if x == nil { + return nil + } + copysafe := &ActualLRPInstanceKey{ InstanceGuid: x.InstanceGuid, CellId: x.CellId, @@ -545,6 +577,10 @@ func (m *ActualLRPNetInfo) SetPreferredAddress(value ActualLRPNetInfo_PreferredA } } func (x *ActualLRPNetInfo) ToProto() *ProtoActualLRPNetInfo { + if x == nil { + return nil + } + proto := &ProtoActualLRPNetInfo{ Address: x.Address, Ports: PortMappingToProtoSlice(x.Ports), @@ -555,6 +591,10 @@ func (x *ActualLRPNetInfo) ToProto() *ProtoActualLRPNetInfo { } func (x *ProtoActualLRPNetInfo) FromProto() *ActualLRPNetInfo { + if x == nil { + return nil + } + copysafe := &ActualLRPNetInfo{ Address: x.Address, Ports: PortMappingFromProtoSlice(x.Ports), @@ -624,6 +664,10 @@ func (m *ActualLRPInternalRoute) SetHostname(value string) { } } func (x *ActualLRPInternalRoute) ToProto() *ProtoActualLRPInternalRoute { + if x == nil { + return nil + } + proto := &ProtoActualLRPInternalRoute{ Hostname: x.Hostname, } @@ -631,6 +675,10 @@ func (x *ActualLRPInternalRoute) ToProto() *ProtoActualLRPInternalRoute { } func (x *ProtoActualLRPInternalRoute) FromProto() *ActualLRPInternalRoute { + if x == nil { + return nil + } + copysafe := &ActualLRPInternalRoute{ Hostname: x.Hostname, } @@ -935,6 +983,10 @@ func (m *ActualLRP) SetAvailabilityZone(value string) { } } func (x *ActualLRP) ToProto() *ProtoActualLRP { + if x == nil { + return nil + } + proto := &ProtoActualLRP{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -955,6 +1007,10 @@ func (x *ActualLRP) ToProto() *ProtoActualLRP { } func (x *ProtoActualLRP) FromProto() *ActualLRP { + if x == nil { + return nil + } + copysafe := &ActualLRP{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 08f311b0..7d9cc337 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -50,6 +50,10 @@ func (m *ActualLRPLifecycleResponse) SetError(value *Error) { } } func (x *ActualLRPLifecycleResponse) ToProto() *ProtoActualLRPLifecycleResponse { + if x == nil { + return nil + } + proto := &ProtoActualLRPLifecycleResponse{ Error: x.Error.ToProto(), } @@ -57,6 +61,10 @@ func (x *ActualLRPLifecycleResponse) ToProto() *ProtoActualLRPLifecycleResponse } func (x *ProtoActualLRPLifecycleResponse) FromProto() *ActualLRPLifecycleResponse { + if x == nil { + return nil + } + copysafe := &ActualLRPLifecycleResponse{ Error: x.Error.FromProto(), } @@ -143,6 +151,10 @@ func (m *ActualLRPGroupsResponse) SetActualLrpGroups(value []*ActualLRPGroup) { } } func (x *ActualLRPGroupsResponse) ToProto() *ProtoActualLRPGroupsResponse { + if x == nil { + return nil + } + proto := &ProtoActualLRPGroupsResponse{ Error: x.Error.ToProto(), ActualLrpGroups: ActualLRPGroupToProtoSlice(x.ActualLrpGroups), @@ -151,6 +163,10 @@ func (x *ActualLRPGroupsResponse) ToProto() *ProtoActualLRPGroupsResponse { } func (x *ProtoActualLRPGroupsResponse) FromProto() *ActualLRPGroupsResponse { + if x == nil { + return nil + } + copysafe := &ActualLRPGroupsResponse{ Error: x.Error.FromProto(), ActualLrpGroups: ActualLRPGroupFromProtoSlice(x.ActualLrpGroups), @@ -233,6 +249,10 @@ func (m *ActualLRPGroupResponse) SetActualLrpGroup(value *ActualLRPGroup) { } } func (x *ActualLRPGroupResponse) ToProto() *ProtoActualLRPGroupResponse { + if x == nil { + return nil + } + proto := &ProtoActualLRPGroupResponse{ Error: x.Error.ToProto(), ActualLrpGroup: x.ActualLrpGroup.ToProto(), @@ -241,6 +261,10 @@ func (x *ActualLRPGroupResponse) ToProto() *ProtoActualLRPGroupResponse { } func (x *ProtoActualLRPGroupResponse) FromProto() *ActualLRPGroupResponse { + if x == nil { + return nil + } + copysafe := &ActualLRPGroupResponse{ Error: x.Error.FromProto(), ActualLrpGroup: x.ActualLrpGroup.FromProto(), @@ -323,6 +347,10 @@ func (m *ActualLRPGroupsRequest) SetCellId(value string) { } } func (x *ActualLRPGroupsRequest) ToProto() *ProtoActualLRPGroupsRequest { + if x == nil { + return nil + } + proto := &ProtoActualLRPGroupsRequest{ Domain: x.Domain, CellId: x.CellId, @@ -331,6 +359,10 @@ func (x *ActualLRPGroupsRequest) ToProto() *ProtoActualLRPGroupsRequest { } func (x *ProtoActualLRPGroupsRequest) FromProto() *ActualLRPGroupsRequest { + if x == nil { + return nil + } + copysafe := &ActualLRPGroupsRequest{ Domain: x.Domain, CellId: x.CellId, @@ -398,6 +430,10 @@ func (m *ActualLRPGroupsByProcessGuidRequest) SetProcessGuid(value string) { } } func (x *ActualLRPGroupsByProcessGuidRequest) ToProto() *ProtoActualLRPGroupsByProcessGuidRequest { + if x == nil { + return nil + } + proto := &ProtoActualLRPGroupsByProcessGuidRequest{ ProcessGuid: x.ProcessGuid, } @@ -405,6 +441,10 @@ func (x *ActualLRPGroupsByProcessGuidRequest) ToProto() *ProtoActualLRPGroupsByP } func (x *ProtoActualLRPGroupsByProcessGuidRequest) FromProto() *ActualLRPGroupsByProcessGuidRequest { + if x == nil { + return nil + } + copysafe := &ActualLRPGroupsByProcessGuidRequest{ ProcessGuid: x.ProcessGuid, } @@ -486,6 +526,10 @@ func (m *ActualLRPGroupByProcessGuidAndIndexRequest) SetIndex(value int32) { } } func (x *ActualLRPGroupByProcessGuidAndIndexRequest) ToProto() *ProtoActualLRPGroupByProcessGuidAndIndexRequest { + if x == nil { + return nil + } + proto := &ProtoActualLRPGroupByProcessGuidAndIndexRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -494,6 +538,10 @@ func (x *ActualLRPGroupByProcessGuidAndIndexRequest) ToProto() *ProtoActualLRPGr } func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) FromProto() *ActualLRPGroupByProcessGuidAndIndexRequest { + if x == nil { + return nil + } + copysafe := &ActualLRPGroupByProcessGuidAndIndexRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -591,6 +639,10 @@ func (m *ClaimActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstance } } func (x *ClaimActualLRPRequest) ToProto() *ProtoClaimActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoClaimActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -600,6 +652,10 @@ func (x *ClaimActualLRPRequest) ToProto() *ProtoClaimActualLRPRequest { } func (x *ProtoClaimActualLRPRequest) FromProto() *ClaimActualLRPRequest { + if x == nil { + return nil + } + copysafe := &ClaimActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -771,6 +827,10 @@ func (m *StartActualLRPRequest) SetAvailabilityZone(value string) { } } func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoStartActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -784,6 +844,10 @@ func (x *StartActualLRPRequest) ToProto() *ProtoStartActualLRPRequest { } func (x *ProtoStartActualLRPRequest) FromProto() *StartActualLRPRequest { + if x == nil { + return nil + } + copysafe := &StartActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -886,6 +950,10 @@ func (m *CrashActualLRPRequest) SetErrorMessage(value string) { } } func (x *CrashActualLRPRequest) ToProto() *ProtoCrashActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoCrashActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -895,6 +963,10 @@ func (x *CrashActualLRPRequest) ToProto() *ProtoCrashActualLRPRequest { } func (x *ProtoCrashActualLRPRequest) FromProto() *CrashActualLRPRequest { + if x == nil { + return nil + } + copysafe := &CrashActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -978,6 +1050,10 @@ func (m *FailActualLRPRequest) SetErrorMessage(value string) { } } func (x *FailActualLRPRequest) ToProto() *ProtoFailActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoFailActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ErrorMessage: x.ErrorMessage, @@ -986,6 +1062,10 @@ func (x *FailActualLRPRequest) ToProto() *ProtoFailActualLRPRequest { } func (x *ProtoFailActualLRPRequest) FromProto() *FailActualLRPRequest { + if x == nil { + return nil + } + copysafe := &FailActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ErrorMessage: x.ErrorMessage, @@ -1053,6 +1133,10 @@ func (m *RetireActualLRPRequest) SetActualLrpKey(value *ActualLRPKey) { } } func (x *RetireActualLRPRequest) ToProto() *ProtoRetireActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoRetireActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), } @@ -1060,6 +1144,10 @@ func (x *RetireActualLRPRequest) ToProto() *ProtoRetireActualLRPRequest { } func (x *ProtoRetireActualLRPRequest) FromProto() *RetireActualLRPRequest { + if x == nil { + return nil + } + copysafe := &RetireActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), } @@ -1156,6 +1244,10 @@ func (m *RemoveActualLRPRequest) SetActualLrpInstanceKey(value *ActualLRPInstanc } } func (x *RemoveActualLRPRequest) ToProto() *ProtoRemoveActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoRemoveActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -1165,6 +1257,10 @@ func (x *RemoveActualLRPRequest) ToProto() *ProtoRemoveActualLRPRequest { } func (x *ProtoRemoveActualLRPRequest) FromProto() *RemoveActualLRPRequest { + if x == nil { + return nil + } + copysafe := &RemoveActualLRPRequest{ ProcessGuid: x.ProcessGuid, Index: x.Index, @@ -1253,6 +1349,10 @@ func (m *ActualLRPsResponse) SetActualLrps(value []*ActualLRP) { } } func (x *ActualLRPsResponse) ToProto() *ProtoActualLRPsResponse { + if x == nil { + return nil + } + proto := &ProtoActualLRPsResponse{ Error: x.Error.ToProto(), ActualLrps: ActualLRPToProtoSlice(x.ActualLrps), @@ -1261,6 +1361,10 @@ func (x *ActualLRPsResponse) ToProto() *ProtoActualLRPsResponse { } func (x *ProtoActualLRPsResponse) FromProto() *ActualLRPsResponse { + if x == nil { + return nil + } + copysafe := &ActualLRPsResponse{ Error: x.Error.FromProto(), ActualLrps: ActualLRPFromProtoSlice(x.ActualLrps), @@ -1376,6 +1480,10 @@ func (m *ActualLRPsRequest) SetIndex(value *int32) { } } func (x *ActualLRPsRequest) ToProto() *ProtoActualLRPsRequest { + if x == nil { + return nil + } + proto := &ProtoActualLRPsRequest{ Domain: x.Domain, CellId: x.CellId, @@ -1386,6 +1494,10 @@ func (x *ActualLRPsRequest) ToProto() *ProtoActualLRPsRequest { } func (x *ProtoActualLRPsRequest) FromProto() *ActualLRPsRequest { + if x == nil { + return nil + } + copysafe := &ActualLRPsRequest{ Domain: x.Domain, CellId: x.CellId, diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 4a2804e1..d5ba3368 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -140,6 +140,10 @@ func (m *CachedDependency) SetChecksumValue(value string) { } } func (x *CachedDependency) ToProto() *ProtoCachedDependency { + if x == nil { + return nil + } + proto := &ProtoCachedDependency{ Name: x.Name, From: x.From, @@ -153,6 +157,10 @@ func (x *CachedDependency) ToProto() *ProtoCachedDependency { } func (x *ProtoCachedDependency) FromProto() *CachedDependency { + if x == nil { + return nil + } + copysafe := &CachedDependency{ Name: x.Name, From: x.From, diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index bf97539d..ac2e25bc 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -80,6 +80,10 @@ func (m *CellCapacity) SetContainers(value int32) { } } func (x *CellCapacity) ToProto() *ProtoCellCapacity { + if x == nil { + return nil + } + proto := &ProtoCellCapacity{ MemoryMb: x.MemoryMb, DiskMb: x.DiskMb, @@ -89,6 +93,10 @@ func (x *CellCapacity) ToProto() *ProtoCellCapacity { } func (x *ProtoCellCapacity) FromProto() *CellCapacity { + if x == nil { + return nil + } + copysafe := &CellCapacity{ MemoryMb: x.MemoryMb, DiskMb: x.DiskMb, @@ -277,6 +285,10 @@ func (m *CellPresence) SetRepUrl(value string) { } } func (x *CellPresence) ToProto() *ProtoCellPresence { + if x == nil { + return nil + } + proto := &ProtoCellPresence{ CellId: x.CellId, RepAddress: x.RepAddress, @@ -291,6 +303,10 @@ func (x *CellPresence) ToProto() *ProtoCellPresence { } func (x *ProtoCellPresence) FromProto() *CellPresence { + if x == nil { + return nil + } + copysafe := &CellPresence{ CellId: x.CellId, RepAddress: x.RepAddress, @@ -384,6 +400,10 @@ func (m *Provider) SetProperties(value []string) { } } func (x *Provider) ToProto() *ProtoProvider { + if x == nil { + return nil + } + proto := &ProtoProvider{ Name: x.Name, Properties: x.Properties, @@ -392,6 +412,10 @@ func (x *Provider) ToProto() *ProtoProvider { } func (x *ProtoProvider) FromProto() *Provider { + if x == nil { + return nil + } + copysafe := &Provider{ Name: x.Name, Properties: x.Properties, @@ -479,6 +503,10 @@ func (m *CellsResponse) SetCells(value []*CellPresence) { } } func (x *CellsResponse) ToProto() *ProtoCellsResponse { + if x == nil { + return nil + } + proto := &ProtoCellsResponse{ Error: x.Error.ToProto(), Cells: CellPresenceToProtoSlice(x.Cells), @@ -487,6 +515,10 @@ func (x *CellsResponse) ToProto() *ProtoCellsResponse { } func (x *ProtoCellsResponse) FromProto() *CellsResponse { + if x == nil { + return nil + } + copysafe := &CellsResponse{ Error: x.Error.FromProto(), Cells: CellPresenceFromProtoSlice(x.Cells), diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index ef1e4a76..1bbeded2 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -55,6 +55,10 @@ func (m *CertificateProperties) SetOrganizationalUnit(value []string) { } } func (x *CertificateProperties) ToProto() *ProtoCertificateProperties { + if x == nil { + return nil + } + proto := &ProtoCertificateProperties{ OrganizationalUnit: x.OrganizationalUnit, } @@ -62,6 +66,10 @@ func (x *CertificateProperties) ToProto() *ProtoCertificateProperties { } func (x *ProtoCertificateProperties) FromProto() *CertificateProperties { + if x == nil { + return nil + } + copysafe := &CertificateProperties{ OrganizationalUnit: x.OrganizationalUnit, } diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index b1a16a29..1388a5f0 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -90,6 +90,10 @@ func (m *CheckDefinition) SetReadinessChecks(value []*Check) { } } func (x *CheckDefinition) ToProto() *ProtoCheckDefinition { + if x == nil { + return nil + } + proto := &ProtoCheckDefinition{ Checks: CheckToProtoSlice(x.Checks), LogSource: x.LogSource, @@ -99,6 +103,10 @@ func (x *CheckDefinition) ToProto() *ProtoCheckDefinition { } func (x *ProtoCheckDefinition) FromProto() *CheckDefinition { + if x == nil { + return nil + } + copysafe := &CheckDefinition{ Checks: CheckFromProtoSlice(x.Checks), LogSource: x.LogSource, @@ -182,6 +190,10 @@ func (m *Check) SetHttpCheck(value *HTTPCheck) { } } func (x *Check) ToProto() *ProtoCheck { + if x == nil { + return nil + } + proto := &ProtoCheck{ TcpCheck: x.TcpCheck.ToProto(), HttpCheck: x.HttpCheck.ToProto(), @@ -190,6 +202,10 @@ func (x *Check) ToProto() *ProtoCheck { } func (x *ProtoCheck) FromProto() *Check { + if x == nil { + return nil + } + copysafe := &Check{ TcpCheck: x.TcpCheck.FromProto(), HttpCheck: x.HttpCheck.FromProto(), @@ -287,6 +303,10 @@ func (m *TCPCheck) SetIntervalMs(value uint64) { } } func (x *TCPCheck) ToProto() *ProtoTCPCheck { + if x == nil { + return nil + } + proto := &ProtoTCPCheck{ Port: x.Port, ConnectTimeoutMs: x.ConnectTimeoutMs, @@ -296,6 +316,10 @@ func (x *TCPCheck) ToProto() *ProtoTCPCheck { } func (x *ProtoTCPCheck) FromProto() *TCPCheck { + if x == nil { + return nil + } + copysafe := &TCPCheck{ Port: x.Port, ConnectTimeoutMs: x.ConnectTimeoutMs, @@ -409,6 +433,10 @@ func (m *HTTPCheck) SetIntervalMs(value uint64) { } } func (x *HTTPCheck) ToProto() *ProtoHTTPCheck { + if x == nil { + return nil + } + proto := &ProtoHTTPCheck{ Port: x.Port, RequestTimeoutMs: x.RequestTimeoutMs, @@ -419,6 +447,10 @@ func (x *HTTPCheck) ToProto() *ProtoHTTPCheck { } func (x *ProtoHTTPCheck) FromProto() *HTTPCheck { + if x == nil { + return nil + } + copysafe := &HTTPCheck{ Port: x.Port, RequestTimeoutMs: x.RequestTimeoutMs, diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 3a525c78..4a64ec73 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -160,6 +160,10 @@ func (m *DesiredLRPSchedulingInfo) SetPlacementTags(value []string) { } } func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPSchedulingInfo{ DesiredLrpKey: x.DesiredLrpKey.ToProto(), Annotation: x.Annotation, @@ -174,6 +178,10 @@ func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { } func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { + if x == nil { + return nil + } + copysafe := &DesiredLRPSchedulingInfo{ DesiredLrpKey: x.DesiredLrpKey.FromProto(), Annotation: x.Annotation, @@ -686,6 +694,10 @@ func (m *DesiredLRPRunInfo) SetLogRateLimit(value *LogRateLimit) { } } func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPRunInfo{ DesiredLrpKey: x.DesiredLrpKey.ToProto(), EnvironmentVariables: EnvironmentVariableToProtoSlice(x.EnvironmentVariables), @@ -719,6 +731,10 @@ func (x *DesiredLRPRunInfo) ToProto() *ProtoDesiredLRPRunInfo { } func (x *ProtoDesiredLRPRunInfo) FromProto() *DesiredLRPRunInfo { + if x == nil { + return nil + } + copysafe := &DesiredLRPRunInfo{ DesiredLrpKey: x.DesiredLrpKey.FromProto(), EnvironmentVariables: EnvironmentVariableFromProtoSlice(x.EnvironmentVariables), @@ -886,6 +902,10 @@ func (m *DesiredLRPUpdate) SetMetricTags(value map[string]*MetricTagValue) { } } func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPUpdate{ Instances: x.Instances, Routes: x.Routes.ToProto(), @@ -896,6 +916,10 @@ func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { } func (x *ProtoDesiredLRPUpdate) FromProto() *DesiredLRPUpdate { + if x == nil { + return nil + } + copysafe := &DesiredLRPUpdate{ Instances: x.Instances, Routes: x.Routes.FromProto(), @@ -1011,6 +1035,10 @@ func (m *DesiredLRPKey) SetLogGuid(value string) { } } func (x *DesiredLRPKey) ToProto() *ProtoDesiredLRPKey { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPKey{ ProcessGuid: x.ProcessGuid, Domain: x.Domain, @@ -1020,6 +1048,10 @@ func (x *DesiredLRPKey) ToProto() *ProtoDesiredLRPKey { } func (x *ProtoDesiredLRPKey) FromProto() *DesiredLRPKey { + if x == nil { + return nil + } + copysafe := &DesiredLRPKey{ ProcessGuid: x.ProcessGuid, Domain: x.Domain, @@ -1133,6 +1165,10 @@ func (m *DesiredLRPResource) SetMaxPids(value int32) { } } func (x *DesiredLRPResource) ToProto() *ProtoDesiredLRPResource { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPResource{ MemoryMb: x.MemoryMb, DiskMb: x.DiskMb, @@ -1143,6 +1179,10 @@ func (x *DesiredLRPResource) ToProto() *ProtoDesiredLRPResource { } func (x *ProtoDesiredLRPResource) FromProto() *DesiredLRPResource { + if x == nil { + return nil + } + copysafe := &DesiredLRPResource{ MemoryMb: x.MemoryMb, DiskMb: x.DiskMb, @@ -1809,6 +1849,10 @@ func (m *DesiredLRP) SetLogRateLimit(value *LogRateLimit) { } } func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { + if x == nil { + return nil + } + proto := &ProtoDesiredLRP{ ProcessGuid: x.ProcessGuid, Domain: x.Domain, @@ -1852,6 +1896,10 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { } func (x *ProtoDesiredLRP) FromProto() *DesiredLRP { + if x == nil { + return nil + } + copysafe := &DesiredLRP{ ProcessGuid: x.ProcessGuid, Domain: x.Domain, diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index b54c54f2..59a4604b 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -50,6 +50,10 @@ func (m *DesiredLRPLifecycleResponse) SetError(value *Error) { } } func (x *DesiredLRPLifecycleResponse) ToProto() *ProtoDesiredLRPLifecycleResponse { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPLifecycleResponse{ Error: x.Error.ToProto(), } @@ -57,6 +61,10 @@ func (x *DesiredLRPLifecycleResponse) ToProto() *ProtoDesiredLRPLifecycleRespons } func (x *ProtoDesiredLRPLifecycleResponse) FromProto() *DesiredLRPLifecycleResponse { + if x == nil { + return nil + } + copysafe := &DesiredLRPLifecycleResponse{ Error: x.Error.FromProto(), } @@ -143,6 +151,10 @@ func (m *DesiredLRPsResponse) SetDesiredLrps(value []*DesiredLRP) { } } func (x *DesiredLRPsResponse) ToProto() *ProtoDesiredLRPsResponse { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPsResponse{ Error: x.Error.ToProto(), DesiredLrps: DesiredLRPToProtoSlice(x.DesiredLrps), @@ -151,6 +163,10 @@ func (x *DesiredLRPsResponse) ToProto() *ProtoDesiredLRPsResponse { } func (x *ProtoDesiredLRPsResponse) FromProto() *DesiredLRPsResponse { + if x == nil { + return nil + } + copysafe := &DesiredLRPsResponse{ Error: x.Error.FromProto(), DesiredLrps: DesiredLRPFromProtoSlice(x.DesiredLrps), @@ -238,6 +254,10 @@ func (m *DesiredLRPsRequest) SetProcessGuids(value []string) { } } func (x *DesiredLRPsRequest) ToProto() *ProtoDesiredLRPsRequest { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPsRequest{ Domain: x.Domain, ProcessGuids: x.ProcessGuids, @@ -246,6 +266,10 @@ func (x *DesiredLRPsRequest) ToProto() *ProtoDesiredLRPsRequest { } func (x *ProtoDesiredLRPsRequest) FromProto() *DesiredLRPsRequest { + if x == nil { + return nil + } + copysafe := &DesiredLRPsRequest{ Domain: x.Domain, ProcessGuids: x.ProcessGuids, @@ -328,6 +352,10 @@ func (m *DesiredLRPResponse) SetDesiredLrp(value *DesiredLRP) { } } func (x *DesiredLRPResponse) ToProto() *ProtoDesiredLRPResponse { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPResponse{ Error: x.Error.ToProto(), DesiredLrp: x.DesiredLrp.ToProto(), @@ -336,6 +364,10 @@ func (x *DesiredLRPResponse) ToProto() *ProtoDesiredLRPResponse { } func (x *ProtoDesiredLRPResponse) FromProto() *DesiredLRPResponse { + if x == nil { + return nil + } + copysafe := &DesiredLRPResponse{ Error: x.Error.FromProto(), DesiredLrp: x.DesiredLrp.FromProto(), @@ -423,6 +455,10 @@ func (m *DesiredLRPSchedulingInfosResponse) SetDesiredLrpSchedulingInfos(value [ } } func (x *DesiredLRPSchedulingInfosResponse) ToProto() *ProtoDesiredLRPSchedulingInfosResponse { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPSchedulingInfosResponse{ Error: x.Error.ToProto(), DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoToProtoSlice(x.DesiredLrpSchedulingInfos), @@ -431,6 +467,10 @@ func (x *DesiredLRPSchedulingInfosResponse) ToProto() *ProtoDesiredLRPScheduling } func (x *ProtoDesiredLRPSchedulingInfosResponse) FromProto() *DesiredLRPSchedulingInfosResponse { + if x == nil { + return nil + } + copysafe := &DesiredLRPSchedulingInfosResponse{ Error: x.Error.FromProto(), DesiredLrpSchedulingInfos: DesiredLRPSchedulingInfoFromProtoSlice(x.DesiredLrpSchedulingInfos), @@ -513,6 +553,10 @@ func (m *DesiredLRPSchedulingInfoByProcessGuidResponse) SetDesiredLrpSchedulingI } } func (x *DesiredLRPSchedulingInfoByProcessGuidResponse) ToProto() *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{ Error: x.Error.ToProto(), DesiredLrpSchedulingInfo: x.DesiredLrpSchedulingInfo.ToProto(), @@ -521,6 +565,10 @@ func (x *DesiredLRPSchedulingInfoByProcessGuidResponse) ToProto() *ProtoDesiredL } func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) FromProto() *DesiredLRPSchedulingInfoByProcessGuidResponse { + if x == nil { + return nil + } + copysafe := &DesiredLRPSchedulingInfoByProcessGuidResponse{ Error: x.Error.FromProto(), DesiredLrpSchedulingInfo: x.DesiredLrpSchedulingInfo.FromProto(), @@ -588,6 +636,10 @@ func (m *DesiredLRPByProcessGuidRequest) SetProcessGuid(value string) { } } func (x *DesiredLRPByProcessGuidRequest) ToProto() *ProtoDesiredLRPByProcessGuidRequest { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPByProcessGuidRequest{ ProcessGuid: x.ProcessGuid, } @@ -595,6 +647,10 @@ func (x *DesiredLRPByProcessGuidRequest) ToProto() *ProtoDesiredLRPByProcessGuid } func (x *ProtoDesiredLRPByProcessGuidRequest) FromProto() *DesiredLRPByProcessGuidRequest { + if x == nil { + return nil + } + copysafe := &DesiredLRPByProcessGuidRequest{ ProcessGuid: x.ProcessGuid, } @@ -661,6 +717,10 @@ func (m *DesireLRPRequest) SetDesiredLrp(value *DesiredLRP) { } } func (x *DesireLRPRequest) ToProto() *ProtoDesireLRPRequest { + if x == nil { + return nil + } + proto := &ProtoDesireLRPRequest{ DesiredLrp: x.DesiredLrp.ToProto(), } @@ -668,6 +728,10 @@ func (x *DesireLRPRequest) ToProto() *ProtoDesireLRPRequest { } func (x *ProtoDesireLRPRequest) FromProto() *DesireLRPRequest { + if x == nil { + return nil + } + copysafe := &DesireLRPRequest{ DesiredLrp: x.DesiredLrp.FromProto(), } @@ -749,6 +813,10 @@ func (m *UpdateDesiredLRPRequest) SetUpdate(value *DesiredLRPUpdate) { } } func (x *UpdateDesiredLRPRequest) ToProto() *ProtoUpdateDesiredLRPRequest { + if x == nil { + return nil + } + proto := &ProtoUpdateDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, Update: x.Update.ToProto(), @@ -757,6 +825,10 @@ func (x *UpdateDesiredLRPRequest) ToProto() *ProtoUpdateDesiredLRPRequest { } func (x *ProtoUpdateDesiredLRPRequest) FromProto() *UpdateDesiredLRPRequest { + if x == nil { + return nil + } + copysafe := &UpdateDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, Update: x.Update.FromProto(), @@ -824,6 +896,10 @@ func (m *RemoveDesiredLRPRequest) SetProcessGuid(value string) { } } func (x *RemoveDesiredLRPRequest) ToProto() *ProtoRemoveDesiredLRPRequest { + if x == nil { + return nil + } + proto := &ProtoRemoveDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, } @@ -831,6 +907,10 @@ func (x *RemoveDesiredLRPRequest) ToProto() *ProtoRemoveDesiredLRPRequest { } func (x *ProtoRemoveDesiredLRPRequest) FromProto() *RemoveDesiredLRPRequest { + if x == nil { + return nil + } + copysafe := &RemoveDesiredLRPRequest{ ProcessGuid: x.ProcessGuid, } diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 8b0d8089..0508a46f 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -70,6 +70,10 @@ func (m *DomainsResponse) SetDomains(value []string) { } } func (x *DomainsResponse) ToProto() *ProtoDomainsResponse { + if x == nil { + return nil + } + proto := &ProtoDomainsResponse{ Error: x.Error.ToProto(), Domains: x.Domains, @@ -78,6 +82,10 @@ func (x *DomainsResponse) ToProto() *ProtoDomainsResponse { } func (x *ProtoDomainsResponse) FromProto() *DomainsResponse { + if x == nil { + return nil + } + copysafe := &DomainsResponse{ Error: x.Error.FromProto(), Domains: x.Domains, @@ -145,6 +153,10 @@ func (m *UpsertDomainResponse) SetError(value *Error) { } } func (x *UpsertDomainResponse) ToProto() *ProtoUpsertDomainResponse { + if x == nil { + return nil + } + proto := &ProtoUpsertDomainResponse{ Error: x.Error.ToProto(), } @@ -152,6 +164,10 @@ func (x *UpsertDomainResponse) ToProto() *ProtoUpsertDomainResponse { } func (x *ProtoUpsertDomainResponse) FromProto() *UpsertDomainResponse { + if x == nil { + return nil + } + copysafe := &UpsertDomainResponse{ Error: x.Error.FromProto(), } @@ -233,6 +249,10 @@ func (m *UpsertDomainRequest) SetTtl(value uint32) { } } func (x *UpsertDomainRequest) ToProto() *ProtoUpsertDomainRequest { + if x == nil { + return nil + } + proto := &ProtoUpsertDomainRequest{ Domain: x.Domain, Ttl: x.Ttl, @@ -241,6 +261,10 @@ func (x *UpsertDomainRequest) ToProto() *ProtoUpsertDomainRequest { } func (x *ProtoUpsertDomainRequest) FromProto() *UpsertDomainRequest { + if x == nil { + return nil + } + copysafe := &UpsertDomainRequest{ Domain: x.Domain, Ttl: x.Ttl, diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 63eb20c6..fb98e619 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -65,6 +65,10 @@ func (m *EnvironmentVariable) SetValue(value string) { } } func (x *EnvironmentVariable) ToProto() *ProtoEnvironmentVariable { + if x == nil { + return nil + } + proto := &ProtoEnvironmentVariable{ Name: x.Name, Value: x.Value, @@ -73,6 +77,10 @@ func (x *EnvironmentVariable) ToProto() *ProtoEnvironmentVariable { } func (x *ProtoEnvironmentVariable) FromProto() *EnvironmentVariable { + if x == nil { + return nil + } + copysafe := &EnvironmentVariable{ Name: x.Name, Value: x.Value, diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 31ec62f9..250cfd02 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -165,6 +165,10 @@ func (m *Error) SetMessage(value string) { } } func (x *Error) ToProto() *ProtoError { + if x == nil { + return nil + } + proto := &ProtoError{ Type: ProtoError_Type(x.Type), Message: x.Message, @@ -173,6 +177,10 @@ func (x *Error) ToProto() *ProtoError { } func (x *ProtoError) FromProto() *Error { + if x == nil { + return nil + } + copysafe := &Error{ Type: Error_Type(x.Type), Message: x.Message, diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index ea16a209..ad5a5d9f 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -65,6 +65,10 @@ func (m *EvacuationResponse) SetKeepContainer(value bool) { } } func (x *EvacuationResponse) ToProto() *ProtoEvacuationResponse { + if x == nil { + return nil + } + proto := &ProtoEvacuationResponse{ Error: x.Error.ToProto(), KeepContainer: x.KeepContainer, @@ -73,6 +77,10 @@ func (x *EvacuationResponse) ToProto() *ProtoEvacuationResponse { } func (x *ProtoEvacuationResponse) FromProto() *EvacuationResponse { + if x == nil { + return nil + } + copysafe := &EvacuationResponse{ Error: x.Error.FromProto(), KeepContainer: x.KeepContainer, @@ -155,6 +163,10 @@ func (m *EvacuateClaimedActualLRPRequest) SetActualLrpInstanceKey(value *ActualL } } func (x *EvacuateClaimedActualLRPRequest) ToProto() *ProtoEvacuateClaimedActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoEvacuateClaimedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -163,6 +175,10 @@ func (x *EvacuateClaimedActualLRPRequest) ToProto() *ProtoEvacuateClaimedActualL } func (x *ProtoEvacuateClaimedActualLRPRequest) FromProto() *EvacuateClaimedActualLRPRequest { + if x == nil { + return nil + } + copysafe := &EvacuateClaimedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -333,6 +349,10 @@ func (m *EvacuateRunningActualLRPRequest) SetAvailabilityZone(value string) { } } func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoEvacuateRunningActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -346,6 +366,10 @@ func (x *EvacuateRunningActualLRPRequest) ToProto() *ProtoEvacuateRunningActualL } func (x *ProtoEvacuateRunningActualLRPRequest) FromProto() *EvacuateRunningActualLRPRequest { + if x == nil { + return nil + } + copysafe := &EvacuateRunningActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -433,6 +457,10 @@ func (m *EvacuateStoppedActualLRPRequest) SetActualLrpInstanceKey(value *ActualL } } func (x *EvacuateStoppedActualLRPRequest) ToProto() *ProtoEvacuateStoppedActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoEvacuateStoppedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -441,6 +469,10 @@ func (x *EvacuateStoppedActualLRPRequest) ToProto() *ProtoEvacuateStoppedActualL } func (x *ProtoEvacuateStoppedActualLRPRequest) FromProto() *EvacuateStoppedActualLRPRequest { + if x == nil { + return nil + } + copysafe := &EvacuateStoppedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -538,6 +570,10 @@ func (m *EvacuateCrashedActualLRPRequest) SetErrorMessage(value string) { } } func (x *EvacuateCrashedActualLRPRequest) ToProto() *ProtoEvacuateCrashedActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoEvacuateCrashedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -547,6 +583,10 @@ func (x *EvacuateCrashedActualLRPRequest) ToProto() *ProtoEvacuateCrashedActualL } func (x *ProtoEvacuateCrashedActualLRPRequest) FromProto() *EvacuateCrashedActualLRPRequest { + if x == nil { + return nil + } + copysafe := &EvacuateCrashedActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -630,6 +670,10 @@ func (m *RemoveEvacuatingActualLRPRequest) SetActualLrpInstanceKey(value *Actual } } func (x *RemoveEvacuatingActualLRPRequest) ToProto() *ProtoRemoveEvacuatingActualLRPRequest { + if x == nil { + return nil + } + proto := &ProtoRemoveEvacuatingActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -638,6 +682,10 @@ func (x *RemoveEvacuatingActualLRPRequest) ToProto() *ProtoRemoveEvacuatingActua } func (x *ProtoRemoveEvacuatingActualLRPRequest) FromProto() *RemoveEvacuatingActualLRPRequest { + if x == nil { + return nil + } + copysafe := &RemoveEvacuatingActualLRPRequest{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -705,6 +753,10 @@ func (m *RemoveEvacuatingActualLRPResponse) SetError(value *Error) { } } func (x *RemoveEvacuatingActualLRPResponse) ToProto() *ProtoRemoveEvacuatingActualLRPResponse { + if x == nil { + return nil + } + proto := &ProtoRemoveEvacuatingActualLRPResponse{ Error: x.Error.ToProto(), } @@ -712,6 +764,10 @@ func (x *RemoveEvacuatingActualLRPResponse) ToProto() *ProtoRemoveEvacuatingActu } func (x *ProtoRemoveEvacuatingActualLRPResponse) FromProto() *RemoveEvacuatingActualLRPResponse { + if x == nil { + return nil + } + copysafe := &RemoveEvacuatingActualLRPResponse{ Error: x.Error.FromProto(), } diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 6210f51b..0be5e5d9 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -50,6 +50,10 @@ func (m *ActualLRPCreatedEvent) SetActualLrpGroup(value *ActualLRPGroup) { } } func (x *ActualLRPCreatedEvent) ToProto() *ProtoActualLRPCreatedEvent { + if x == nil { + return nil + } + proto := &ProtoActualLRPCreatedEvent{ ActualLrpGroup: x.ActualLrpGroup.ToProto(), } @@ -57,6 +61,10 @@ func (x *ActualLRPCreatedEvent) ToProto() *ProtoActualLRPCreatedEvent { } func (x *ProtoActualLRPCreatedEvent) FromProto() *ActualLRPCreatedEvent { + if x == nil { + return nil + } + copysafe := &ActualLRPCreatedEvent{ ActualLrpGroup: x.ActualLrpGroup.FromProto(), } @@ -138,6 +146,10 @@ func (m *ActualLRPChangedEvent) SetAfter(value *ActualLRPGroup) { } } func (x *ActualLRPChangedEvent) ToProto() *ProtoActualLRPChangedEvent { + if x == nil { + return nil + } + proto := &ProtoActualLRPChangedEvent{ Before: x.Before.ToProto(), After: x.After.ToProto(), @@ -146,6 +158,10 @@ func (x *ActualLRPChangedEvent) ToProto() *ProtoActualLRPChangedEvent { } func (x *ProtoActualLRPChangedEvent) FromProto() *ActualLRPChangedEvent { + if x == nil { + return nil + } + copysafe := &ActualLRPChangedEvent{ Before: x.Before.FromProto(), After: x.After.FromProto(), @@ -213,6 +229,10 @@ func (m *ActualLRPRemovedEvent) SetActualLrpGroup(value *ActualLRPGroup) { } } func (x *ActualLRPRemovedEvent) ToProto() *ProtoActualLRPRemovedEvent { + if x == nil { + return nil + } + proto := &ProtoActualLRPRemovedEvent{ ActualLrpGroup: x.ActualLrpGroup.ToProto(), } @@ -220,6 +240,10 @@ func (x *ActualLRPRemovedEvent) ToProto() *ProtoActualLRPRemovedEvent { } func (x *ProtoActualLRPRemovedEvent) FromProto() *ActualLRPRemovedEvent { + if x == nil { + return nil + } + copysafe := &ActualLRPRemovedEvent{ ActualLrpGroup: x.ActualLrpGroup.FromProto(), } @@ -301,6 +325,10 @@ func (m *ActualLRPInstanceCreatedEvent) SetTraceId(value string) { } } func (x *ActualLRPInstanceCreatedEvent) ToProto() *ProtoActualLRPInstanceCreatedEvent { + if x == nil { + return nil + } + proto := &ProtoActualLRPInstanceCreatedEvent{ ActualLrp: x.ActualLrp.ToProto(), TraceId: x.TraceId, @@ -309,6 +337,10 @@ func (x *ActualLRPInstanceCreatedEvent) ToProto() *ProtoActualLRPInstanceCreated } func (x *ProtoActualLRPInstanceCreatedEvent) FromProto() *ActualLRPInstanceCreatedEvent { + if x == nil { + return nil + } + copysafe := &ActualLRPInstanceCreatedEvent{ ActualLrp: x.ActualLrp.FromProto(), TraceId: x.TraceId, @@ -514,6 +546,10 @@ func (m *ActualLRPInfo) SetAvailabilityZone(value string) { } } func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { + if x == nil { + return nil + } + proto := &ProtoActualLRPInfo{ ActualLrpNetInfo: x.ActualLrpNetInfo.ToProto(), CrashCount: x.CrashCount, @@ -530,6 +566,10 @@ func (x *ActualLRPInfo) ToProto() *ProtoActualLRPInfo { } func (x *ProtoActualLRPInfo) FromProto() *ActualLRPInfo { + if x == nil { + return nil + } + copysafe := &ActualLRPInfo{ ActualLrpNetInfo: x.ActualLrpNetInfo.FromProto(), CrashCount: x.CrashCount, @@ -665,6 +705,10 @@ func (m *ActualLRPInstanceChangedEvent) SetTraceId(value string) { } } func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChangedEvent { + if x == nil { + return nil + } + proto := &ProtoActualLRPInstanceChangedEvent{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -676,6 +720,10 @@ func (x *ActualLRPInstanceChangedEvent) ToProto() *ProtoActualLRPInstanceChanged } func (x *ProtoActualLRPInstanceChangedEvent) FromProto() *ActualLRPInstanceChangedEvent { + if x == nil { + return nil + } + copysafe := &ActualLRPInstanceChangedEvent{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -761,6 +809,10 @@ func (m *ActualLRPInstanceRemovedEvent) SetTraceId(value string) { } } func (x *ActualLRPInstanceRemovedEvent) ToProto() *ProtoActualLRPInstanceRemovedEvent { + if x == nil { + return nil + } + proto := &ProtoActualLRPInstanceRemovedEvent{ ActualLrp: x.ActualLrp.ToProto(), TraceId: x.TraceId, @@ -769,6 +821,10 @@ func (x *ActualLRPInstanceRemovedEvent) ToProto() *ProtoActualLRPInstanceRemoved } func (x *ProtoActualLRPInstanceRemovedEvent) FromProto() *ActualLRPInstanceRemovedEvent { + if x == nil { + return nil + } + copysafe := &ActualLRPInstanceRemovedEvent{ ActualLrp: x.ActualLrp.FromProto(), TraceId: x.TraceId, @@ -851,6 +907,10 @@ func (m *DesiredLRPCreatedEvent) SetTraceId(value string) { } } func (x *DesiredLRPCreatedEvent) ToProto() *ProtoDesiredLRPCreatedEvent { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPCreatedEvent{ DesiredLrp: x.DesiredLrp.ToProto(), TraceId: x.TraceId, @@ -859,6 +919,10 @@ func (x *DesiredLRPCreatedEvent) ToProto() *ProtoDesiredLRPCreatedEvent { } func (x *ProtoDesiredLRPCreatedEvent) FromProto() *DesiredLRPCreatedEvent { + if x == nil { + return nil + } + copysafe := &DesiredLRPCreatedEvent{ DesiredLrp: x.DesiredLrp.FromProto(), TraceId: x.TraceId, @@ -956,6 +1020,10 @@ func (m *DesiredLRPChangedEvent) SetTraceId(value string) { } } func (x *DesiredLRPChangedEvent) ToProto() *ProtoDesiredLRPChangedEvent { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPChangedEvent{ Before: x.Before.ToProto(), After: x.After.ToProto(), @@ -965,6 +1033,10 @@ func (x *DesiredLRPChangedEvent) ToProto() *ProtoDesiredLRPChangedEvent { } func (x *ProtoDesiredLRPChangedEvent) FromProto() *DesiredLRPChangedEvent { + if x == nil { + return nil + } + copysafe := &DesiredLRPChangedEvent{ Before: x.Before.FromProto(), After: x.After.FromProto(), @@ -1048,6 +1120,10 @@ func (m *DesiredLRPRemovedEvent) SetTraceId(value string) { } } func (x *DesiredLRPRemovedEvent) ToProto() *ProtoDesiredLRPRemovedEvent { + if x == nil { + return nil + } + proto := &ProtoDesiredLRPRemovedEvent{ DesiredLrp: x.DesiredLrp.ToProto(), TraceId: x.TraceId, @@ -1056,6 +1132,10 @@ func (x *DesiredLRPRemovedEvent) ToProto() *ProtoDesiredLRPRemovedEvent { } func (x *ProtoDesiredLRPRemovedEvent) FromProto() *DesiredLRPRemovedEvent { + if x == nil { + return nil + } + copysafe := &DesiredLRPRemovedEvent{ DesiredLrp: x.DesiredLrp.FromProto(), TraceId: x.TraceId, @@ -1183,6 +1263,10 @@ func (m *ActualLRPCrashedEvent) SetSince(value int64) { } } func (x *ActualLRPCrashedEvent) ToProto() *ProtoActualLRPCrashedEvent { + if x == nil { + return nil + } + proto := &ProtoActualLRPCrashedEvent{ ActualLrpKey: x.ActualLrpKey.ToProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.ToProto(), @@ -1194,6 +1278,10 @@ func (x *ActualLRPCrashedEvent) ToProto() *ProtoActualLRPCrashedEvent { } func (x *ProtoActualLRPCrashedEvent) FromProto() *ActualLRPCrashedEvent { + if x == nil { + return nil + } + copysafe := &ActualLRPCrashedEvent{ ActualLrpKey: x.ActualLrpKey.FromProto(), ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), @@ -1264,6 +1352,10 @@ func (m *EventsByCellId) SetCellId(value string) { } } func (x *EventsByCellId) ToProto() *ProtoEventsByCellId { + if x == nil { + return nil + } + proto := &ProtoEventsByCellId{ CellId: x.CellId, } @@ -1271,6 +1363,10 @@ func (x *EventsByCellId) ToProto() *ProtoEventsByCellId { } func (x *ProtoEventsByCellId) FromProto() *EventsByCellId { + if x == nil { + return nil + } + copysafe := &EventsByCellId{ CellId: x.CellId, } @@ -1337,6 +1433,10 @@ func (m *TaskCreatedEvent) SetTask(value *Task) { } } func (x *TaskCreatedEvent) ToProto() *ProtoTaskCreatedEvent { + if x == nil { + return nil + } + proto := &ProtoTaskCreatedEvent{ Task: x.Task.ToProto(), } @@ -1344,6 +1444,10 @@ func (x *TaskCreatedEvent) ToProto() *ProtoTaskCreatedEvent { } func (x *ProtoTaskCreatedEvent) FromProto() *TaskCreatedEvent { + if x == nil { + return nil + } + copysafe := &TaskCreatedEvent{ Task: x.Task.FromProto(), } @@ -1425,6 +1529,10 @@ func (m *TaskChangedEvent) SetAfter(value *Task) { } } func (x *TaskChangedEvent) ToProto() *ProtoTaskChangedEvent { + if x == nil { + return nil + } + proto := &ProtoTaskChangedEvent{ Before: x.Before.ToProto(), After: x.After.ToProto(), @@ -1433,6 +1541,10 @@ func (x *TaskChangedEvent) ToProto() *ProtoTaskChangedEvent { } func (x *ProtoTaskChangedEvent) FromProto() *TaskChangedEvent { + if x == nil { + return nil + } + copysafe := &TaskChangedEvent{ Before: x.Before.FromProto(), After: x.After.FromProto(), @@ -1500,6 +1612,10 @@ func (m *TaskRemovedEvent) SetTask(value *Task) { } } func (x *TaskRemovedEvent) ToProto() *ProtoTaskRemovedEvent { + if x == nil { + return nil + } + proto := &ProtoTaskRemovedEvent{ Task: x.Task.ToProto(), } @@ -1507,6 +1623,10 @@ func (x *TaskRemovedEvent) ToProto() *ProtoTaskRemovedEvent { } func (x *ProtoTaskRemovedEvent) FromProto() *TaskRemovedEvent { + if x == nil { + return nil + } + copysafe := &TaskRemovedEvent{ Task: x.Task.FromProto(), } diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 9f69408c..1df6d327 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -237,6 +237,10 @@ func (m *ImageLayer) SetDigestValue(value string) { } } func (x *ImageLayer) ToProto() *ProtoImageLayer { + if x == nil { + return nil + } + proto := &ProtoImageLayer{ Name: x.Name, Url: x.Url, @@ -250,6 +254,10 @@ func (x *ImageLayer) ToProto() *ProtoImageLayer { } func (x *ProtoImageLayer) FromProto() *ImageLayer { + if x == nil { + return nil + } + copysafe := &ImageLayer{ Name: x.Name, Url: x.Url, diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 06b93c19..df6d63af 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -50,6 +50,10 @@ func (m *LogRateLimit) SetBytesPerSecond(value int64) { } } func (x *LogRateLimit) ToProto() *ProtoLogRateLimit { + if x == nil { + return nil + } + proto := &ProtoLogRateLimit{ BytesPerSecond: x.BytesPerSecond, } @@ -57,6 +61,10 @@ func (x *LogRateLimit) ToProto() *ProtoLogRateLimit { } func (x *ProtoLogRateLimit) FromProto() *LogRateLimit { + if x == nil { + return nil + } + copysafe := &LogRateLimit{ BytesPerSecond: x.BytesPerSecond, } diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index bab1d751..05e77c3e 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -99,6 +99,10 @@ func (m *MetricTagValue) SetDynamic(value MetricTagValue_DynamicValue) { } } func (x *MetricTagValue) ToProto() *ProtoMetricTagValue { + if x == nil { + return nil + } + proto := &ProtoMetricTagValue{ Static: x.Static, Dynamic: ProtoMetricTagValue_DynamicValue(x.Dynamic), @@ -107,6 +111,10 @@ func (x *MetricTagValue) ToProto() *ProtoMetricTagValue { } func (x *ProtoMetricTagValue) FromProto() *MetricTagValue { + if x == nil { + return nil + } + copysafe := &MetricTagValue{ Static: x.Static, Dynamic: MetricTagValue_DynamicValue(x.Dynamic), diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index d002738f..64324df2 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -65,6 +65,10 @@ func (m *ModificationTag) SetIndex(value uint32) { } } func (x *ModificationTag) ToProto() *ProtoModificationTag { + if x == nil { + return nil + } + proto := &ProtoModificationTag{ Epoch: x.Epoch, Index: x.Index, @@ -73,6 +77,10 @@ func (x *ModificationTag) ToProto() *ProtoModificationTag { } func (x *ProtoModificationTag) FromProto() *ModificationTag { + if x == nil { + return nil + } + copysafe := &ModificationTag{ Epoch: x.Epoch, Index: x.Index, diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 9f325d12..83fe636a 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -55,6 +55,10 @@ func (m *Network) SetProperties(value map[string]string) { } } func (x *Network) ToProto() *ProtoNetwork { + if x == nil { + return nil + } + proto := &ProtoNetwork{ Properties: x.Properties, } @@ -62,6 +66,10 @@ func (x *Network) ToProto() *ProtoNetwork { } func (x *ProtoNetwork) FromProto() *Network { + if x == nil { + return nil + } + copysafe := &Network{ Properties: x.Properties, } diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index df9d20a3..ae4a9644 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -50,6 +50,10 @@ func (m *PingResponse) SetAvailable(value bool) { } } func (x *PingResponse) ToProto() *ProtoPingResponse { + if x == nil { + return nil + } + proto := &ProtoPingResponse{ Available: x.Available, } @@ -57,6 +61,10 @@ func (x *PingResponse) ToProto() *ProtoPingResponse { } func (x *ProtoPingResponse) FromProto() *PingResponse { + if x == nil { + return nil + } + copysafe := &PingResponse{ Available: x.Available, } diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index ec2744ff..d0c464ad 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -65,6 +65,10 @@ func (m *PortRange) SetEnd(value uint32) { } } func (x *PortRange) ToProto() *ProtoPortRange { + if x == nil { + return nil + } + proto := &ProtoPortRange{ Start: x.Start, End: x.End, @@ -73,6 +77,10 @@ func (x *PortRange) ToProto() *ProtoPortRange { } func (x *ProtoPortRange) FromProto() *PortRange { + if x == nil { + return nil + } + copysafe := &PortRange{ Start: x.Start, End: x.End, @@ -155,6 +163,10 @@ func (m *ICMPInfo) SetCode(value int32) { } } func (x *ICMPInfo) ToProto() *ProtoICMPInfo { + if x == nil { + return nil + } + proto := &ProtoICMPInfo{ Type: x.Type, Code: x.Code, @@ -163,6 +175,10 @@ func (x *ICMPInfo) ToProto() *ProtoICMPInfo { } func (x *ProtoICMPInfo) FromProto() *ICMPInfo { + if x == nil { + return nil + } + copysafe := &ICMPInfo{ Type: x.Type, Code: x.Code, @@ -335,6 +351,10 @@ func (m *SecurityGroupRule) SetAnnotations(value []string) { } } func (x *SecurityGroupRule) ToProto() *ProtoSecurityGroupRule { + if x == nil { + return nil + } + proto := &ProtoSecurityGroupRule{ Protocol: x.Protocol, Destinations: x.Destinations, @@ -348,6 +368,10 @@ func (x *SecurityGroupRule) ToProto() *ProtoSecurityGroupRule { } func (x *ProtoSecurityGroupRule) FromProto() *SecurityGroupRule { + if x == nil { + return nil + } + copysafe := &SecurityGroupRule{ Protocol: x.Protocol, Destinations: x.Destinations, diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index e93a4498..812403cc 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -80,6 +80,10 @@ func (m *Sidecar) SetMemoryMb(value int32) { } } func (x *Sidecar) ToProto() *ProtoSidecar { + if x == nil { + return nil + } + proto := &ProtoSidecar{ Action: x.Action.ToProto(), DiskMb: x.DiskMb, @@ -89,6 +93,10 @@ func (x *Sidecar) ToProto() *ProtoSidecar { } func (x *ProtoSidecar) FromProto() *Sidecar { + if x == nil { + return nil + } + copysafe := &Sidecar{ Action: x.Action.FromProto(), DiskMb: x.DiskMb, diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 6564a09c..c08f61a5 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -481,6 +481,10 @@ func (m *TaskDefinition) SetMetricTags(value map[string]*MetricTagValue) { } } func (x *TaskDefinition) ToProto() *ProtoTaskDefinition { + if x == nil { + return nil + } + proto := &ProtoTaskDefinition{ RootFs: x.RootFs, EnvironmentVariables: EnvironmentVariableToProtoSlice(x.EnvironmentVariables), @@ -514,6 +518,10 @@ func (x *TaskDefinition) ToProto() *ProtoTaskDefinition { } func (x *ProtoTaskDefinition) FromProto() *TaskDefinition { + if x == nil { + return nil + } + copysafe := &TaskDefinition{ RootFs: x.RootFs, EnvironmentVariables: EnvironmentVariableFromProtoSlice(x.EnvironmentVariables), @@ -838,6 +846,10 @@ func (m *Task) SetRejectionReason(value string) { } } func (x *Task) ToProto() *ProtoTask { + if x == nil { + return nil + } + proto := &ProtoTask{ TaskDefinition: x.TaskDefinition.ToProto(), TaskGuid: x.TaskGuid, @@ -857,6 +869,10 @@ func (x *Task) ToProto() *ProtoTask { } func (x *ProtoTask) FromProto() *Task { + if x == nil { + return nil + } + copysafe := &Task{ TaskDefinition: x.TaskDefinition.FromProto(), TaskGuid: x.TaskGuid, diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 4c29d5a8..63a85cb6 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -50,6 +50,10 @@ func (m *TaskLifecycleResponse) SetError(value *Error) { } } func (x *TaskLifecycleResponse) ToProto() *ProtoTaskLifecycleResponse { + if x == nil { + return nil + } + proto := &ProtoTaskLifecycleResponse{ Error: x.Error.ToProto(), } @@ -57,6 +61,10 @@ func (x *TaskLifecycleResponse) ToProto() *ProtoTaskLifecycleResponse { } func (x *ProtoTaskLifecycleResponse) FromProto() *TaskLifecycleResponse { + if x == nil { + return nil + } + copysafe := &TaskLifecycleResponse{ Error: x.Error.FromProto(), } @@ -153,6 +161,10 @@ func (m *DesireTaskRequest) SetDomain(value string) { } } func (x *DesireTaskRequest) ToProto() *ProtoDesireTaskRequest { + if x == nil { + return nil + } + proto := &ProtoDesireTaskRequest{ TaskDefinition: x.TaskDefinition.ToProto(), TaskGuid: x.TaskGuid, @@ -162,6 +174,10 @@ func (x *DesireTaskRequest) ToProto() *ProtoDesireTaskRequest { } func (x *ProtoDesireTaskRequest) FromProto() *DesireTaskRequest { + if x == nil { + return nil + } + copysafe := &DesireTaskRequest{ TaskDefinition: x.TaskDefinition.FromProto(), TaskGuid: x.TaskGuid, @@ -245,6 +261,10 @@ func (m *StartTaskRequest) SetCellId(value string) { } } func (x *StartTaskRequest) ToProto() *ProtoStartTaskRequest { + if x == nil { + return nil + } + proto := &ProtoStartTaskRequest{ TaskGuid: x.TaskGuid, CellId: x.CellId, @@ -253,6 +273,10 @@ func (x *StartTaskRequest) ToProto() *ProtoStartTaskRequest { } func (x *ProtoStartTaskRequest) FromProto() *StartTaskRequest { + if x == nil { + return nil + } + copysafe := &StartTaskRequest{ TaskGuid: x.TaskGuid, CellId: x.CellId, @@ -335,6 +359,10 @@ func (m *StartTaskResponse) SetShouldStart(value bool) { } } func (x *StartTaskResponse) ToProto() *ProtoStartTaskResponse { + if x == nil { + return nil + } + proto := &ProtoStartTaskResponse{ Error: x.Error.ToProto(), ShouldStart: x.ShouldStart, @@ -343,6 +371,10 @@ func (x *StartTaskResponse) ToProto() *ProtoStartTaskResponse { } func (x *ProtoStartTaskResponse) FromProto() *StartTaskResponse { + if x == nil { + return nil + } + copysafe := &StartTaskResponse{ Error: x.Error.FromProto(), ShouldStart: x.ShouldStart, @@ -425,6 +457,10 @@ func (m *FailTaskRequest) SetFailureReason(value string) { } } func (x *FailTaskRequest) ToProto() *ProtoFailTaskRequest { + if x == nil { + return nil + } + proto := &ProtoFailTaskRequest{ TaskGuid: x.TaskGuid, FailureReason: x.FailureReason, @@ -433,6 +469,10 @@ func (x *FailTaskRequest) ToProto() *ProtoFailTaskRequest { } func (x *ProtoFailTaskRequest) FromProto() *FailTaskRequest { + if x == nil { + return nil + } + copysafe := &FailTaskRequest{ TaskGuid: x.TaskGuid, FailureReason: x.FailureReason, @@ -515,6 +555,10 @@ func (m *RejectTaskRequest) SetRejectionReason(value string) { } } func (x *RejectTaskRequest) ToProto() *ProtoRejectTaskRequest { + if x == nil { + return nil + } + proto := &ProtoRejectTaskRequest{ TaskGuid: x.TaskGuid, RejectionReason: x.RejectionReason, @@ -523,6 +567,10 @@ func (x *RejectTaskRequest) ToProto() *ProtoRejectTaskRequest { } func (x *ProtoRejectTaskRequest) FromProto() *RejectTaskRequest { + if x == nil { + return nil + } + copysafe := &RejectTaskRequest{ TaskGuid: x.TaskGuid, RejectionReason: x.RejectionReason, @@ -590,6 +638,10 @@ func (m *TaskGuidRequest) SetTaskGuid(value string) { } } func (x *TaskGuidRequest) ToProto() *ProtoTaskGuidRequest { + if x == nil { + return nil + } + proto := &ProtoTaskGuidRequest{ TaskGuid: x.TaskGuid, } @@ -597,6 +649,10 @@ func (x *TaskGuidRequest) ToProto() *ProtoTaskGuidRequest { } func (x *ProtoTaskGuidRequest) FromProto() *TaskGuidRequest { + if x == nil { + return nil + } + copysafe := &TaskGuidRequest{ TaskGuid: x.TaskGuid, } @@ -723,6 +779,10 @@ func (m *CompleteTaskRequest) SetResult(value string) { } } func (x *CompleteTaskRequest) ToProto() *ProtoCompleteTaskRequest { + if x == nil { + return nil + } + proto := &ProtoCompleteTaskRequest{ TaskGuid: x.TaskGuid, CellId: x.CellId, @@ -734,6 +794,10 @@ func (x *CompleteTaskRequest) ToProto() *ProtoCompleteTaskRequest { } func (x *ProtoCompleteTaskRequest) FromProto() *CompleteTaskRequest { + if x == nil { + return nil + } + copysafe := &CompleteTaskRequest{ TaskGuid: x.TaskGuid, CellId: x.CellId, @@ -879,6 +943,10 @@ func (m *TaskCallbackResponse) SetCreatedAt(value int64) { } } func (x *TaskCallbackResponse) ToProto() *ProtoTaskCallbackResponse { + if x == nil { + return nil + } + proto := &ProtoTaskCallbackResponse{ TaskGuid: x.TaskGuid, Failed: x.Failed, @@ -891,6 +959,10 @@ func (x *TaskCallbackResponse) ToProto() *ProtoTaskCallbackResponse { } func (x *ProtoTaskCallbackResponse) FromProto() *TaskCallbackResponse { + if x == nil { + return nil + } + copysafe := &TaskCallbackResponse{ TaskGuid: x.TaskGuid, Failed: x.Failed, @@ -977,6 +1049,10 @@ func (m *TasksRequest) SetCellId(value string) { } } func (x *TasksRequest) ToProto() *ProtoTasksRequest { + if x == nil { + return nil + } + proto := &ProtoTasksRequest{ Domain: x.Domain, CellId: x.CellId, @@ -985,6 +1061,10 @@ func (x *TasksRequest) ToProto() *ProtoTasksRequest { } func (x *ProtoTasksRequest) FromProto() *TasksRequest { + if x == nil { + return nil + } + copysafe := &TasksRequest{ Domain: x.Domain, CellId: x.CellId, @@ -1072,6 +1152,10 @@ func (m *TasksResponse) SetTasks(value []*Task) { } } func (x *TasksResponse) ToProto() *ProtoTasksResponse { + if x == nil { + return nil + } + proto := &ProtoTasksResponse{ Error: x.Error.ToProto(), Tasks: TaskToProtoSlice(x.Tasks), @@ -1080,6 +1164,10 @@ func (x *TasksResponse) ToProto() *ProtoTasksResponse { } func (x *ProtoTasksResponse) FromProto() *TasksResponse { + if x == nil { + return nil + } + copysafe := &TasksResponse{ Error: x.Error.FromProto(), Tasks: TaskFromProtoSlice(x.Tasks), @@ -1147,6 +1235,10 @@ func (m *TaskByGuidRequest) SetTaskGuid(value string) { } } func (x *TaskByGuidRequest) ToProto() *ProtoTaskByGuidRequest { + if x == nil { + return nil + } + proto := &ProtoTaskByGuidRequest{ TaskGuid: x.TaskGuid, } @@ -1154,6 +1246,10 @@ func (x *TaskByGuidRequest) ToProto() *ProtoTaskByGuidRequest { } func (x *ProtoTaskByGuidRequest) FromProto() *TaskByGuidRequest { + if x == nil { + return nil + } + copysafe := &TaskByGuidRequest{ TaskGuid: x.TaskGuid, } @@ -1235,6 +1331,10 @@ func (m *TaskResponse) SetTask(value *Task) { } } func (x *TaskResponse) ToProto() *ProtoTaskResponse { + if x == nil { + return nil + } + proto := &ProtoTaskResponse{ Error: x.Error.ToProto(), Task: x.Task.ToProto(), @@ -1243,6 +1343,10 @@ func (x *TaskResponse) ToProto() *ProtoTaskResponse { } func (x *ProtoTaskResponse) FromProto() *TaskResponse { + if x == nil { + return nil + } + copysafe := &TaskResponse{ Error: x.Error.FromProto(), Task: x.Task.FromProto(), diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index a1701358..decb5a1e 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -65,6 +65,10 @@ func (m *SharedDevice) SetMountConfig(value string) { } } func (x *SharedDevice) ToProto() *ProtoSharedDevice { + if x == nil { + return nil + } + proto := &ProtoSharedDevice{ VolumeId: x.VolumeId, MountConfig: x.MountConfig, @@ -73,6 +77,10 @@ func (x *SharedDevice) ToProto() *ProtoSharedDevice { } func (x *ProtoSharedDevice) FromProto() *SharedDevice { + if x == nil { + return nil + } + copysafe := &SharedDevice{ VolumeId: x.VolumeId, MountConfig: x.MountConfig, @@ -185,6 +193,10 @@ func (m *VolumeMount) SetShared(value *SharedDevice) { } } func (x *VolumeMount) ToProto() *ProtoVolumeMount { + if x == nil { + return nil + } + proto := &ProtoVolumeMount{ Driver: x.Driver, ContainerDir: x.ContainerDir, @@ -195,6 +207,10 @@ func (x *VolumeMount) ToProto() *ProtoVolumeMount { } func (x *ProtoVolumeMount) FromProto() *VolumeMount { + if x == nil { + return nil + } + copysafe := &VolumeMount{ Driver: x.Driver, ContainerDir: x.ContainerDir, @@ -269,6 +285,10 @@ func (m *VolumePlacement) SetDriverNames(value []string) { } } func (x *VolumePlacement) ToProto() *ProtoVolumePlacement { + if x == nil { + return nil + } + proto := &ProtoVolumePlacement{ DriverNames: x.DriverNames, } @@ -276,6 +296,10 @@ func (x *VolumePlacement) ToProto() *ProtoVolumePlacement { } func (x *ProtoVolumePlacement) FromProto() *VolumePlacement { + if x == nil { + return nil + } + copysafe := &VolumePlacement{ DriverNames: x.DriverNames, } diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 35989065..d8e1dd22 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -362,6 +362,10 @@ func (bbsGenerateHelper) genToProtoMethod(g *protogen.GeneratedFile, msg *protog unsafeName := getUnsafeName(g, msg.GoIdent) if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { g.P("func(x *", copysafeName, ") ToProto() *", unsafeName, " {") + g.P("if x == nil {") + g.P("return nil") + g.P("}") + g.P() g.P("proto := &", unsafeName, "{") for _, field := range msg.Fields { protoFieldName := field.GoName @@ -406,6 +410,10 @@ func (bbsGenerateHelper) genFromProtoMethod(g *protogen.GeneratedFile, msg *prot unsafeName := getUnsafeName(g, msg.GoIdent) if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { g.P("func(x *", unsafeName, ") FromProto() *", copysafeName, " {") + g.P("if x == nil {") + g.P("return nil") + g.P("}") + g.P() g.P("copysafe := &", copysafeName, "{") for _, field := range msg.Fields { protoFieldName := field.GoName From 745a0044507ced4054dfda1ac7d2957aacd03888 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 14 May 2024 17:12:43 +0000 Subject: [PATCH 069/155] Update generate_protos script to handle plugin --- scripts/generate_protos.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/generate_protos.sh b/scripts/generate_protos.sh index 5e0f7e07..446e5d23 100755 --- a/scripts/generate_protos.sh +++ b/scripts/generate_protos.sh @@ -1,5 +1,17 @@ +#! /bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -pushd "$DIR/../models" -protoc --proto_path=../../vendor:../../vendor/github.com/golang/protobuf/ptypes/duration/:. --gogoslick_out=plugins=grpc:. *.proto +# regenerate protos for protoc plugin +pushd "${DIR}/../protoc-gen-go-bbs" + protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./*.proto + # we need the custom bbs code from the plugin because of references made by some of the model protos + cp ./bbs.pb.go "${DIR}/../models/" + + # we also need to change the package after it's been copied away + sed -i 's/package models/package main/g' ./bbs.pb.go +popd + +# regenerate protos for models +pushd "${DIR}/../models" + protoc --proto_path=.:../protoc-gen-go-bbs --go_out=. --go-bbs_out=. --go_opt=paths=source_relative --go-bbs_opt=paths=source_relative ./*.proto popd From e7e9bf043f80a7759981561d16d2cd6c48ec533e Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 14 May 2024 17:13:57 +0000 Subject: [PATCH 070/155] Use generate_protos script --- models/bbs.pb.go | 3 +-- protoc-gen-go-bbs/bbs.pb.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 991d4b28..a17b547f 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -7,11 +7,10 @@ package models import ( - reflect "reflect" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" + reflect "reflect" ) const ( diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 0e3cfa9f..b2827864 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -7,11 +7,10 @@ package main import ( - reflect "reflect" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" + reflect "reflect" ) const ( From b1354ab0629689f126158cd645683c4079959956 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 15 May 2024 20:35:55 +0000 Subject: [PATCH 071/155] Codegen: Add bbs_by_value option (allows fields to be passed by value instead of reference) Regen protos --- models/bbs.pb.go | 49 ++++++++++++++++++++++++------------- protoc-gen-go-bbs/bbs.pb.go | 49 ++++++++++++++++++++++++------------- protoc-gen-go-bbs/bbs.proto | 1 + 3 files changed, 65 insertions(+), 34 deletions(-) diff --git a/models/bbs.pb.go b/models/bbs.pb.go index a17b547f..9ff7c93f 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -29,6 +29,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "bytes,1000,opt,name=bbs_json_name", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 1010, + Name: "bbs.bbs_by_value", + Tag: "varint,1010,opt,name=bbs_by_value", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -43,12 +51,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ var ( // optional string bbs_json_name = 1000; E_BbsJsonName = &file_bbs_proto_extTypes[0] + // optional bool bbs_by_value = 1010; + E_BbsByValue = &file_bbs_proto_extTypes[1] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[1] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[2] ) var File_bbs_proto protoreflect.FileDescriptor @@ -61,16 +71,20 @@ var file_bbs_proto_rawDesc = []byte{ 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x62, 0x73, 0x4a, 0x73, - 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, - 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, - 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, + 0x5f, 0x62, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, + 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, + 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, + 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, + 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, + 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_bbs_proto_goTypes = []interface{}{ @@ -79,11 +93,12 @@ var file_bbs_proto_goTypes = []interface{}{ } var file_bbs_proto_depIdxs = []int32{ 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions - 1, // 1: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 0, // [0:2] is the sub-list for extension extendee + 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions + 1, // 2: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 0, // [0:3] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -99,7 +114,7 @@ func file_bbs_proto_init() { RawDescriptor: file_bbs_proto_rawDesc, NumEnums: 0, NumMessages: 0, - NumExtensions: 2, + NumExtensions: 3, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index b2827864..cbf912d6 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -29,6 +29,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "bytes,1000,opt,name=bbs_json_name", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 1010, + Name: "bbs.bbs_by_value", + Tag: "varint,1010,opt,name=bbs_by_value", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -43,12 +51,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ var ( // optional string bbs_json_name = 1000; E_BbsJsonName = &file_bbs_proto_extTypes[0] + // optional bool bbs_by_value = 1010; + E_BbsByValue = &file_bbs_proto_extTypes[1] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[1] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[2] ) var File_bbs_proto protoreflect.FileDescriptor @@ -61,16 +71,20 @@ var file_bbs_proto_rawDesc = []byte{ 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x62, 0x73, 0x4a, 0x73, - 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, - 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, - 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, + 0x5f, 0x62, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, + 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, + 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, + 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, + 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, + 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_bbs_proto_goTypes = []interface{}{ @@ -79,11 +93,12 @@ var file_bbs_proto_goTypes = []interface{}{ } var file_bbs_proto_depIdxs = []int32{ 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions - 1, // 1: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 0, // [0:2] is the sub-list for extension extendee + 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions + 1, // 2: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 0, // [0:3] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -99,7 +114,7 @@ func file_bbs_proto_init() { RawDescriptor: file_bbs_proto_rawDesc, NumEnums: 0, NumMessages: 0, - NumExtensions: 2, + NumExtensions: 3, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/protoc-gen-go-bbs/bbs.proto b/protoc-gen-go-bbs/bbs.proto index 150c8c40..29d9b461 100644 --- a/protoc-gen-go-bbs/bbs.proto +++ b/protoc-gen-go-bbs/bbs.proto @@ -7,6 +7,7 @@ import "google/protobuf/descriptor.proto"; extend google.protobuf.FieldOptions { optional string bbs_json_name = 1000; + optional bool bbs_by_value = 1010; } extend google.protobuf.EnumValueOptions { From d60dd78fc7d4092dda676afa3d4082c9ef160c22 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 15 May 2024 20:38:37 +0000 Subject: [PATCH 072/155] Codegen: Add support for bbs_by_value --- protoc-gen-go-bbs/bbs.go | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index d8e1dd22..8a0ef777 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -53,7 +53,6 @@ func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *proto if *debug { log.Printf("New Field Detected: %+v\n\n", field) log.Printf("Field Options: %+v\n\n", options) - } fieldName := getFieldName(field.GoName) fieldType := getActualType(g, field) @@ -129,10 +128,9 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa g.P("return false") g.P("}") } else if field.Message != nil { - pointer := "" - if fieldName == "Routes" { - pointer = "*" - log.Printf("Adding dereference because of Routes") + pointer := "*" + if isByValueType(field) { + pointer = "" } g.P("if !this.", fieldName, ".Equal(", pointer, "that1.", fieldName, ") {") g.P("return false") @@ -264,7 +262,11 @@ func getActualType(g *protogen.GeneratedFile, field *protogen.Field) string { log.Printf("Message Description: %+v\n\n", field.Message.Desc) } messageType, _ := getCopysafeName(g, field.Message.GoIdent) - fieldType += "*" + messageType + pointer := "*" + if isByValueType(field) { + pointer = "" + } + fieldType += pointer + messageType } else if field.Enum != nil { if *debug { log.Printf("Enum Field Detected: %+v\n\n", field.Enum) @@ -283,6 +285,11 @@ func getActualType(g *protogen.GeneratedFile, field *protogen.Field) string { return fieldType } +func isByValueType(field *protogen.Field) bool { + isByValueType := proto.GetExtension(field.Desc.Options().(*descriptorpb.FieldOptions), E_BbsByValue) + return isByValueType.(bool) +} + func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) { for _, eNuM := range msg.Enums { if *debug { @@ -434,7 +441,13 @@ func (bbsGenerateHelper) genFromProtoMethod(g *protogen.GeneratedFile, msg *prot panic("Unrecognized Repeated field found") } } else { - g.P(protoFieldName, ": x.", getFieldName(protoFieldName), ".FromProto(),") + // note the reversal of pointer logic here compared to other isByValueType checks + // FromProto() returns a pointer so we need to dereference that before calling FromProto() on a value type + pointer := "" + if isByValueType(field) { + pointer = "*" + } + g.P(protoFieldName, ": ", pointer, "x.", getFieldName(protoFieldName), ".FromProto(),") } } else if field.Enum != nil { g.P(protoFieldName, ": ", getActualType(g, field), "(x.", protoFieldName, "),") From ae0fcd445312605bd1d56e1989c6437c601ddc01 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 15 May 2024 20:39:11 +0000 Subject: [PATCH 073/155] Codegen: Add nil checks for ProtoSlice and ProtoMap methods --- protoc-gen-go-bbs/bbs.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 8a0ef777..3c416663 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -471,6 +471,9 @@ func (bbsGenerateHelper) genToProtoSliceMethod(g *protogen.GeneratedFile, msg *p unsafeName := getUnsafeName(g, msg.GoIdent) if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { g.P("func ", copysafeName, "ToProtoSlice(values []*", copysafeName, ") []*", unsafeName, " {") + g.P("if values == nil {") + g.P("return nil") + g.P("}") g.P("result := make([]*", unsafeName, ", len(values))") g.P("for i, val := range values {") g.P("result[i] = val.ToProto()") @@ -494,6 +497,9 @@ func (bbsGenerateHelper) genToProtoSliceMethod(g *protogen.GeneratedFile, msg *p protoFieldType := "map[" + mapKeyType + "]" + protoMapValueType g.P("func ", copysafeName, getFieldName(field.GoName), "ToProtoMap(values ", fieldType, ") ", protoFieldType, " {") + g.P("if values == nil {") + g.P("return nil") + g.P("}") g.P("result := make(map[", mapKeyType, "]*", protoValueFieldType, ", len(values))") g.P("for i, val := range values {") g.P("result[i] = val.ToProto()") @@ -511,6 +517,9 @@ func (bbsGenerateHelper) genFromProtoSliceMethod(g *protogen.GeneratedFile, msg unsafeName := getUnsafeName(g, msg.GoIdent) if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { g.P("func ", copysafeName, "FromProtoSlice(values []*", unsafeName, ") []*", copysafeName, " {") + g.P("if values == nil {") + g.P("return nil") + g.P("}") g.P("result := make([]*", copysafeName, ", len(values))") g.P("for i, val := range values {") g.P("result[i] = val.FromProto()") @@ -534,6 +543,9 @@ func (bbsGenerateHelper) genFromProtoSliceMethod(g *protogen.GeneratedFile, msg protoFieldType := "map[" + mapKeyType + "]" + protoMapValueType g.P("func ", copysafeName, getFieldName(field.GoName), "FromProtoMap(values ", protoFieldType, ") ", fieldType, " {") + g.P("if values == nil {") + g.P("return nil") + g.P("}") g.P("result := make(map[", mapKeyType, "]*", valueFieldType, ", len(values))") g.P("for i, val := range values {") g.P("result[i] = val.FromProto()") From 3180189ecf6dcda5e1730846748448e99c41c77a Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 15 May 2024 20:40:32 +0000 Subject: [PATCH 074/155] Make custom Routes type use bbs_by_value --- models/desired_lrp.proto | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index ed9f031e..e3faa311 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -4,6 +4,7 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; import "actions.proto"; +import "bbs.proto"; import "cached_dependency.proto"; import "certificate_properties.proto"; import "environment_variables.proto"; @@ -25,7 +26,7 @@ message ProtoDesiredLRPSchedulingInfo { ProtoDesiredLRPResource desired_lrp_resource = 4; - ProtoRoutes routes = 5; + ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; ProtoModificationTag modification_tag = 6; ProtoVolumePlacement volume_placement = 7; repeated string PlacementTags = 8 [json_name ="placement_tags"]; @@ -79,7 +80,7 @@ message ProtoRoutes { message ProtoDesiredLRPUpdate { optional int32 instances = 1; - optional ProtoRoutes routes = 2; + optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; optional string annotation = 3; map metric_tags = 4; } @@ -115,7 +116,7 @@ message ProtoDesiredLRP { uint32 cpu_weight = 12 [json_name = "cpu_weight"]; bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; - optional ProtoRoutes routes = 15; + optional ProtoRoutes routes = 15 [(bbs.bbs_by_value) = false]; string log_source = 16 [json_name = "log_source"]; string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; From 39f07297446c6b738e2a05d8497a5d8c8ef40b91 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 15 May 2024 20:44:15 +0000 Subject: [PATCH 075/155] Add nil checks on ToProto/FromProto Custom Routes type requires json.RawMessage but we only have []byte, so conversion has to be done manually --- models/routes.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/models/routes.go b/models/routes.go index b9f9892c..d8cd6638 100644 --- a/models/routes.go +++ b/models/routes.go @@ -8,6 +8,9 @@ import ( type Routes map[string]*json.RawMessage func (r *Routes) ToProto() *ProtoRoutes { + if r == nil { + return nil + } pr := &ProtoRoutes{ Routes: map[string][]byte{}, } @@ -20,10 +23,14 @@ func (r *Routes) ToProto() *ProtoRoutes { } func (pr *ProtoRoutes) FromProto() *Routes { - r := Routes{} + if pr == nil { + return nil + } + r := Routes{} for k, v := range pr.Routes { - *r[k] = v + raw := json.RawMessage(v) + r[k] = &raw } return &r From 82737d793bc75f43826ac196724d9dca01ea4907 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 15 May 2024 20:45:06 +0000 Subject: [PATCH 076/155] Pointer changes / Proto conversion for Routes bbs_by_value Regen protos --- models/actions_bbs.pb.go | 92 +++++- models/actual_lrp_bbs.pb.go | 54 +++- models/actual_lrp_requests_bbs.pb.go | 112 ++++++- models/cached_dependency_bbs.pb.go | 6 + models/cells_bbs.pb.go | 28 +- models/certificate_properties_bbs.pb.go | 6 + models/check_definition_bbs.pb.go | 28 +- models/desired_lrp.go | 6 +- models/desired_lrp.pb.go | 380 ++++++++++++------------ models/desired_lrp_bbs.pb.go | 104 +++++-- models/desired_lrp_requests_bbs.pb.go | 78 ++++- models/desired_lrp_test.go | 4 +- models/domain_bbs.pb.go | 22 +- models/environment_variables_bbs.pb.go | 6 + models/error_bbs.pb.go | 6 + models/evacuation_bbs.pb.go | 68 ++++- models/events_bbs.pb.go | 134 +++++++-- models/image_layer_bbs.pb.go | 6 + models/log_rate_limit_bbs.pb.go | 6 + models/metric_tags_bbs.pb.go | 6 + models/modification_tag_bbs.pb.go | 6 + models/network_bbs.pb.go | 6 + models/ping_bbs.pb.go | 6 + models/routes_test.go | 18 +- models/security_group_bbs.pb.go | 22 +- models/sidecar_bbs.pb.go | 8 +- models/task_bbs.pb.go | 28 +- models/task_requests_bbs.pb.go | 90 +++++- models/volume_mount_bbs.pb.go | 20 +- 29 files changed, 1038 insertions(+), 318 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index a78d3168..bac0fd7d 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -41,31 +41,31 @@ func (this *Action) Equal(that interface{}) bool { return false } - if !this.DownloadAction.Equal(that1.DownloadAction) { + if !this.DownloadAction.Equal(*that1.DownloadAction) { return false } - if !this.UploadAction.Equal(that1.UploadAction) { + if !this.UploadAction.Equal(*that1.UploadAction) { return false } - if !this.RunAction.Equal(that1.RunAction) { + if !this.RunAction.Equal(*that1.RunAction) { return false } - if !this.TimeoutAction.Equal(that1.TimeoutAction) { + if !this.TimeoutAction.Equal(*that1.TimeoutAction) { return false } - if !this.EmitProgressAction.Equal(that1.EmitProgressAction) { + if !this.EmitProgressAction.Equal(*that1.EmitProgressAction) { return false } - if !this.TryAction.Equal(that1.TryAction) { + if !this.TryAction.Equal(*that1.TryAction) { return false } - if !this.ParallelAction.Equal(that1.ParallelAction) { + if !this.ParallelAction.Equal(*that1.ParallelAction) { return false } - if !this.SerialAction.Equal(that1.SerialAction) { + if !this.SerialAction.Equal(*that1.SerialAction) { return false } - if !this.CodependentAction.Equal(that1.CodependentAction) { + if !this.CodependentAction.Equal(*that1.CodependentAction) { return false } return true @@ -208,6 +208,9 @@ func (x *ProtoAction) FromProto() *Action { } func ActionToProtoSlice(values []*Action) []*ProtoAction { + if values == nil { + return nil + } result := make([]*ProtoAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -216,6 +219,9 @@ func ActionToProtoSlice(values []*Action) []*ProtoAction { } func ActionFromProtoSlice(values []*ProtoAction) []*Action { + if values == nil { + return nil + } result := make([]*Action, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -408,6 +414,9 @@ func (x *ProtoDownloadAction) FromProto() *DownloadAction { } func DownloadActionToProtoSlice(values []*DownloadAction) []*ProtoDownloadAction { + if values == nil { + return nil + } result := make([]*ProtoDownloadAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -416,6 +425,9 @@ func DownloadActionToProtoSlice(values []*DownloadAction) []*ProtoDownloadAction } func DownloadActionFromProtoSlice(values []*ProtoDownloadAction) []*DownloadAction { + if values == nil { + return nil + } result := make([]*DownloadAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -557,6 +569,9 @@ func (x *ProtoUploadAction) FromProto() *UploadAction { } func UploadActionToProtoSlice(values []*UploadAction) []*ProtoUploadAction { + if values == nil { + return nil + } result := make([]*ProtoUploadAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -565,6 +580,9 @@ func UploadActionToProtoSlice(values []*UploadAction) []*ProtoUploadAction { } func UploadActionFromProtoSlice(values []*ProtoUploadAction) []*UploadAction { + if values == nil { + return nil + } result := make([]*UploadAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -628,7 +646,7 @@ func (this *RunAction) Equal(that interface{}) bool { return false } } - if !this.ResourceLimits.Equal(that1.ResourceLimits) { + if !this.ResourceLimits.Equal(*that1.ResourceLimits) { return false } if this.User != that1.User { @@ -767,6 +785,9 @@ func (x *ProtoRunAction) FromProto() *RunAction { } func RunActionToProtoSlice(values []*RunAction) []*ProtoRunAction { + if values == nil { + return nil + } result := make([]*ProtoRunAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -775,6 +796,9 @@ func RunActionToProtoSlice(values []*RunAction) []*ProtoRunAction { } func RunActionFromProtoSlice(values []*ProtoRunAction) []*RunAction { + if values == nil { + return nil + } result := make([]*RunAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -812,7 +836,7 @@ func (this *TimeoutAction) Equal(that interface{}) bool { return false } - if !this.Action.Equal(that1.Action) { + if !this.Action.Equal(*that1.Action) { return false } if this.DeprecatedTimeoutNs != that1.DeprecatedTimeoutNs { @@ -901,6 +925,9 @@ func (x *ProtoTimeoutAction) FromProto() *TimeoutAction { } func TimeoutActionToProtoSlice(values []*TimeoutAction) []*ProtoTimeoutAction { + if values == nil { + return nil + } result := make([]*ProtoTimeoutAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -909,6 +936,9 @@ func TimeoutActionToProtoSlice(values []*TimeoutAction) []*ProtoTimeoutAction { } func TimeoutActionFromProtoSlice(values []*ProtoTimeoutAction) []*TimeoutAction { + if values == nil { + return nil + } result := make([]*TimeoutAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -947,7 +977,7 @@ func (this *EmitProgressAction) Equal(that interface{}) bool { return false } - if !this.Action.Equal(that1.Action) { + if !this.Action.Equal(*that1.Action) { return false } if this.StartMessage != that1.StartMessage { @@ -1050,6 +1080,9 @@ func (x *ProtoEmitProgressAction) FromProto() *EmitProgressAction { } func EmitProgressActionToProtoSlice(values []*EmitProgressAction) []*ProtoEmitProgressAction { + if values == nil { + return nil + } result := make([]*ProtoEmitProgressAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1058,6 +1091,9 @@ func EmitProgressActionToProtoSlice(values []*EmitProgressAction) []*ProtoEmitPr } func EmitProgressActionFromProtoSlice(values []*ProtoEmitProgressAction) []*EmitProgressAction { + if values == nil { + return nil + } result := make([]*EmitProgressAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1093,7 +1129,7 @@ func (this *TryAction) Equal(that interface{}) bool { return false } - if !this.Action.Equal(that1.Action) { + if !this.Action.Equal(*that1.Action) { return false } if this.LogSource != that1.LogSource { @@ -1148,6 +1184,9 @@ func (x *ProtoTryAction) FromProto() *TryAction { } func TryActionToProtoSlice(values []*TryAction) []*ProtoTryAction { + if values == nil { + return nil + } result := make([]*ProtoTryAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1156,6 +1195,9 @@ func TryActionToProtoSlice(values []*TryAction) []*ProtoTryAction { } func TryActionFromProtoSlice(values []*ProtoTryAction) []*TryAction { + if values == nil { + return nil + } result := make([]*TryAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1251,6 +1293,9 @@ func (x *ProtoParallelAction) FromProto() *ParallelAction { } func ParallelActionToProtoSlice(values []*ParallelAction) []*ProtoParallelAction { + if values == nil { + return nil + } result := make([]*ProtoParallelAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1259,6 +1304,9 @@ func ParallelActionToProtoSlice(values []*ParallelAction) []*ProtoParallelAction } func ParallelActionFromProtoSlice(values []*ProtoParallelAction) []*ParallelAction { + if values == nil { + return nil + } result := make([]*ParallelAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1354,6 +1402,9 @@ func (x *ProtoSerialAction) FromProto() *SerialAction { } func SerialActionToProtoSlice(values []*SerialAction) []*ProtoSerialAction { + if values == nil { + return nil + } result := make([]*ProtoSerialAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1362,6 +1413,9 @@ func SerialActionToProtoSlice(values []*SerialAction) []*ProtoSerialAction { } func SerialActionFromProtoSlice(values []*ProtoSerialAction) []*SerialAction { + if values == nil { + return nil + } result := make([]*SerialAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1457,6 +1511,9 @@ func (x *ProtoCodependentAction) FromProto() *CodependentAction { } func CodependentActionToProtoSlice(values []*CodependentAction) []*ProtoCodependentAction { + if values == nil { + return nil + } result := make([]*ProtoCodependentAction, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1465,6 +1522,9 @@ func CodependentActionToProtoSlice(values []*CodependentAction) []*ProtoCodepend } func CodependentActionFromProtoSlice(values []*ProtoCodependentAction) []*CodependentAction { + if values == nil { + return nil + } result := make([]*CodependentAction, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1563,6 +1623,9 @@ func (x *ProtoResourceLimits) FromProto() *ResourceLimits { } func ResourceLimitsToProtoSlice(values []*ResourceLimits) []*ProtoResourceLimits { + if values == nil { + return nil + } result := make([]*ProtoResourceLimits, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1571,6 +1634,9 @@ func ResourceLimitsToProtoSlice(values []*ResourceLimits) []*ProtoResourceLimits } func ResourceLimitsFromProtoSlice(values []*ProtoResourceLimits) []*ResourceLimits { + if values == nil { + return nil + } result := make([]*ResourceLimits, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 941d0b6e..0f222601 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -38,10 +38,10 @@ func (this *ActualLRPGroup) Equal(that interface{}) bool { return false } - if !this.Instance.Equal(that1.Instance) { + if !this.Instance.Equal(*that1.Instance) { return false } - if !this.Evacuating.Equal(that1.Evacuating) { + if !this.Evacuating.Equal(*that1.Evacuating) { return false } return true @@ -93,6 +93,9 @@ func (x *ProtoActualLRPGroup) FromProto() *ActualLRPGroup { } func ActualLRPGroupToProtoSlice(values []*ActualLRPGroup) []*ProtoActualLRPGroup { + if values == nil { + return nil + } result := make([]*ProtoActualLRPGroup, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -101,6 +104,9 @@ func ActualLRPGroupToProtoSlice(values []*ActualLRPGroup) []*ProtoActualLRPGroup } func ActualLRPGroupFromProtoSlice(values []*ProtoActualLRPGroup) []*ActualLRPGroup { + if values == nil { + return nil + } result := make([]*ActualLRPGroup, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -225,6 +231,9 @@ func (x *ProtoPortMapping) FromProto() *PortMapping { } func PortMappingToProtoSlice(values []*PortMapping) []*ProtoPortMapping { + if values == nil { + return nil + } result := make([]*ProtoPortMapping, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -233,6 +242,9 @@ func PortMappingToProtoSlice(values []*PortMapping) []*ProtoPortMapping { } func PortMappingFromProtoSlice(values []*ProtoPortMapping) []*PortMapping { + if values == nil { + return nil + } result := make([]*PortMapping, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -340,6 +352,9 @@ func (x *ProtoActualLRPKey) FromProto() *ActualLRPKey { } func ActualLRPKeyToProtoSlice(values []*ActualLRPKey) []*ProtoActualLRPKey { + if values == nil { + return nil + } result := make([]*ProtoActualLRPKey, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -348,6 +363,9 @@ func ActualLRPKeyToProtoSlice(values []*ActualLRPKey) []*ProtoActualLRPKey { } func ActualLRPKeyFromProtoSlice(values []*ProtoActualLRPKey) []*ActualLRPKey { + if values == nil { + return nil + } result := make([]*ActualLRPKey, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -438,6 +456,9 @@ func (x *ProtoActualLRPInstanceKey) FromProto() *ActualLRPInstanceKey { } func ActualLRPInstanceKeyToProtoSlice(values []*ActualLRPInstanceKey) []*ProtoActualLRPInstanceKey { + if values == nil { + return nil + } result := make([]*ProtoActualLRPInstanceKey, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -446,6 +467,9 @@ func ActualLRPInstanceKeyToProtoSlice(values []*ActualLRPInstanceKey) []*ProtoAc } func ActualLRPInstanceKeyFromProtoSlice(values []*ProtoActualLRPInstanceKey) []*ActualLRPInstanceKey { + if values == nil { + return nil + } result := make([]*ActualLRPInstanceKey, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -605,6 +629,9 @@ func (x *ProtoActualLRPNetInfo) FromProto() *ActualLRPNetInfo { } func ActualLRPNetInfoToProtoSlice(values []*ActualLRPNetInfo) []*ProtoActualLRPNetInfo { + if values == nil { + return nil + } result := make([]*ProtoActualLRPNetInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -613,6 +640,9 @@ func ActualLRPNetInfoToProtoSlice(values []*ActualLRPNetInfo) []*ProtoActualLRPN } func ActualLRPNetInfoFromProtoSlice(values []*ProtoActualLRPNetInfo) []*ActualLRPNetInfo { + if values == nil { + return nil + } result := make([]*ActualLRPNetInfo, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -686,6 +716,9 @@ func (x *ProtoActualLRPInternalRoute) FromProto() *ActualLRPInternalRoute { } func ActualLRPInternalRouteToProtoSlice(values []*ActualLRPInternalRoute) []*ProtoActualLRPInternalRoute { + if values == nil { + return nil + } result := make([]*ProtoActualLRPInternalRoute, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -694,6 +727,9 @@ func ActualLRPInternalRouteToProtoSlice(values []*ActualLRPInternalRoute) []*Pro } func ActualLRPInternalRouteFromProtoSlice(values []*ProtoActualLRPInternalRoute) []*ActualLRPInternalRoute { + if values == nil { + return nil + } result := make([]*ActualLRPInternalRoute, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -771,13 +807,13 @@ func (this *ActualLRP) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -795,7 +831,7 @@ func (this *ActualLRP) Equal(that interface{}) bool { if this.Since != that1.Since { return false } - if !this.ModificationTag.Equal(that1.ModificationTag) { + if !this.ModificationTag.Equal(*that1.ModificationTag) { return false } if this.Presence != that1.Presence { @@ -1031,6 +1067,9 @@ func (x *ProtoActualLRP) FromProto() *ActualLRP { } func ActualLRPToProtoSlice(values []*ActualLRP) []*ProtoActualLRP { + if values == nil { + return nil + } result := make([]*ProtoActualLRP, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1039,6 +1078,9 @@ func ActualLRPToProtoSlice(values []*ActualLRP) []*ProtoActualLRP { } func ActualLRPFromProtoSlice(values []*ProtoActualLRP) []*ActualLRP { + if values == nil { + return nil + } result := make([]*ActualLRP, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 7d9cc337..fd5b4fd3 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -33,7 +33,7 @@ func (this *ActualLRPLifecycleResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } return true @@ -72,6 +72,9 @@ func (x *ProtoActualLRPLifecycleResponse) FromProto() *ActualLRPLifecycleRespons } func ActualLRPLifecycleResponseToProtoSlice(values []*ActualLRPLifecycleResponse) []*ProtoActualLRPLifecycleResponse { + if values == nil { + return nil + } result := make([]*ProtoActualLRPLifecycleResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +83,9 @@ func ActualLRPLifecycleResponseToProtoSlice(values []*ActualLRPLifecycleResponse } func ActualLRPLifecycleResponseFromProtoSlice(values []*ProtoActualLRPLifecycleResponse) []*ActualLRPLifecycleResponse { + if values == nil { + return nil + } result := make([]*ActualLRPLifecycleResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -115,7 +121,7 @@ func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if len(this.ActualLrpGroups) != len(that1.ActualLrpGroups) { @@ -175,6 +181,9 @@ func (x *ProtoActualLRPGroupsResponse) FromProto() *ActualLRPGroupsResponse { } func ActualLRPGroupsResponseToProtoSlice(values []*ActualLRPGroupsResponse) []*ProtoActualLRPGroupsResponse { + if values == nil { + return nil + } result := make([]*ProtoActualLRPGroupsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -183,6 +192,9 @@ func ActualLRPGroupsResponseToProtoSlice(values []*ActualLRPGroupsResponse) []*P } func ActualLRPGroupsResponseFromProtoSlice(values []*ProtoActualLRPGroupsResponse) []*ActualLRPGroupsResponse { + if values == nil { + return nil + } result := make([]*ActualLRPGroupsResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -218,10 +230,10 @@ func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { return false } return true @@ -273,6 +285,9 @@ func (x *ProtoActualLRPGroupResponse) FromProto() *ActualLRPGroupResponse { } func ActualLRPGroupResponseToProtoSlice(values []*ActualLRPGroupResponse) []*ProtoActualLRPGroupResponse { + if values == nil { + return nil + } result := make([]*ProtoActualLRPGroupResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -281,6 +296,9 @@ func ActualLRPGroupResponseToProtoSlice(values []*ActualLRPGroupResponse) []*Pro } func ActualLRPGroupResponseFromProtoSlice(values []*ProtoActualLRPGroupResponse) []*ActualLRPGroupResponse { + if values == nil { + return nil + } result := make([]*ActualLRPGroupResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -371,6 +389,9 @@ func (x *ProtoActualLRPGroupsRequest) FromProto() *ActualLRPGroupsRequest { } func ActualLRPGroupsRequestToProtoSlice(values []*ActualLRPGroupsRequest) []*ProtoActualLRPGroupsRequest { + if values == nil { + return nil + } result := make([]*ProtoActualLRPGroupsRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -379,6 +400,9 @@ func ActualLRPGroupsRequestToProtoSlice(values []*ActualLRPGroupsRequest) []*Pro } func ActualLRPGroupsRequestFromProtoSlice(values []*ProtoActualLRPGroupsRequest) []*ActualLRPGroupsRequest { + if values == nil { + return nil + } result := make([]*ActualLRPGroupsRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -452,6 +476,9 @@ func (x *ProtoActualLRPGroupsByProcessGuidRequest) FromProto() *ActualLRPGroupsB } func ActualLRPGroupsByProcessGuidRequestToProtoSlice(values []*ActualLRPGroupsByProcessGuidRequest) []*ProtoActualLRPGroupsByProcessGuidRequest { + if values == nil { + return nil + } result := make([]*ProtoActualLRPGroupsByProcessGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -460,6 +487,9 @@ func ActualLRPGroupsByProcessGuidRequestToProtoSlice(values []*ActualLRPGroupsBy } func ActualLRPGroupsByProcessGuidRequestFromProtoSlice(values []*ProtoActualLRPGroupsByProcessGuidRequest) []*ActualLRPGroupsByProcessGuidRequest { + if values == nil { + return nil + } result := make([]*ActualLRPGroupsByProcessGuidRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -550,6 +580,9 @@ func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) FromProto() *ActualLRP } func ActualLRPGroupByProcessGuidAndIndexRequestToProtoSlice(values []*ActualLRPGroupByProcessGuidAndIndexRequest) []*ProtoActualLRPGroupByProcessGuidAndIndexRequest { + if values == nil { + return nil + } result := make([]*ProtoActualLRPGroupByProcessGuidAndIndexRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -558,6 +591,9 @@ func ActualLRPGroupByProcessGuidAndIndexRequestToProtoSlice(values []*ActualLRPG } func ActualLRPGroupByProcessGuidAndIndexRequestFromProtoSlice(values []*ProtoActualLRPGroupByProcessGuidAndIndexRequest) []*ActualLRPGroupByProcessGuidAndIndexRequest { + if values == nil { + return nil + } result := make([]*ActualLRPGroupByProcessGuidAndIndexRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -600,7 +636,7 @@ func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -665,6 +701,9 @@ func (x *ProtoClaimActualLRPRequest) FromProto() *ClaimActualLRPRequest { } func ClaimActualLRPRequestToProtoSlice(values []*ClaimActualLRPRequest) []*ProtoClaimActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoClaimActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -673,6 +712,9 @@ func ClaimActualLRPRequestToProtoSlice(values []*ClaimActualLRPRequest) []*Proto } func ClaimActualLRPRequestFromProtoSlice(values []*ProtoClaimActualLRPRequest) []*ClaimActualLRPRequest { + if values == nil { + return nil + } result := make([]*ClaimActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -713,13 +755,13 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { return false } if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { @@ -861,6 +903,9 @@ func (x *ProtoStartActualLRPRequest) FromProto() *StartActualLRPRequest { } func StartActualLRPRequestToProtoSlice(values []*StartActualLRPRequest) []*ProtoStartActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoStartActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -869,6 +914,9 @@ func StartActualLRPRequestToProtoSlice(values []*StartActualLRPRequest) []*Proto } func StartActualLRPRequestFromProtoSlice(values []*ProtoStartActualLRPRequest) []*StartActualLRPRequest { + if values == nil { + return nil + } result := make([]*StartActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -905,10 +953,10 @@ func (this *CrashActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -976,6 +1024,9 @@ func (x *ProtoCrashActualLRPRequest) FromProto() *CrashActualLRPRequest { } func CrashActualLRPRequestToProtoSlice(values []*CrashActualLRPRequest) []*ProtoCrashActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoCrashActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -984,6 +1035,9 @@ func CrashActualLRPRequestToProtoSlice(values []*CrashActualLRPRequest) []*Proto } func CrashActualLRPRequestFromProtoSlice(values []*ProtoCrashActualLRPRequest) []*CrashActualLRPRequest { + if values == nil { + return nil + } result := make([]*CrashActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1019,7 +1073,7 @@ func (this *FailActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -1074,6 +1128,9 @@ func (x *ProtoFailActualLRPRequest) FromProto() *FailActualLRPRequest { } func FailActualLRPRequestToProtoSlice(values []*FailActualLRPRequest) []*ProtoFailActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoFailActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1082,6 +1139,9 @@ func FailActualLRPRequestToProtoSlice(values []*FailActualLRPRequest) []*ProtoFa } func FailActualLRPRequestFromProtoSlice(values []*ProtoFailActualLRPRequest) []*FailActualLRPRequest { + if values == nil { + return nil + } result := make([]*FailActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1116,7 +1176,7 @@ func (this *RetireActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } return true @@ -1155,6 +1215,9 @@ func (x *ProtoRetireActualLRPRequest) FromProto() *RetireActualLRPRequest { } func RetireActualLRPRequestToProtoSlice(values []*RetireActualLRPRequest) []*ProtoRetireActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoRetireActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1163,6 +1226,9 @@ func RetireActualLRPRequestToProtoSlice(values []*RetireActualLRPRequest) []*Pro } func RetireActualLRPRequestFromProtoSlice(values []*ProtoRetireActualLRPRequest) []*RetireActualLRPRequest { + if values == nil { + return nil + } result := make([]*RetireActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1205,7 +1271,7 @@ func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -1270,6 +1336,9 @@ func (x *ProtoRemoveActualLRPRequest) FromProto() *RemoveActualLRPRequest { } func RemoveActualLRPRequestToProtoSlice(values []*RemoveActualLRPRequest) []*ProtoRemoveActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoRemoveActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1278,6 +1347,9 @@ func RemoveActualLRPRequestToProtoSlice(values []*RemoveActualLRPRequest) []*Pro } func RemoveActualLRPRequestFromProtoSlice(values []*ProtoRemoveActualLRPRequest) []*RemoveActualLRPRequest { + if values == nil { + return nil + } result := make([]*RemoveActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1313,7 +1385,7 @@ func (this *ActualLRPsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if len(this.ActualLrps) != len(that1.ActualLrps) { @@ -1373,6 +1445,9 @@ func (x *ProtoActualLRPsResponse) FromProto() *ActualLRPsResponse { } func ActualLRPsResponseToProtoSlice(values []*ActualLRPsResponse) []*ProtoActualLRPsResponse { + if values == nil { + return nil + } result := make([]*ProtoActualLRPsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1381,6 +1456,9 @@ func ActualLRPsResponseToProtoSlice(values []*ActualLRPsResponse) []*ProtoActual } func ActualLRPsResponseFromProtoSlice(values []*ProtoActualLRPsResponse) []*ActualLRPsResponse { + if values == nil { + return nil + } result := make([]*ActualLRPsResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1508,6 +1586,9 @@ func (x *ProtoActualLRPsRequest) FromProto() *ActualLRPsRequest { } func ActualLRPsRequestToProtoSlice(values []*ActualLRPsRequest) []*ProtoActualLRPsRequest { + if values == nil { + return nil + } result := make([]*ProtoActualLRPsRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1516,6 +1597,9 @@ func ActualLRPsRequestToProtoSlice(values []*ActualLRPsRequest) []*ProtoActualLR } func ActualLRPsRequestFromProtoSlice(values []*ProtoActualLRPsRequest) []*ActualLRPsRequest { + if values == nil { + return nil + } result := make([]*ActualLRPsRequest, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index d5ba3368..8450d213 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -174,6 +174,9 @@ func (x *ProtoCachedDependency) FromProto() *CachedDependency { } func CachedDependencyToProtoSlice(values []*CachedDependency) []*ProtoCachedDependency { + if values == nil { + return nil + } result := make([]*ProtoCachedDependency, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -182,6 +185,9 @@ func CachedDependencyToProtoSlice(values []*CachedDependency) []*ProtoCachedDepe } func CachedDependencyFromProtoSlice(values []*ProtoCachedDependency) []*CachedDependency { + if values == nil { + return nil + } result := make([]*CachedDependency, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index ac2e25bc..e25e779c 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -106,6 +106,9 @@ func (x *ProtoCellCapacity) FromProto() *CellCapacity { } func CellCapacityToProtoSlice(values []*CellCapacity) []*ProtoCellCapacity { + if values == nil { + return nil + } result := make([]*ProtoCellCapacity, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -114,6 +117,9 @@ func CellCapacityToProtoSlice(values []*CellCapacity) []*ProtoCellCapacity { } func CellCapacityFromProtoSlice(values []*ProtoCellCapacity) []*CellCapacity { + if values == nil { + return nil + } result := make([]*CellCapacity, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -164,7 +170,7 @@ func (this *CellPresence) Equal(that interface{}) bool { if this.Zone != that1.Zone { return false } - if !this.Capacity.Equal(that1.Capacity) { + if !this.Capacity.Equal(*that1.Capacity) { return false } if len(this.RootfsProviders) != len(that1.RootfsProviders) { @@ -321,6 +327,9 @@ func (x *ProtoCellPresence) FromProto() *CellPresence { } func CellPresenceToProtoSlice(values []*CellPresence) []*ProtoCellPresence { + if values == nil { + return nil + } result := make([]*ProtoCellPresence, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -329,6 +338,9 @@ func CellPresenceToProtoSlice(values []*CellPresence) []*ProtoCellPresence { } func CellPresenceFromProtoSlice(values []*ProtoCellPresence) []*CellPresence { + if values == nil { + return nil + } result := make([]*CellPresence, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -424,6 +436,9 @@ func (x *ProtoProvider) FromProto() *Provider { } func ProviderToProtoSlice(values []*Provider) []*ProtoProvider { + if values == nil { + return nil + } result := make([]*ProtoProvider, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -432,6 +447,9 @@ func ProviderToProtoSlice(values []*Provider) []*ProtoProvider { } func ProviderFromProtoSlice(values []*ProtoProvider) []*Provider { + if values == nil { + return nil + } result := make([]*Provider, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -467,7 +485,7 @@ func (this *CellsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if len(this.Cells) != len(that1.Cells) { @@ -527,6 +545,9 @@ func (x *ProtoCellsResponse) FromProto() *CellsResponse { } func CellsResponseToProtoSlice(values []*CellsResponse) []*ProtoCellsResponse { + if values == nil { + return nil + } result := make([]*ProtoCellsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -535,6 +556,9 @@ func CellsResponseToProtoSlice(values []*CellsResponse) []*ProtoCellsResponse { } func CellsResponseFromProtoSlice(values []*ProtoCellsResponse) []*CellsResponse { + if values == nil { + return nil + } result := make([]*CellsResponse, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 1bbeded2..78eb7fff 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -77,6 +77,9 @@ func (x *ProtoCertificateProperties) FromProto() *CertificateProperties { } func CertificatePropertiesToProtoSlice(values []*CertificateProperties) []*ProtoCertificateProperties { + if values == nil { + return nil + } result := make([]*ProtoCertificateProperties, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -85,6 +88,9 @@ func CertificatePropertiesToProtoSlice(values []*CertificateProperties) []*Proto } func CertificatePropertiesFromProtoSlice(values []*ProtoCertificateProperties) []*CertificateProperties { + if values == nil { + return nil + } result := make([]*CertificateProperties, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 1388a5f0..c237db84 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -116,6 +116,9 @@ func (x *ProtoCheckDefinition) FromProto() *CheckDefinition { } func CheckDefinitionToProtoSlice(values []*CheckDefinition) []*ProtoCheckDefinition { + if values == nil { + return nil + } result := make([]*ProtoCheckDefinition, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -124,6 +127,9 @@ func CheckDefinitionToProtoSlice(values []*CheckDefinition) []*ProtoCheckDefinit } func CheckDefinitionFromProtoSlice(values []*ProtoCheckDefinition) []*CheckDefinition { + if values == nil { + return nil + } result := make([]*CheckDefinition, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -159,10 +165,10 @@ func (this *Check) Equal(that interface{}) bool { return false } - if !this.TcpCheck.Equal(that1.TcpCheck) { + if !this.TcpCheck.Equal(*that1.TcpCheck) { return false } - if !this.HttpCheck.Equal(that1.HttpCheck) { + if !this.HttpCheck.Equal(*that1.HttpCheck) { return false } return true @@ -214,6 +220,9 @@ func (x *ProtoCheck) FromProto() *Check { } func CheckToProtoSlice(values []*Check) []*ProtoCheck { + if values == nil { + return nil + } result := make([]*ProtoCheck, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -222,6 +231,9 @@ func CheckToProtoSlice(values []*Check) []*ProtoCheck { } func CheckFromProtoSlice(values []*ProtoCheck) []*Check { + if values == nil { + return nil + } result := make([]*Check, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -329,6 +341,9 @@ func (x *ProtoTCPCheck) FromProto() *TCPCheck { } func TCPCheckToProtoSlice(values []*TCPCheck) []*ProtoTCPCheck { + if values == nil { + return nil + } result := make([]*ProtoTCPCheck, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -337,6 +352,9 @@ func TCPCheckToProtoSlice(values []*TCPCheck) []*ProtoTCPCheck { } func TCPCheckFromProtoSlice(values []*ProtoTCPCheck) []*TCPCheck { + if values == nil { + return nil + } result := make([]*TCPCheck, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -461,6 +479,9 @@ func (x *ProtoHTTPCheck) FromProto() *HTTPCheck { } func HTTPCheckToProtoSlice(values []*HTTPCheck) []*ProtoHTTPCheck { + if values == nil { + return nil + } result := make([]*ProtoHTTPCheck, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -469,6 +490,9 @@ func HTTPCheckToProtoSlice(values []*HTTPCheck) []*ProtoHTTPCheck { } func HTTPCheckFromProtoSlice(values []*ProtoHTTPCheck) []*HTTPCheck { + if values == nil { + return nil + } result := make([]*HTTPCheck, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 6d94f3c1..093d1667 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -52,7 +52,7 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo RootFs: desiredLrpResource.RootFs, Instances: schedInfo.Instances, Annotation: schedInfo.Annotation, - Routes: schedInfo.Routes, + Routes: &schedInfo.Routes, ModificationTag: schedInfo.ModificationTag, EnvironmentVariables: environmentVariables, CachedDependencies: runInfo.CachedDependencies, @@ -515,7 +515,7 @@ func NewDesiredLRPSchedulingInfo( Annotation: annotation, Instances: instances, DesiredLrpResource: &resource, - Routes: &routes, + Routes: routes, ModificationTag: &modTag, VolumePlacement: volumePlacement, PlacementTags: placementTags, @@ -545,7 +545,7 @@ func (s *DesiredLRPSchedulingInfo) ApplyUpdate(update *DesiredLRPUpdate) { s.Instances = *update.GetInstances() } if update.Routes != nil { - s.Routes = update.Routes + s.Routes = *update.Routes } if update.AnnotationExists() { s.Annotation = *update.GetAnnotation() diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 5189b948..e8ccbc49 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -983,41 +983,42 @@ var File_desired_lrp_proto protoreflect.FileDescriptor var file_desired_lrp_proto_rawDesc = []byte{ 0x0a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, - 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, - 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, - 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x76, 0x6f, 0x6c, - 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x16, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, - 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, - 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, - 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xda, 0x03, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, - 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x42, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, - 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x51, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x12, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, - 0x70, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x2b, 0x0a, 0x06, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x06, + 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, + 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, + 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, + 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x1a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x63, 0x68, 0x65, 0x63, + 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, + 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdf, 0x03, + 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, + 0x42, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, + 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x73, 0x12, 0x51, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x52, 0x12, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x52, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, @@ -1138,168 +1139,168 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0xe5, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x02, 0x38, 0x01, 0x22, 0xea, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, - 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, - 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, - 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x12, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, - 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1a, 0x0a, - 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, 0x01, 0x0a, 0x17, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, - 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, - 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x17, 0x0a, - 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, - 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, - 0x64, 0x73, 0x22, 0x83, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, + 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, - 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, - 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, - 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, - 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, - 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, - 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, 0x70, - 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, - 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, - 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x09, 0x6d, - 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, - 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, - 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, - 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, - 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, - 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, - 0x72, 0x74, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, + 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, + 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, + 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, + 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, + 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, + 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x88, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, + 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, + 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, + 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, + 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, + 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, - 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, - 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, - 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, - 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, - 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, - 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, - 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, - 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, - 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, - 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, - 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, - 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, - 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, - 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, - 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, - 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, - 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, - 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, - 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, - 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, - 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, - 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, - 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, - 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, - 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, - 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, - 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, - 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, - 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, - 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, + 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, + 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, + 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, + 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, + 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, + 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, + 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, + 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, + 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, + 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, + 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, + 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, + 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, + 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, + 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, + 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, + 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, + 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, + 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, + 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, + 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, + 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, + 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, + 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, + 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, + 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, + 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, + 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, + 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, + 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, + 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, + 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, + 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, + 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, + 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, + 0x65, 0x72, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, + 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, + 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, + 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, + 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, + 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, + 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1398,6 +1399,7 @@ func file_desired_lrp_proto_init() { return } file_actions_proto_init() + file_bbs_proto_init() file_cached_dependency_proto_init() file_certificate_properties_proto_init() file_environment_variables_proto_init() diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 4a64ec73..581c2902 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -12,7 +12,7 @@ type DesiredLRPSchedulingInfo struct { Annotation string Instances int32 DesiredLrpResource *DesiredLRPResource - Routes *Routes + Routes Routes ModificationTag *ModificationTag VolumePlacement *VolumePlacement PlacementTags []string @@ -40,7 +40,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { + if !this.DesiredLrpKey.Equal(*that1.DesiredLrpKey) { return false } if this.Annotation != that1.Annotation { @@ -49,16 +49,16 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if this.Instances != that1.Instances { return false } - if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { + if !this.DesiredLrpResource.Equal(*that1.DesiredLrpResource) { return false } - if !this.Routes.Equal(*that1.Routes) { + if !this.Routes.Equal(that1.Routes) { return false } - if !this.ModificationTag.Equal(that1.ModificationTag) { + if !this.ModificationTag.Equal(*that1.ModificationTag) { return false } - if !this.VolumePlacement.Equal(that1.VolumePlacement) { + if !this.VolumePlacement.Equal(*that1.VolumePlacement) { return false } if len(this.PlacementTags) != len(that1.PlacementTags) { @@ -115,13 +115,13 @@ func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value *DesiredLRPResour m.DesiredLrpResource = value } } -func (m *DesiredLRPSchedulingInfo) GetRoutes() *Routes { +func (m *DesiredLRPSchedulingInfo) GetRoutes() Routes { if m != nil { return m.Routes } return nil } -func (m *DesiredLRPSchedulingInfo) SetRoutes(value *Routes) { +func (m *DesiredLRPSchedulingInfo) SetRoutes(value Routes) { if m != nil { m.Routes = value } @@ -187,7 +187,7 @@ func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { Annotation: x.Annotation, Instances: x.Instances, DesiredLrpResource: x.DesiredLrpResource.FromProto(), - Routes: x.Routes.FromProto(), + Routes: *x.Routes.FromProto(), ModificationTag: x.ModificationTag.FromProto(), VolumePlacement: x.VolumePlacement.FromProto(), PlacementTags: x.PlacementTags, @@ -196,6 +196,9 @@ func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { } func DesiredLRPSchedulingInfoToProtoSlice(values []*DesiredLRPSchedulingInfo) []*ProtoDesiredLRPSchedulingInfo { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPSchedulingInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -204,6 +207,9 @@ func DesiredLRPSchedulingInfoToProtoSlice(values []*DesiredLRPSchedulingInfo) [] } func DesiredLRPSchedulingInfoFromProtoSlice(values []*ProtoDesiredLRPSchedulingInfo) []*DesiredLRPSchedulingInfo { + if values == nil { + return nil + } result := make([]*DesiredLRPSchedulingInfo, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -264,7 +270,7 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { + if !this.DesiredLrpKey.Equal(*that1.DesiredLrpKey) { return false } if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { @@ -275,13 +281,13 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if !this.Setup.Equal(that1.Setup) { + if !this.Setup.Equal(*that1.Setup) { return false } - if !this.Action.Equal(that1.Action) { + if !this.Action.Equal(*that1.Action) { return false } - if !this.Monitor.Equal(that1.Monitor) { + if !this.Monitor.Equal(*that1.Monitor) { return false } if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { @@ -340,13 +346,13 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if !this.Network.Equal(that1.Network) { + if !this.Network.Equal(*that1.Network) { return false } if this.StartTimeoutMs != that1.StartTimeoutMs { return false } - if !this.CertificateProperties.Equal(that1.CertificateProperties) { + if !this.CertificateProperties.Equal(*that1.CertificateProperties) { return false } if this.ImageUsername != that1.ImageUsername { @@ -355,7 +361,7 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { if this.ImagePassword != that1.ImagePassword { return false } - if !this.CheckDefinition.Equal(that1.CheckDefinition) { + if !this.CheckDefinition.Equal(*that1.CheckDefinition) { return false } if len(this.ImageLayers) != len(that1.ImageLayers) { @@ -382,7 +388,7 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if !this.LogRateLimit.Equal(that1.LogRateLimit) { + if !this.LogRateLimit.Equal(*that1.LogRateLimit) { return false } return true @@ -768,6 +774,9 @@ func (x *ProtoDesiredLRPRunInfo) FromProto() *DesiredLRPRunInfo { } func DesiredLRPRunInfoToProtoSlice(values []*DesiredLRPRunInfo) []*ProtoDesiredLRPRunInfo { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPRunInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -776,6 +785,9 @@ func DesiredLRPRunInfoToProtoSlice(values []*DesiredLRPRunInfo) []*ProtoDesiredL } func DesiredLRPRunInfoMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + if values == nil { + return nil + } result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -784,6 +796,9 @@ func DesiredLRPRunInfoMetricTagsToProtoMap(values map[string]*MetricTagValue) ma } func DesiredLRPRunInfoFromProtoSlice(values []*ProtoDesiredLRPRunInfo) []*DesiredLRPRunInfo { + if values == nil { + return nil + } result := make([]*DesiredLRPRunInfo, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -792,6 +807,9 @@ func DesiredLRPRunInfoFromProtoSlice(values []*ProtoDesiredLRPRunInfo) []*Desire } func DesiredLRPRunInfoMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + if values == nil { + return nil + } result := make(map[string]*MetricTagValue, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -930,6 +948,9 @@ func (x *ProtoDesiredLRPUpdate) FromProto() *DesiredLRPUpdate { } func DesiredLRPUpdateToProtoSlice(values []*DesiredLRPUpdate) []*ProtoDesiredLRPUpdate { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPUpdate, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -938,6 +959,9 @@ func DesiredLRPUpdateToProtoSlice(values []*DesiredLRPUpdate) []*ProtoDesiredLRP } func DesiredLRPUpdateMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + if values == nil { + return nil + } result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -946,6 +970,9 @@ func DesiredLRPUpdateMetricTagsToProtoMap(values map[string]*MetricTagValue) map } func DesiredLRPUpdateFromProtoSlice(values []*ProtoDesiredLRPUpdate) []*DesiredLRPUpdate { + if values == nil { + return nil + } result := make([]*DesiredLRPUpdate, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -954,6 +981,9 @@ func DesiredLRPUpdateFromProtoSlice(values []*ProtoDesiredLRPUpdate) []*DesiredL } func DesiredLRPUpdateMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + if values == nil { + return nil + } result := make(map[string]*MetricTagValue, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1061,6 +1091,9 @@ func (x *ProtoDesiredLRPKey) FromProto() *DesiredLRPKey { } func DesiredLRPKeyToProtoSlice(values []*DesiredLRPKey) []*ProtoDesiredLRPKey { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPKey, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1069,6 +1102,9 @@ func DesiredLRPKeyToProtoSlice(values []*DesiredLRPKey) []*ProtoDesiredLRPKey { } func DesiredLRPKeyFromProtoSlice(values []*ProtoDesiredLRPKey) []*DesiredLRPKey { + if values == nil { + return nil + } result := make([]*DesiredLRPKey, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1193,6 +1229,9 @@ func (x *ProtoDesiredLRPResource) FromProto() *DesiredLRPResource { } func DesiredLRPResourceToProtoSlice(values []*DesiredLRPResource) []*ProtoDesiredLRPResource { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPResource, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1201,6 +1240,9 @@ func DesiredLRPResourceToProtoSlice(values []*DesiredLRPResource) []*ProtoDesire } func DesiredLRPResourceFromProtoSlice(values []*ProtoDesiredLRPResource) []*DesiredLRPResource { + if values == nil { + return nil + } result := make([]*DesiredLRPResource, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1291,10 +1333,10 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.Setup.Equal(that1.Setup) { + if !this.Setup.Equal(*that1.Setup) { return false } - if !this.Action.Equal(that1.Action) { + if !this.Action.Equal(*that1.Action) { return false } if this.StartTimeoutMs != that1.StartTimeoutMs { @@ -1303,7 +1345,7 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { return false } - if !this.Monitor.Equal(that1.Monitor) { + if !this.Monitor.Equal(*that1.Monitor) { return false } if this.DiskMb != that1.DiskMb { @@ -1349,7 +1391,7 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.ModificationTag.Equal(that1.ModificationTag) { + if !this.ModificationTag.Equal(*that1.ModificationTag) { return false } if len(this.CachedDependencies) != len(that1.CachedDependencies) { @@ -1374,7 +1416,7 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.Network.Equal(that1.Network) { + if !this.Network.Equal(*that1.Network) { return false } if len(this.PlacementTags) != len(that1.PlacementTags) { @@ -1388,7 +1430,7 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.MaxPids != that1.MaxPids { return false } - if !this.CertificateProperties.Equal(that1.CertificateProperties) { + if !this.CertificateProperties.Equal(*that1.CertificateProperties) { return false } if this.ImageUsername != that1.ImageUsername { @@ -1397,7 +1439,7 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.ImagePassword != that1.ImagePassword { return false } - if !this.CheckDefinition.Equal(that1.CheckDefinition) { + if !this.CheckDefinition.Equal(*that1.CheckDefinition) { return false } if len(this.ImageLayers) != len(that1.ImageLayers) { @@ -1424,7 +1466,7 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.LogRateLimit.Equal(that1.LogRateLimit) { + if !this.LogRateLimit.Equal(*that1.LogRateLimit) { return false } return true @@ -1943,6 +1985,9 @@ func (x *ProtoDesiredLRP) FromProto() *DesiredLRP { } func DesiredLRPToProtoSlice(values []*DesiredLRP) []*ProtoDesiredLRP { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRP, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1951,6 +1996,9 @@ func DesiredLRPToProtoSlice(values []*DesiredLRP) []*ProtoDesiredLRP { } func DesiredLRPMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + if values == nil { + return nil + } result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1959,6 +2007,9 @@ func DesiredLRPMetricTagsToProtoMap(values map[string]*MetricTagValue) map[strin } func DesiredLRPFromProtoSlice(values []*ProtoDesiredLRP) []*DesiredLRP { + if values == nil { + return nil + } result := make([]*DesiredLRP, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1967,6 +2018,9 @@ func DesiredLRPFromProtoSlice(values []*ProtoDesiredLRP) []*DesiredLRP { } func DesiredLRPMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + if values == nil { + return nil + } result := make(map[string]*MetricTagValue, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index 59a4604b..3031017a 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -33,7 +33,7 @@ func (this *DesiredLRPLifecycleResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } return true @@ -72,6 +72,9 @@ func (x *ProtoDesiredLRPLifecycleResponse) FromProto() *DesiredLRPLifecycleRespo } func DesiredLRPLifecycleResponseToProtoSlice(values []*DesiredLRPLifecycleResponse) []*ProtoDesiredLRPLifecycleResponse { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPLifecycleResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +83,9 @@ func DesiredLRPLifecycleResponseToProtoSlice(values []*DesiredLRPLifecycleRespon } func DesiredLRPLifecycleResponseFromProtoSlice(values []*ProtoDesiredLRPLifecycleResponse) []*DesiredLRPLifecycleResponse { + if values == nil { + return nil + } result := make([]*DesiredLRPLifecycleResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -115,7 +121,7 @@ func (this *DesiredLRPsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if len(this.DesiredLrps) != len(that1.DesiredLrps) { @@ -175,6 +181,9 @@ func (x *ProtoDesiredLRPsResponse) FromProto() *DesiredLRPsResponse { } func DesiredLRPsResponseToProtoSlice(values []*DesiredLRPsResponse) []*ProtoDesiredLRPsResponse { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -183,6 +192,9 @@ func DesiredLRPsResponseToProtoSlice(values []*DesiredLRPsResponse) []*ProtoDesi } func DesiredLRPsResponseFromProtoSlice(values []*ProtoDesiredLRPsResponse) []*DesiredLRPsResponse { + if values == nil { + return nil + } result := make([]*DesiredLRPsResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -278,6 +290,9 @@ func (x *ProtoDesiredLRPsRequest) FromProto() *DesiredLRPsRequest { } func DesiredLRPsRequestToProtoSlice(values []*DesiredLRPsRequest) []*ProtoDesiredLRPsRequest { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPsRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -286,6 +301,9 @@ func DesiredLRPsRequestToProtoSlice(values []*DesiredLRPsRequest) []*ProtoDesire } func DesiredLRPsRequestFromProtoSlice(values []*ProtoDesiredLRPsRequest) []*DesiredLRPsRequest { + if values == nil { + return nil + } result := make([]*DesiredLRPsRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -321,10 +339,10 @@ func (this *DesiredLRPResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } return true @@ -376,6 +394,9 @@ func (x *ProtoDesiredLRPResponse) FromProto() *DesiredLRPResponse { } func DesiredLRPResponseToProtoSlice(values []*DesiredLRPResponse) []*ProtoDesiredLRPResponse { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -384,6 +405,9 @@ func DesiredLRPResponseToProtoSlice(values []*DesiredLRPResponse) []*ProtoDesire } func DesiredLRPResponseFromProtoSlice(values []*ProtoDesiredLRPResponse) []*DesiredLRPResponse { + if values == nil { + return nil + } result := make([]*DesiredLRPResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -419,7 +443,7 @@ func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if len(this.DesiredLrpSchedulingInfos) != len(that1.DesiredLrpSchedulingInfos) { @@ -479,6 +503,9 @@ func (x *ProtoDesiredLRPSchedulingInfosResponse) FromProto() *DesiredLRPScheduli } func DesiredLRPSchedulingInfosResponseToProtoSlice(values []*DesiredLRPSchedulingInfosResponse) []*ProtoDesiredLRPSchedulingInfosResponse { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPSchedulingInfosResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -487,6 +514,9 @@ func DesiredLRPSchedulingInfosResponseToProtoSlice(values []*DesiredLRPSchedulin } func DesiredLRPSchedulingInfosResponseFromProtoSlice(values []*ProtoDesiredLRPSchedulingInfosResponse) []*DesiredLRPSchedulingInfosResponse { + if values == nil { + return nil + } result := make([]*DesiredLRPSchedulingInfosResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -522,10 +552,10 @@ func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{ return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } - if !this.DesiredLrpSchedulingInfo.Equal(that1.DesiredLrpSchedulingInfo) { + if !this.DesiredLrpSchedulingInfo.Equal(*that1.DesiredLrpSchedulingInfo) { return false } return true @@ -577,6 +607,9 @@ func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) FromProto() *Desire } func DesiredLRPSchedulingInfoByProcessGuidResponseToProtoSlice(values []*DesiredLRPSchedulingInfoByProcessGuidResponse) []*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -585,6 +618,9 @@ func DesiredLRPSchedulingInfoByProcessGuidResponseToProtoSlice(values []*Desired } func DesiredLRPSchedulingInfoByProcessGuidResponseFromProtoSlice(values []*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) []*DesiredLRPSchedulingInfoByProcessGuidResponse { + if values == nil { + return nil + } result := make([]*DesiredLRPSchedulingInfoByProcessGuidResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -658,6 +694,9 @@ func (x *ProtoDesiredLRPByProcessGuidRequest) FromProto() *DesiredLRPByProcessGu } func DesiredLRPByProcessGuidRequestToProtoSlice(values []*DesiredLRPByProcessGuidRequest) []*ProtoDesiredLRPByProcessGuidRequest { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPByProcessGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -666,6 +705,9 @@ func DesiredLRPByProcessGuidRequestToProtoSlice(values []*DesiredLRPByProcessGui } func DesiredLRPByProcessGuidRequestFromProtoSlice(values []*ProtoDesiredLRPByProcessGuidRequest) []*DesiredLRPByProcessGuidRequest { + if values == nil { + return nil + } result := make([]*DesiredLRPByProcessGuidRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -700,7 +742,7 @@ func (this *DesireLRPRequest) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } return true @@ -739,6 +781,9 @@ func (x *ProtoDesireLRPRequest) FromProto() *DesireLRPRequest { } func DesireLRPRequestToProtoSlice(values []*DesireLRPRequest) []*ProtoDesireLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoDesireLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -747,6 +792,9 @@ func DesireLRPRequestToProtoSlice(values []*DesireLRPRequest) []*ProtoDesireLRPR } func DesireLRPRequestFromProtoSlice(values []*ProtoDesireLRPRequest) []*DesireLRPRequest { + if values == nil { + return nil + } result := make([]*DesireLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -785,7 +833,7 @@ func (this *UpdateDesiredLRPRequest) Equal(that interface{}) bool { if this.ProcessGuid != that1.ProcessGuid { return false } - if !this.Update.Equal(that1.Update) { + if !this.Update.Equal(*that1.Update) { return false } return true @@ -837,6 +885,9 @@ func (x *ProtoUpdateDesiredLRPRequest) FromProto() *UpdateDesiredLRPRequest { } func UpdateDesiredLRPRequestToProtoSlice(values []*UpdateDesiredLRPRequest) []*ProtoUpdateDesiredLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoUpdateDesiredLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -845,6 +896,9 @@ func UpdateDesiredLRPRequestToProtoSlice(values []*UpdateDesiredLRPRequest) []*P } func UpdateDesiredLRPRequestFromProtoSlice(values []*ProtoUpdateDesiredLRPRequest) []*UpdateDesiredLRPRequest { + if values == nil { + return nil + } result := make([]*UpdateDesiredLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -918,6 +972,9 @@ func (x *ProtoRemoveDesiredLRPRequest) FromProto() *RemoveDesiredLRPRequest { } func RemoveDesiredLRPRequestToProtoSlice(values []*RemoveDesiredLRPRequest) []*ProtoRemoveDesiredLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoRemoveDesiredLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -926,6 +983,9 @@ func RemoveDesiredLRPRequestToProtoSlice(values []*RemoveDesiredLRPRequest) []*P } func RemoveDesiredLRPRequestFromProtoSlice(values []*ProtoRemoveDesiredLRPRequest) []*RemoveDesiredLRPRequest { + if values == nil { + return nil + } result := make([]*RemoveDesiredLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/desired_lrp_test.go b/models/desired_lrp_test.go index 59146828..2b85dbdd 100644 --- a/models/desired_lrp_test.go +++ b/models/desired_lrp_test.go @@ -387,7 +387,7 @@ var _ = Describe("DesiredLRP", func() { schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = &models.Routes{} + expectedSchedulingInfo.Routes = models.Routes{} expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -435,7 +435,7 @@ var _ = Describe("DesiredLRP", func() { schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = &models.Routes{ + expectedSchedulingInfo.Routes = models.Routes{ "router": &rawMessage, } expectedSchedulingInfo.ModificationTag.Increment() diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 0508a46f..4aecbc51 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -34,7 +34,7 @@ func (this *DomainsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if len(this.Domains) != len(that1.Domains) { @@ -94,6 +94,9 @@ func (x *ProtoDomainsResponse) FromProto() *DomainsResponse { } func DomainsResponseToProtoSlice(values []*DomainsResponse) []*ProtoDomainsResponse { + if values == nil { + return nil + } result := make([]*ProtoDomainsResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -102,6 +105,9 @@ func DomainsResponseToProtoSlice(values []*DomainsResponse) []*ProtoDomainsRespo } func DomainsResponseFromProtoSlice(values []*ProtoDomainsResponse) []*DomainsResponse { + if values == nil { + return nil + } result := make([]*DomainsResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -136,7 +142,7 @@ func (this *UpsertDomainResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } return true @@ -175,6 +181,9 @@ func (x *ProtoUpsertDomainResponse) FromProto() *UpsertDomainResponse { } func UpsertDomainResponseToProtoSlice(values []*UpsertDomainResponse) []*ProtoUpsertDomainResponse { + if values == nil { + return nil + } result := make([]*ProtoUpsertDomainResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -183,6 +192,9 @@ func UpsertDomainResponseToProtoSlice(values []*UpsertDomainResponse) []*ProtoUp } func UpsertDomainResponseFromProtoSlice(values []*ProtoUpsertDomainResponse) []*UpsertDomainResponse { + if values == nil { + return nil + } result := make([]*UpsertDomainResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -273,6 +285,9 @@ func (x *ProtoUpsertDomainRequest) FromProto() *UpsertDomainRequest { } func UpsertDomainRequestToProtoSlice(values []*UpsertDomainRequest) []*ProtoUpsertDomainRequest { + if values == nil { + return nil + } result := make([]*ProtoUpsertDomainRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -281,6 +296,9 @@ func UpsertDomainRequestToProtoSlice(values []*UpsertDomainRequest) []*ProtoUpse } func UpsertDomainRequestFromProtoSlice(values []*ProtoUpsertDomainRequest) []*UpsertDomainRequest { + if values == nil { + return nil + } result := make([]*UpsertDomainRequest, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index fb98e619..8d6597d1 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -89,6 +89,9 @@ func (x *ProtoEnvironmentVariable) FromProto() *EnvironmentVariable { } func EnvironmentVariableToProtoSlice(values []*EnvironmentVariable) []*ProtoEnvironmentVariable { + if values == nil { + return nil + } result := make([]*ProtoEnvironmentVariable, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -97,6 +100,9 @@ func EnvironmentVariableToProtoSlice(values []*EnvironmentVariable) []*ProtoEnvi } func EnvironmentVariableFromProtoSlice(values []*ProtoEnvironmentVariable) []*EnvironmentVariable { + if values == nil { + return nil + } result := make([]*EnvironmentVariable, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 250cfd02..0eb8585f 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -189,6 +189,9 @@ func (x *ProtoError) FromProto() *Error { } func ErrorToProtoSlice(values []*Error) []*ProtoError { + if values == nil { + return nil + } result := make([]*ProtoError, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -197,6 +200,9 @@ func ErrorToProtoSlice(values []*Error) []*ProtoError { } func ErrorFromProtoSlice(values []*ProtoError) []*Error { + if values == nil { + return nil + } result := make([]*Error, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index ad5a5d9f..d7180681 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -34,7 +34,7 @@ func (this *EvacuationResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if this.KeepContainer != that1.KeepContainer { @@ -89,6 +89,9 @@ func (x *ProtoEvacuationResponse) FromProto() *EvacuationResponse { } func EvacuationResponseToProtoSlice(values []*EvacuationResponse) []*ProtoEvacuationResponse { + if values == nil { + return nil + } result := make([]*ProtoEvacuationResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -97,6 +100,9 @@ func EvacuationResponseToProtoSlice(values []*EvacuationResponse) []*ProtoEvacua } func EvacuationResponseFromProtoSlice(values []*ProtoEvacuationResponse) []*EvacuationResponse { + if values == nil { + return nil + } result := make([]*EvacuationResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -132,10 +138,10 @@ func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -187,6 +193,9 @@ func (x *ProtoEvacuateClaimedActualLRPRequest) FromProto() *EvacuateClaimedActua } func EvacuateClaimedActualLRPRequestToProtoSlice(values []*EvacuateClaimedActualLRPRequest) []*ProtoEvacuateClaimedActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoEvacuateClaimedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -195,6 +204,9 @@ func EvacuateClaimedActualLRPRequestToProtoSlice(values []*EvacuateClaimedActual } func EvacuateClaimedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateClaimedActualLRPRequest) []*EvacuateClaimedActualLRPRequest { + if values == nil { + return nil + } result := make([]*EvacuateClaimedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -235,13 +247,13 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { return false } if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { @@ -383,6 +395,9 @@ func (x *ProtoEvacuateRunningActualLRPRequest) FromProto() *EvacuateRunningActua } func EvacuateRunningActualLRPRequestToProtoSlice(values []*EvacuateRunningActualLRPRequest) []*ProtoEvacuateRunningActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoEvacuateRunningActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -391,6 +406,9 @@ func EvacuateRunningActualLRPRequestToProtoSlice(values []*EvacuateRunningActual } func EvacuateRunningActualLRPRequestFromProtoSlice(values []*ProtoEvacuateRunningActualLRPRequest) []*EvacuateRunningActualLRPRequest { + if values == nil { + return nil + } result := make([]*EvacuateRunningActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -426,10 +444,10 @@ func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -481,6 +499,9 @@ func (x *ProtoEvacuateStoppedActualLRPRequest) FromProto() *EvacuateStoppedActua } func EvacuateStoppedActualLRPRequestToProtoSlice(values []*EvacuateStoppedActualLRPRequest) []*ProtoEvacuateStoppedActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoEvacuateStoppedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -489,6 +510,9 @@ func EvacuateStoppedActualLRPRequestToProtoSlice(values []*EvacuateStoppedActual } func EvacuateStoppedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateStoppedActualLRPRequest) []*EvacuateStoppedActualLRPRequest { + if values == nil { + return nil + } result := make([]*EvacuateStoppedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -525,10 +549,10 @@ func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -596,6 +620,9 @@ func (x *ProtoEvacuateCrashedActualLRPRequest) FromProto() *EvacuateCrashedActua } func EvacuateCrashedActualLRPRequestToProtoSlice(values []*EvacuateCrashedActualLRPRequest) []*ProtoEvacuateCrashedActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoEvacuateCrashedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -604,6 +631,9 @@ func EvacuateCrashedActualLRPRequestToProtoSlice(values []*EvacuateCrashedActual } func EvacuateCrashedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateCrashedActualLRPRequest) []*EvacuateCrashedActualLRPRequest { + if values == nil { + return nil + } result := make([]*EvacuateCrashedActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -639,10 +669,10 @@ func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -694,6 +724,9 @@ func (x *ProtoRemoveEvacuatingActualLRPRequest) FromProto() *RemoveEvacuatingAct } func RemoveEvacuatingActualLRPRequestToProtoSlice(values []*RemoveEvacuatingActualLRPRequest) []*ProtoRemoveEvacuatingActualLRPRequest { + if values == nil { + return nil + } result := make([]*ProtoRemoveEvacuatingActualLRPRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -702,6 +735,9 @@ func RemoveEvacuatingActualLRPRequestToProtoSlice(values []*RemoveEvacuatingActu } func RemoveEvacuatingActualLRPRequestFromProtoSlice(values []*ProtoRemoveEvacuatingActualLRPRequest) []*RemoveEvacuatingActualLRPRequest { + if values == nil { + return nil + } result := make([]*RemoveEvacuatingActualLRPRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -736,7 +772,7 @@ func (this *RemoveEvacuatingActualLRPResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } return true @@ -775,6 +811,9 @@ func (x *ProtoRemoveEvacuatingActualLRPResponse) FromProto() *RemoveEvacuatingAc } func RemoveEvacuatingActualLRPResponseToProtoSlice(values []*RemoveEvacuatingActualLRPResponse) []*ProtoRemoveEvacuatingActualLRPResponse { + if values == nil { + return nil + } result := make([]*ProtoRemoveEvacuatingActualLRPResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -783,6 +822,9 @@ func RemoveEvacuatingActualLRPResponseToProtoSlice(values []*RemoveEvacuatingAct } func RemoveEvacuatingActualLRPResponseFromProtoSlice(values []*ProtoRemoveEvacuatingActualLRPResponse) []*RemoveEvacuatingActualLRPResponse { + if values == nil { + return nil + } result := make([]*RemoveEvacuatingActualLRPResponse, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 0be5e5d9..033272aa 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -33,7 +33,7 @@ func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { return false } return true @@ -72,6 +72,9 @@ func (x *ProtoActualLRPCreatedEvent) FromProto() *ActualLRPCreatedEvent { } func ActualLRPCreatedEventToProtoSlice(values []*ActualLRPCreatedEvent) []*ProtoActualLRPCreatedEvent { + if values == nil { + return nil + } result := make([]*ProtoActualLRPCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +83,9 @@ func ActualLRPCreatedEventToProtoSlice(values []*ActualLRPCreatedEvent) []*Proto } func ActualLRPCreatedEventFromProtoSlice(values []*ProtoActualLRPCreatedEvent) []*ActualLRPCreatedEvent { + if values == nil { + return nil + } result := make([]*ActualLRPCreatedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -115,10 +121,10 @@ func (this *ActualLRPChangedEvent) Equal(that interface{}) bool { return false } - if !this.Before.Equal(that1.Before) { + if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(that1.After) { + if !this.After.Equal(*that1.After) { return false } return true @@ -170,6 +176,9 @@ func (x *ProtoActualLRPChangedEvent) FromProto() *ActualLRPChangedEvent { } func ActualLRPChangedEventToProtoSlice(values []*ActualLRPChangedEvent) []*ProtoActualLRPChangedEvent { + if values == nil { + return nil + } result := make([]*ProtoActualLRPChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -178,6 +187,9 @@ func ActualLRPChangedEventToProtoSlice(values []*ActualLRPChangedEvent) []*Proto } func ActualLRPChangedEventFromProtoSlice(values []*ProtoActualLRPChangedEvent) []*ActualLRPChangedEvent { + if values == nil { + return nil + } result := make([]*ActualLRPChangedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -212,7 +224,7 @@ func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpGroup.Equal(that1.ActualLrpGroup) { + if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { return false } return true @@ -251,6 +263,9 @@ func (x *ProtoActualLRPRemovedEvent) FromProto() *ActualLRPRemovedEvent { } func ActualLRPRemovedEventToProtoSlice(values []*ActualLRPRemovedEvent) []*ProtoActualLRPRemovedEvent { + if values == nil { + return nil + } result := make([]*ProtoActualLRPRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -259,6 +274,9 @@ func ActualLRPRemovedEventToProtoSlice(values []*ActualLRPRemovedEvent) []*Proto } func ActualLRPRemovedEventFromProtoSlice(values []*ProtoActualLRPRemovedEvent) []*ActualLRPRemovedEvent { + if values == nil { + return nil + } result := make([]*ActualLRPRemovedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -294,7 +312,7 @@ func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrp.Equal(that1.ActualLrp) { + if !this.ActualLrp.Equal(*that1.ActualLrp) { return false } if this.TraceId != that1.TraceId { @@ -349,6 +367,9 @@ func (x *ProtoActualLRPInstanceCreatedEvent) FromProto() *ActualLRPInstanceCreat } func ActualLRPInstanceCreatedEventToProtoSlice(values []*ActualLRPInstanceCreatedEvent) []*ProtoActualLRPInstanceCreatedEvent { + if values == nil { + return nil + } result := make([]*ProtoActualLRPInstanceCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -357,6 +378,9 @@ func ActualLRPInstanceCreatedEventToProtoSlice(values []*ActualLRPInstanceCreate } func ActualLRPInstanceCreatedEventFromProtoSlice(values []*ProtoActualLRPInstanceCreatedEvent) []*ActualLRPInstanceCreatedEvent { + if values == nil { + return nil + } result := make([]*ActualLRPInstanceCreatedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -400,7 +424,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { return false } - if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { + if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -418,7 +442,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { if this.Since != that1.Since { return false } - if !this.ModificationTag.Equal(that1.ModificationTag) { + if !this.ModificationTag.Equal(*that1.ModificationTag) { return false } if this.Presence != that1.Presence { @@ -586,6 +610,9 @@ func (x *ProtoActualLRPInfo) FromProto() *ActualLRPInfo { } func ActualLRPInfoToProtoSlice(values []*ActualLRPInfo) []*ProtoActualLRPInfo { + if values == nil { + return nil + } result := make([]*ProtoActualLRPInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -594,6 +621,9 @@ func ActualLRPInfoToProtoSlice(values []*ActualLRPInfo) []*ProtoActualLRPInfo { } func ActualLRPInfoFromProtoSlice(values []*ProtoActualLRPInfo) []*ActualLRPInfo { + if values == nil { + return nil + } result := make([]*ActualLRPInfo, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -632,16 +662,16 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } - if !this.Before.Equal(that1.Before) { + if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(that1.After) { + if !this.After.Equal(*that1.After) { return false } if this.TraceId != that1.TraceId { @@ -735,6 +765,9 @@ func (x *ProtoActualLRPInstanceChangedEvent) FromProto() *ActualLRPInstanceChang } func ActualLRPInstanceChangedEventToProtoSlice(values []*ActualLRPInstanceChangedEvent) []*ProtoActualLRPInstanceChangedEvent { + if values == nil { + return nil + } result := make([]*ProtoActualLRPInstanceChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -743,6 +776,9 @@ func ActualLRPInstanceChangedEventToProtoSlice(values []*ActualLRPInstanceChange } func ActualLRPInstanceChangedEventFromProtoSlice(values []*ProtoActualLRPInstanceChangedEvent) []*ActualLRPInstanceChangedEvent { + if values == nil { + return nil + } result := make([]*ActualLRPInstanceChangedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -778,7 +814,7 @@ func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrp.Equal(that1.ActualLrp) { + if !this.ActualLrp.Equal(*that1.ActualLrp) { return false } if this.TraceId != that1.TraceId { @@ -833,6 +869,9 @@ func (x *ProtoActualLRPInstanceRemovedEvent) FromProto() *ActualLRPInstanceRemov } func ActualLRPInstanceRemovedEventToProtoSlice(values []*ActualLRPInstanceRemovedEvent) []*ProtoActualLRPInstanceRemovedEvent { + if values == nil { + return nil + } result := make([]*ProtoActualLRPInstanceRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -841,6 +880,9 @@ func ActualLRPInstanceRemovedEventToProtoSlice(values []*ActualLRPInstanceRemove } func ActualLRPInstanceRemovedEventFromProtoSlice(values []*ProtoActualLRPInstanceRemovedEvent) []*ActualLRPInstanceRemovedEvent { + if values == nil { + return nil + } result := make([]*ActualLRPInstanceRemovedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -876,7 +918,7 @@ func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } if this.TraceId != that1.TraceId { @@ -931,6 +973,9 @@ func (x *ProtoDesiredLRPCreatedEvent) FromProto() *DesiredLRPCreatedEvent { } func DesiredLRPCreatedEventToProtoSlice(values []*DesiredLRPCreatedEvent) []*ProtoDesiredLRPCreatedEvent { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -939,6 +984,9 @@ func DesiredLRPCreatedEventToProtoSlice(values []*DesiredLRPCreatedEvent) []*Pro } func DesiredLRPCreatedEventFromProtoSlice(values []*ProtoDesiredLRPCreatedEvent) []*DesiredLRPCreatedEvent { + if values == nil { + return nil + } result := make([]*DesiredLRPCreatedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -975,10 +1023,10 @@ func (this *DesiredLRPChangedEvent) Equal(that interface{}) bool { return false } - if !this.Before.Equal(that1.Before) { + if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(that1.After) { + if !this.After.Equal(*that1.After) { return false } if this.TraceId != that1.TraceId { @@ -1046,6 +1094,9 @@ func (x *ProtoDesiredLRPChangedEvent) FromProto() *DesiredLRPChangedEvent { } func DesiredLRPChangedEventToProtoSlice(values []*DesiredLRPChangedEvent) []*ProtoDesiredLRPChangedEvent { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1054,6 +1105,9 @@ func DesiredLRPChangedEventToProtoSlice(values []*DesiredLRPChangedEvent) []*Pro } func DesiredLRPChangedEventFromProtoSlice(values []*ProtoDesiredLRPChangedEvent) []*DesiredLRPChangedEvent { + if values == nil { + return nil + } result := make([]*DesiredLRPChangedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1089,7 +1143,7 @@ func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(that1.DesiredLrp) { + if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } if this.TraceId != that1.TraceId { @@ -1144,6 +1198,9 @@ func (x *ProtoDesiredLRPRemovedEvent) FromProto() *DesiredLRPRemovedEvent { } func DesiredLRPRemovedEventToProtoSlice(values []*DesiredLRPRemovedEvent) []*ProtoDesiredLRPRemovedEvent { + if values == nil { + return nil + } result := make([]*ProtoDesiredLRPRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1152,6 +1209,9 @@ func DesiredLRPRemovedEventToProtoSlice(values []*DesiredLRPRemovedEvent) []*Pro } func DesiredLRPRemovedEventFromProtoSlice(values []*ProtoDesiredLRPRemovedEvent) []*DesiredLRPRemovedEvent { + if values == nil { + return nil + } result := make([]*DesiredLRPRemovedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1190,10 +1250,10 @@ func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } if this.CrashCount != that1.CrashCount { @@ -1293,6 +1353,9 @@ func (x *ProtoActualLRPCrashedEvent) FromProto() *ActualLRPCrashedEvent { } func ActualLRPCrashedEventToProtoSlice(values []*ActualLRPCrashedEvent) []*ProtoActualLRPCrashedEvent { + if values == nil { + return nil + } result := make([]*ProtoActualLRPCrashedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1301,6 +1364,9 @@ func ActualLRPCrashedEventToProtoSlice(values []*ActualLRPCrashedEvent) []*Proto } func ActualLRPCrashedEventFromProtoSlice(values []*ProtoActualLRPCrashedEvent) []*ActualLRPCrashedEvent { + if values == nil { + return nil + } result := make([]*ActualLRPCrashedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1374,6 +1440,9 @@ func (x *ProtoEventsByCellId) FromProto() *EventsByCellId { } func EventsByCellIdToProtoSlice(values []*EventsByCellId) []*ProtoEventsByCellId { + if values == nil { + return nil + } result := make([]*ProtoEventsByCellId, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1382,6 +1451,9 @@ func EventsByCellIdToProtoSlice(values []*EventsByCellId) []*ProtoEventsByCellId } func EventsByCellIdFromProtoSlice(values []*ProtoEventsByCellId) []*EventsByCellId { + if values == nil { + return nil + } result := make([]*EventsByCellId, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1416,7 +1488,7 @@ func (this *TaskCreatedEvent) Equal(that interface{}) bool { return false } - if !this.Task.Equal(that1.Task) { + if !this.Task.Equal(*that1.Task) { return false } return true @@ -1455,6 +1527,9 @@ func (x *ProtoTaskCreatedEvent) FromProto() *TaskCreatedEvent { } func TaskCreatedEventToProtoSlice(values []*TaskCreatedEvent) []*ProtoTaskCreatedEvent { + if values == nil { + return nil + } result := make([]*ProtoTaskCreatedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1463,6 +1538,9 @@ func TaskCreatedEventToProtoSlice(values []*TaskCreatedEvent) []*ProtoTaskCreate } func TaskCreatedEventFromProtoSlice(values []*ProtoTaskCreatedEvent) []*TaskCreatedEvent { + if values == nil { + return nil + } result := make([]*TaskCreatedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1498,10 +1576,10 @@ func (this *TaskChangedEvent) Equal(that interface{}) bool { return false } - if !this.Before.Equal(that1.Before) { + if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(that1.After) { + if !this.After.Equal(*that1.After) { return false } return true @@ -1553,6 +1631,9 @@ func (x *ProtoTaskChangedEvent) FromProto() *TaskChangedEvent { } func TaskChangedEventToProtoSlice(values []*TaskChangedEvent) []*ProtoTaskChangedEvent { + if values == nil { + return nil + } result := make([]*ProtoTaskChangedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1561,6 +1642,9 @@ func TaskChangedEventToProtoSlice(values []*TaskChangedEvent) []*ProtoTaskChange } func TaskChangedEventFromProtoSlice(values []*ProtoTaskChangedEvent) []*TaskChangedEvent { + if values == nil { + return nil + } result := make([]*TaskChangedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1595,7 +1679,7 @@ func (this *TaskRemovedEvent) Equal(that interface{}) bool { return false } - if !this.Task.Equal(that1.Task) { + if !this.Task.Equal(*that1.Task) { return false } return true @@ -1634,6 +1718,9 @@ func (x *ProtoTaskRemovedEvent) FromProto() *TaskRemovedEvent { } func TaskRemovedEventToProtoSlice(values []*TaskRemovedEvent) []*ProtoTaskRemovedEvent { + if values == nil { + return nil + } result := make([]*ProtoTaskRemovedEvent, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1642,6 +1729,9 @@ func TaskRemovedEventToProtoSlice(values []*TaskRemovedEvent) []*ProtoTaskRemove } func TaskRemovedEventFromProtoSlice(values []*ProtoTaskRemovedEvent) []*TaskRemovedEvent { + if values == nil { + return nil + } result := make([]*TaskRemovedEvent, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 1df6d327..b0ce4ca8 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -271,6 +271,9 @@ func (x *ProtoImageLayer) FromProto() *ImageLayer { } func ImageLayerToProtoSlice(values []*ImageLayer) []*ProtoImageLayer { + if values == nil { + return nil + } result := make([]*ProtoImageLayer, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -279,6 +282,9 @@ func ImageLayerToProtoSlice(values []*ImageLayer) []*ProtoImageLayer { } func ImageLayerFromProtoSlice(values []*ProtoImageLayer) []*ImageLayer { + if values == nil { + return nil + } result := make([]*ImageLayer, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index df6d63af..f453f4f4 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -72,6 +72,9 @@ func (x *ProtoLogRateLimit) FromProto() *LogRateLimit { } func LogRateLimitToProtoSlice(values []*LogRateLimit) []*ProtoLogRateLimit { + if values == nil { + return nil + } result := make([]*ProtoLogRateLimit, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +83,9 @@ func LogRateLimitToProtoSlice(values []*LogRateLimit) []*ProtoLogRateLimit { } func LogRateLimitFromProtoSlice(values []*ProtoLogRateLimit) []*LogRateLimit { + if values == nil { + return nil + } result := make([]*LogRateLimit, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 05e77c3e..57a56441 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -123,6 +123,9 @@ func (x *ProtoMetricTagValue) FromProto() *MetricTagValue { } func MetricTagValueToProtoSlice(values []*MetricTagValue) []*ProtoMetricTagValue { + if values == nil { + return nil + } result := make([]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -131,6 +134,9 @@ func MetricTagValueToProtoSlice(values []*MetricTagValue) []*ProtoMetricTagValue } func MetricTagValueFromProtoSlice(values []*ProtoMetricTagValue) []*MetricTagValue { + if values == nil { + return nil + } result := make([]*MetricTagValue, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 64324df2..0815522f 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -89,6 +89,9 @@ func (x *ProtoModificationTag) FromProto() *ModificationTag { } func ModificationTagToProtoSlice(values []*ModificationTag) []*ProtoModificationTag { + if values == nil { + return nil + } result := make([]*ProtoModificationTag, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -97,6 +100,9 @@ func ModificationTagToProtoSlice(values []*ModificationTag) []*ProtoModification } func ModificationTagFromProtoSlice(values []*ProtoModificationTag) []*ModificationTag { + if values == nil { + return nil + } result := make([]*ModificationTag, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 83fe636a..5cedfc24 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -77,6 +77,9 @@ func (x *ProtoNetwork) FromProto() *Network { } func NetworkToProtoSlice(values []*Network) []*ProtoNetwork { + if values == nil { + return nil + } result := make([]*ProtoNetwork, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -85,6 +88,9 @@ func NetworkToProtoSlice(values []*Network) []*ProtoNetwork { } func NetworkFromProtoSlice(values []*ProtoNetwork) []*Network { + if values == nil { + return nil + } result := make([]*Network, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index ae4a9644..293e4e80 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -72,6 +72,9 @@ func (x *ProtoPingResponse) FromProto() *PingResponse { } func PingResponseToProtoSlice(values []*PingResponse) []*ProtoPingResponse { + if values == nil { + return nil + } result := make([]*ProtoPingResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +83,9 @@ func PingResponseToProtoSlice(values []*PingResponse) []*ProtoPingResponse { } func PingResponseFromProtoSlice(values []*ProtoPingResponse) []*PingResponse { + if values == nil { + return nil + } result := make([]*PingResponse, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/routes_test.go b/models/routes_test.go index 8710520c..5dd5a4b2 100644 --- a/models/routes_test.go +++ b/models/routes_test.go @@ -20,6 +20,21 @@ var _ = Describe("Routes", func() { update = models.DesiredLRPUpdate{ Routes: routes, } + /* + The point of these tests is to go from non-proto struct + to JSON/Protobuf (binary) representation and back. + With the new protobuf requirements we have to add a step + to convert to the Proto struct before we can get the + Proto binary representation. + + Old way: + DesiredLRPUpdate -> Protobuf binary -> DesiredLRPUpdate + + New way: + DesiredLRPUpdate -> ProtoDesiredLRPUpdate -> Protobuf binary -> ProtoDesiredLRPUpdate -> DesiredLRPUpdate + + 2024-05-15: It remains to be seen if this extra layer is going to cause performance issues + */ b, err := json.Marshal(update) Expect(err).NotTo(HaveOccurred()) @@ -29,9 +44,10 @@ var _ = Describe("Routes", func() { protoUpdate := update.ToProto() b, err = proto.Marshal(protoUpdate) Expect(err).NotTo(HaveOccurred()) - protoA := aProto.ToProto() + protoA := aProto.ToProto() // aProto is empty ProtoDesiredLRPUpdate err = proto.Unmarshal(b, protoA) Expect(err).NotTo(HaveOccurred()) + aProto = *protoA.FromProto() // make sure we convert back to non-proto }) It("marshals JSON properly", func() { diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index d0c464ad..0d372efd 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -89,6 +89,9 @@ func (x *ProtoPortRange) FromProto() *PortRange { } func PortRangeToProtoSlice(values []*PortRange) []*ProtoPortRange { + if values == nil { + return nil + } result := make([]*ProtoPortRange, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -97,6 +100,9 @@ func PortRangeToProtoSlice(values []*PortRange) []*ProtoPortRange { } func PortRangeFromProtoSlice(values []*ProtoPortRange) []*PortRange { + if values == nil { + return nil + } result := make([]*PortRange, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -187,6 +193,9 @@ func (x *ProtoICMPInfo) FromProto() *ICMPInfo { } func ICMPInfoToProtoSlice(values []*ICMPInfo) []*ProtoICMPInfo { + if values == nil { + return nil + } result := make([]*ProtoICMPInfo, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -195,6 +204,9 @@ func ICMPInfoToProtoSlice(values []*ICMPInfo) []*ProtoICMPInfo { } func ICMPInfoFromProtoSlice(values []*ProtoICMPInfo) []*ICMPInfo { + if values == nil { + return nil + } result := make([]*ICMPInfo, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -254,10 +266,10 @@ func (this *SecurityGroupRule) Equal(that interface{}) bool { return false } } - if !this.PortRange.Equal(that1.PortRange) { + if !this.PortRange.Equal(*that1.PortRange) { return false } - if !this.IcmpInfo.Equal(that1.IcmpInfo) { + if !this.IcmpInfo.Equal(*that1.IcmpInfo) { return false } if this.Log != that1.Log { @@ -385,6 +397,9 @@ func (x *ProtoSecurityGroupRule) FromProto() *SecurityGroupRule { } func SecurityGroupRuleToProtoSlice(values []*SecurityGroupRule) []*ProtoSecurityGroupRule { + if values == nil { + return nil + } result := make([]*ProtoSecurityGroupRule, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -393,6 +408,9 @@ func SecurityGroupRuleToProtoSlice(values []*SecurityGroupRule) []*ProtoSecurity } func SecurityGroupRuleFromProtoSlice(values []*ProtoSecurityGroupRule) []*SecurityGroupRule { + if values == nil { + return nil + } result := make([]*SecurityGroupRule, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 812403cc..56f5ec60 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -35,7 +35,7 @@ func (this *Sidecar) Equal(that interface{}) bool { return false } - if !this.Action.Equal(that1.Action) { + if !this.Action.Equal(*that1.Action) { return false } if this.DiskMb != that1.DiskMb { @@ -106,6 +106,9 @@ func (x *ProtoSidecar) FromProto() *Sidecar { } func SidecarToProtoSlice(values []*Sidecar) []*ProtoSidecar { + if values == nil { + return nil + } result := make([]*ProtoSidecar, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -114,6 +117,9 @@ func SidecarToProtoSlice(values []*Sidecar) []*ProtoSidecar { } func SidecarFromProtoSlice(values []*ProtoSidecar) []*Sidecar { + if values == nil { + return nil + } result := make([]*Sidecar, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index c08f61a5..5844d070 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -74,7 +74,7 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } - if !this.Action.Equal(that1.Action) { + if !this.Action.Equal(*that1.Action) { return false } if this.DiskMb != that1.DiskMb { @@ -137,7 +137,7 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } - if !this.Network.Equal(that1.Network) { + if !this.Network.Equal(*that1.Network) { return false } if len(this.PlacementTags) != len(that1.PlacementTags) { @@ -151,7 +151,7 @@ func (this *TaskDefinition) Equal(that interface{}) bool { if this.MaxPids != that1.MaxPids { return false } - if !this.CertificateProperties.Equal(that1.CertificateProperties) { + if !this.CertificateProperties.Equal(*that1.CertificateProperties) { return false } if this.ImageUsername != that1.ImageUsername { @@ -168,7 +168,7 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } - if !this.LogRateLimit.Equal(that1.LogRateLimit) { + if !this.LogRateLimit.Equal(*that1.LogRateLimit) { return false } if len(this.MetricTags) != len(that1.MetricTags) { @@ -555,6 +555,9 @@ func (x *ProtoTaskDefinition) FromProto() *TaskDefinition { } func TaskDefinitionToProtoSlice(values []*TaskDefinition) []*ProtoTaskDefinition { + if values == nil { + return nil + } result := make([]*ProtoTaskDefinition, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -563,6 +566,9 @@ func TaskDefinitionToProtoSlice(values []*TaskDefinition) []*ProtoTaskDefinition } func TaskDefinitionMetricTagsToProtoMap(values map[string]*MetricTagValue) map[string]*ProtoMetricTagValue { + if values == nil { + return nil + } result := make(map[string]*ProtoMetricTagValue, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -571,6 +577,9 @@ func TaskDefinitionMetricTagsToProtoMap(values map[string]*MetricTagValue) map[s } func TaskDefinitionFromProtoSlice(values []*ProtoTaskDefinition) []*TaskDefinition { + if values == nil { + return nil + } result := make([]*TaskDefinition, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -579,6 +588,9 @@ func TaskDefinitionFromProtoSlice(values []*ProtoTaskDefinition) []*TaskDefiniti } func TaskDefinitionMetricTagsFromProtoMap(values map[string]*ProtoMetricTagValue) map[string]*MetricTagValue { + if values == nil { + return nil + } result := make(map[string]*MetricTagValue, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -661,7 +673,7 @@ func (this *Task) Equal(that interface{}) bool { return false } - if !this.TaskDefinition.Equal(that1.TaskDefinition) { + if !this.TaskDefinition.Equal(*that1.TaskDefinition) { return false } if this.TaskGuid != that1.TaskGuid { @@ -892,6 +904,9 @@ func (x *ProtoTask) FromProto() *Task { } func TaskToProtoSlice(values []*Task) []*ProtoTask { + if values == nil { + return nil + } result := make([]*ProtoTask, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -900,6 +915,9 @@ func TaskToProtoSlice(values []*Task) []*ProtoTask { } func TaskFromProtoSlice(values []*ProtoTask) []*Task { + if values == nil { + return nil + } result := make([]*Task, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 63a85cb6..6b361444 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -33,7 +33,7 @@ func (this *TaskLifecycleResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } return true @@ -72,6 +72,9 @@ func (x *ProtoTaskLifecycleResponse) FromProto() *TaskLifecycleResponse { } func TaskLifecycleResponseToProtoSlice(values []*TaskLifecycleResponse) []*ProtoTaskLifecycleResponse { + if values == nil { + return nil + } result := make([]*ProtoTaskLifecycleResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -80,6 +83,9 @@ func TaskLifecycleResponseToProtoSlice(values []*TaskLifecycleResponse) []*Proto } func TaskLifecycleResponseFromProtoSlice(values []*ProtoTaskLifecycleResponse) []*TaskLifecycleResponse { + if values == nil { + return nil + } result := make([]*TaskLifecycleResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -116,7 +122,7 @@ func (this *DesireTaskRequest) Equal(that interface{}) bool { return false } - if !this.TaskDefinition.Equal(that1.TaskDefinition) { + if !this.TaskDefinition.Equal(*that1.TaskDefinition) { return false } if this.TaskGuid != that1.TaskGuid { @@ -187,6 +193,9 @@ func (x *ProtoDesireTaskRequest) FromProto() *DesireTaskRequest { } func DesireTaskRequestToProtoSlice(values []*DesireTaskRequest) []*ProtoDesireTaskRequest { + if values == nil { + return nil + } result := make([]*ProtoDesireTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -195,6 +204,9 @@ func DesireTaskRequestToProtoSlice(values []*DesireTaskRequest) []*ProtoDesireTa } func DesireTaskRequestFromProtoSlice(values []*ProtoDesireTaskRequest) []*DesireTaskRequest { + if values == nil { + return nil + } result := make([]*DesireTaskRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -285,6 +297,9 @@ func (x *ProtoStartTaskRequest) FromProto() *StartTaskRequest { } func StartTaskRequestToProtoSlice(values []*StartTaskRequest) []*ProtoStartTaskRequest { + if values == nil { + return nil + } result := make([]*ProtoStartTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -293,6 +308,9 @@ func StartTaskRequestToProtoSlice(values []*StartTaskRequest) []*ProtoStartTaskR } func StartTaskRequestFromProtoSlice(values []*ProtoStartTaskRequest) []*StartTaskRequest { + if values == nil { + return nil + } result := make([]*StartTaskRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -328,7 +346,7 @@ func (this *StartTaskResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if this.ShouldStart != that1.ShouldStart { @@ -383,6 +401,9 @@ func (x *ProtoStartTaskResponse) FromProto() *StartTaskResponse { } func StartTaskResponseToProtoSlice(values []*StartTaskResponse) []*ProtoStartTaskResponse { + if values == nil { + return nil + } result := make([]*ProtoStartTaskResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -391,6 +412,9 @@ func StartTaskResponseToProtoSlice(values []*StartTaskResponse) []*ProtoStartTas } func StartTaskResponseFromProtoSlice(values []*ProtoStartTaskResponse) []*StartTaskResponse { + if values == nil { + return nil + } result := make([]*StartTaskResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -481,6 +505,9 @@ func (x *ProtoFailTaskRequest) FromProto() *FailTaskRequest { } func FailTaskRequestToProtoSlice(values []*FailTaskRequest) []*ProtoFailTaskRequest { + if values == nil { + return nil + } result := make([]*ProtoFailTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -489,6 +516,9 @@ func FailTaskRequestToProtoSlice(values []*FailTaskRequest) []*ProtoFailTaskRequ } func FailTaskRequestFromProtoSlice(values []*ProtoFailTaskRequest) []*FailTaskRequest { + if values == nil { + return nil + } result := make([]*FailTaskRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -579,6 +609,9 @@ func (x *ProtoRejectTaskRequest) FromProto() *RejectTaskRequest { } func RejectTaskRequestToProtoSlice(values []*RejectTaskRequest) []*ProtoRejectTaskRequest { + if values == nil { + return nil + } result := make([]*ProtoRejectTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -587,6 +620,9 @@ func RejectTaskRequestToProtoSlice(values []*RejectTaskRequest) []*ProtoRejectTa } func RejectTaskRequestFromProtoSlice(values []*ProtoRejectTaskRequest) []*RejectTaskRequest { + if values == nil { + return nil + } result := make([]*RejectTaskRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -660,6 +696,9 @@ func (x *ProtoTaskGuidRequest) FromProto() *TaskGuidRequest { } func TaskGuidRequestToProtoSlice(values []*TaskGuidRequest) []*ProtoTaskGuidRequest { + if values == nil { + return nil + } result := make([]*ProtoTaskGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -668,6 +707,9 @@ func TaskGuidRequestToProtoSlice(values []*TaskGuidRequest) []*ProtoTaskGuidRequ } func TaskGuidRequestFromProtoSlice(values []*ProtoTaskGuidRequest) []*TaskGuidRequest { + if values == nil { + return nil + } result := make([]*TaskGuidRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -809,6 +851,9 @@ func (x *ProtoCompleteTaskRequest) FromProto() *CompleteTaskRequest { } func CompleteTaskRequestToProtoSlice(values []*CompleteTaskRequest) []*ProtoCompleteTaskRequest { + if values == nil { + return nil + } result := make([]*ProtoCompleteTaskRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -817,6 +862,9 @@ func CompleteTaskRequestToProtoSlice(values []*CompleteTaskRequest) []*ProtoComp } func CompleteTaskRequestFromProtoSlice(values []*ProtoCompleteTaskRequest) []*CompleteTaskRequest { + if values == nil { + return nil + } result := make([]*CompleteTaskRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -975,6 +1023,9 @@ func (x *ProtoTaskCallbackResponse) FromProto() *TaskCallbackResponse { } func TaskCallbackResponseToProtoSlice(values []*TaskCallbackResponse) []*ProtoTaskCallbackResponse { + if values == nil { + return nil + } result := make([]*ProtoTaskCallbackResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -983,6 +1034,9 @@ func TaskCallbackResponseToProtoSlice(values []*TaskCallbackResponse) []*ProtoTa } func TaskCallbackResponseFromProtoSlice(values []*ProtoTaskCallbackResponse) []*TaskCallbackResponse { + if values == nil { + return nil + } result := make([]*TaskCallbackResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1073,6 +1127,9 @@ func (x *ProtoTasksRequest) FromProto() *TasksRequest { } func TasksRequestToProtoSlice(values []*TasksRequest) []*ProtoTasksRequest { + if values == nil { + return nil + } result := make([]*ProtoTasksRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1081,6 +1138,9 @@ func TasksRequestToProtoSlice(values []*TasksRequest) []*ProtoTasksRequest { } func TasksRequestFromProtoSlice(values []*ProtoTasksRequest) []*TasksRequest { + if values == nil { + return nil + } result := make([]*TasksRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1116,7 +1176,7 @@ func (this *TasksResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } if len(this.Tasks) != len(that1.Tasks) { @@ -1176,6 +1236,9 @@ func (x *ProtoTasksResponse) FromProto() *TasksResponse { } func TasksResponseToProtoSlice(values []*TasksResponse) []*ProtoTasksResponse { + if values == nil { + return nil + } result := make([]*ProtoTasksResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1184,6 +1247,9 @@ func TasksResponseToProtoSlice(values []*TasksResponse) []*ProtoTasksResponse { } func TasksResponseFromProtoSlice(values []*ProtoTasksResponse) []*TasksResponse { + if values == nil { + return nil + } result := make([]*TasksResponse, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1257,6 +1323,9 @@ func (x *ProtoTaskByGuidRequest) FromProto() *TaskByGuidRequest { } func TaskByGuidRequestToProtoSlice(values []*TaskByGuidRequest) []*ProtoTaskByGuidRequest { + if values == nil { + return nil + } result := make([]*ProtoTaskByGuidRequest, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1265,6 +1334,9 @@ func TaskByGuidRequestToProtoSlice(values []*TaskByGuidRequest) []*ProtoTaskByGu } func TaskByGuidRequestFromProtoSlice(values []*ProtoTaskByGuidRequest) []*TaskByGuidRequest { + if values == nil { + return nil + } result := make([]*TaskByGuidRequest, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -1300,10 +1372,10 @@ func (this *TaskResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(that1.Error) { + if !this.Error.Equal(*that1.Error) { return false } - if !this.Task.Equal(that1.Task) { + if !this.Task.Equal(*that1.Task) { return false } return true @@ -1355,6 +1427,9 @@ func (x *ProtoTaskResponse) FromProto() *TaskResponse { } func TaskResponseToProtoSlice(values []*TaskResponse) []*ProtoTaskResponse { + if values == nil { + return nil + } result := make([]*ProtoTaskResponse, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -1363,6 +1438,9 @@ func TaskResponseToProtoSlice(values []*TaskResponse) []*ProtoTaskResponse { } func TaskResponseFromProtoSlice(values []*ProtoTaskResponse) []*TaskResponse { + if values == nil { + return nil + } result := make([]*TaskResponse, len(values)) for i, val := range values { result[i] = val.FromProto() diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index decb5a1e..674803e9 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -89,6 +89,9 @@ func (x *ProtoSharedDevice) FromProto() *SharedDevice { } func SharedDeviceToProtoSlice(values []*SharedDevice) []*ProtoSharedDevice { + if values == nil { + return nil + } result := make([]*ProtoSharedDevice, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -97,6 +100,9 @@ func SharedDeviceToProtoSlice(values []*SharedDevice) []*ProtoSharedDevice { } func SharedDeviceFromProtoSlice(values []*ProtoSharedDevice) []*SharedDevice { + if values == nil { + return nil + } result := make([]*SharedDevice, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -143,7 +149,7 @@ func (this *VolumeMount) Equal(that interface{}) bool { if this.Mode != that1.Mode { return false } - if !this.Shared.Equal(that1.Shared) { + if !this.Shared.Equal(*that1.Shared) { return false } return true @@ -221,6 +227,9 @@ func (x *ProtoVolumeMount) FromProto() *VolumeMount { } func VolumeMountToProtoSlice(values []*VolumeMount) []*ProtoVolumeMount { + if values == nil { + return nil + } result := make([]*ProtoVolumeMount, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -229,6 +238,9 @@ func VolumeMountToProtoSlice(values []*VolumeMount) []*ProtoVolumeMount { } func VolumeMountFromProtoSlice(values []*ProtoVolumeMount) []*VolumeMount { + if values == nil { + return nil + } result := make([]*VolumeMount, len(values)) for i, val := range values { result[i] = val.FromProto() @@ -307,6 +319,9 @@ func (x *ProtoVolumePlacement) FromProto() *VolumePlacement { } func VolumePlacementToProtoSlice(values []*VolumePlacement) []*ProtoVolumePlacement { + if values == nil { + return nil + } result := make([]*ProtoVolumePlacement, len(values)) for i, val := range values { result[i] = val.ToProto() @@ -315,6 +330,9 @@ func VolumePlacementToProtoSlice(values []*VolumePlacement) []*ProtoVolumePlacem } func VolumePlacementFromProtoSlice(values []*ProtoVolumePlacement) []*VolumePlacement { + if values == nil { + return nil + } result := make([]*VolumePlacement, len(values)) for i, val := range values { result[i] = val.FromProto() From a910918931f4f6891f71b6ccabc2e0d4b8619b3c Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 16 May 2024 15:26:27 +0000 Subject: [PATCH 077/155] Codegen: Don't generate a Getter for By Value types --- protoc-gen-go-bbs/bbs.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 3c416663..9cf8cfa9 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -159,7 +159,9 @@ func (bbsGenerateHelper) genAccessors(g *protogen.GeneratedFile, msg *protogen.M if options.GetDeprecated() { g.P("// DEPRECATED: DO NOT USE") } - genGetter(g, copysafeName, field) //fieldName, fieldType, defaultValue) + if !isByValueType(field) { + genGetter(g, copysafeName, field) //fieldName, fieldType, defaultValue) + } genSetter(g, copysafeName, fieldName, fieldType) } } From e22888402c424c3deab5c5568ee9a1841be18932 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 16 May 2024 15:27:14 +0000 Subject: [PATCH 078/155] Add ByValue attributes to match old protobuf declarations Regen protos --- models/actual_lrp.pb.go | 123 ++++---- models/actual_lrp.proto | 8 +- models/actual_lrp_bbs.pb.go | 56 +--- models/desired_lrp.pb.go | 594 ++++++++++++++++++----------------- models/desired_lrp.proto | 12 +- models/desired_lrp_bbs.pb.go | 62 +--- models/events.pb.go | 286 ++++++++--------- models/events.proto | 17 +- models/events_bbs.pb.go | 90 ++---- 9 files changed, 580 insertions(+), 668 deletions(-) diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 660c8e99..e8fd7137 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -699,70 +699,71 @@ var file_actual_lrp_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, - 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xbf, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, + 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xd3, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x44, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, + 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, + 0x5d, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x51, + 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, + 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x4b, 0x65, 0x79, 0x12, 0x4c, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, - 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, - 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, - 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x27, 0x0a, - 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x10, - 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, - 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, - 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1f, - 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, - 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, - 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, - 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, - 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, - 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5d, 0x0a, 0x08, - 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x4f, 0x52, 0x44, 0x49, - 0x4e, 0x41, 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, 0x82, 0x7d, 0x08, 0x4f, 0x72, 0x64, 0x69, 0x6e, - 0x61, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, 0x56, 0x41, 0x43, 0x55, 0x41, 0x54, 0x49, 0x4e, - 0x47, 0x10, 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, - 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, 0x53, 0x50, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, - 0x0a, 0x82, 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, 0x65, 0x63, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, - 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, - 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, - 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, + 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, + 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, + 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x27, 0x0a, 0x0f, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x6d, + 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, + 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x70, + 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x0b, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, + 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, + 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, + 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, + 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x22, 0x5d, 0x0a, 0x08, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, + 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, 0x82, 0x7d, 0x08, 0x4f, + 0x72, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, 0x56, 0x41, 0x43, 0x55, + 0x41, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, 0x45, 0x76, 0x61, 0x63, + 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, 0x53, 0x50, 0x45, 0x43, + 0x54, 0x10, 0x02, 0x1a, 0x0a, 0x82, 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, 0x65, 0x63, 0x74, 0x42, + 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, + 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, + 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index bb6ea0c2..f58a3cb5 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -55,15 +55,15 @@ message ProtoActualLRP { SUSPECT = 2 [(bbs.bbs_enumvalue_customname) = "Suspect"]; } - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; - ProtoActualLRPNetInfo actual_lrp_net_info = 3; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true]; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true]; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ProtoModificationTag modification_tag = 9 [json_name = "modification_tag"]; + ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true]; Presence presence = 10 [json_name = "presence"]; repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 11; map metric_tags = 12; diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 0f222601..bfa411c3 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -769,15 +769,15 @@ func (m ActualLRP_Presence) String() string { // Prevent copylock errors when using ProtoActualLRP directly type ActualLRP struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ActualLrpNetInfo *ActualLRPNetInfo + ActualLrpKey ActualLRPKey + ActualLrpInstanceKey ActualLRPInstanceKey + ActualLrpNetInfo ActualLRPNetInfo CrashCount int32 CrashReason string State string PlacementError string Since int64 - ModificationTag *ModificationTag + ModificationTag ModificationTag Presence ActualLRP_Presence ActualLrpInternalRoutes []*ActualLRPInternalRoute MetricTags map[string]string @@ -807,13 +807,13 @@ func (this *ActualLRP) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -831,7 +831,7 @@ func (this *ActualLRP) Equal(that interface{}) bool { if this.Since != that1.Since { return false } - if !this.ModificationTag.Equal(*that1.ModificationTag) { + if !this.ModificationTag.Equal(that1.ModificationTag) { return false } if this.Presence != that1.Presence { @@ -861,35 +861,17 @@ func (this *ActualLRP) Equal(that interface{}) bool { } return true } -func (m *ActualLRP) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} -func (m *ActualLRP) SetActualLrpKey(value *ActualLRPKey) { +func (m *ActualLRP) SetActualLrpKey(value ActualLRPKey) { if m != nil { m.ActualLrpKey = value } } -func (m *ActualLRP) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} -func (m *ActualLRP) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRP) SetActualLrpInstanceKey(value ActualLRPInstanceKey) { if m != nil { m.ActualLrpInstanceKey = value } } -func (m *ActualLRP) GetActualLrpNetInfo() *ActualLRPNetInfo { - if m != nil { - return m.ActualLrpNetInfo - } - return nil -} -func (m *ActualLRP) SetActualLrpNetInfo(value *ActualLRPNetInfo) { +func (m *ActualLRP) SetActualLrpNetInfo(value ActualLRPNetInfo) { if m != nil { m.ActualLrpNetInfo = value } @@ -949,13 +931,7 @@ func (m *ActualLRP) SetSince(value int64) { m.Since = value } } -func (m *ActualLRP) GetModificationTag() *ModificationTag { - if m != nil { - return m.ModificationTag - } - return nil -} -func (m *ActualLRP) SetModificationTag(value *ModificationTag) { +func (m *ActualLRP) SetModificationTag(value ModificationTag) { if m != nil { m.ModificationTag = value } @@ -1048,15 +1024,15 @@ func (x *ProtoActualLRP) FromProto() *ActualLRP { } copysafe := &ActualLRP{ - ActualLrpKey: x.ActualLrpKey.FromProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), - ActualLrpNetInfo: x.ActualLrpNetInfo.FromProto(), + ActualLrpKey: *x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: *x.ActualLrpInstanceKey.FromProto(), + ActualLrpNetInfo: *x.ActualLrpNetInfo.FromProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, State: x.State, PlacementError: x.PlacementError, Since: x.Since, - ModificationTag: x.ModificationTag.FromProto(), + ModificationTag: *x.ModificationTag.FromProto(), Presence: ActualLRP_Presence(x.Presence), ActualLrpInternalRoutes: ActualLRPInternalRouteFromProtoSlice(x.ActualLrpInternalRoutes), MetricTags: x.MetricTags, diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index e8ccbc49..18f95c68 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1000,307 +1000,309 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdf, 0x03, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xee, 0x03, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x42, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x47, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, - 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x73, 0x12, 0x51, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x52, 0x12, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x52, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, - 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, - 0x47, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, - 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, - 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x22, - 0xbd, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x42, 0x0a, 0x0f, 0x64, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, - 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x44, - 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, - 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, - 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, - 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, - 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, - 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, + 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x12, 0x64, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, + 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x12, 0x4c, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x6d, + 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x47, + 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, 0x61, + 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, + 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x22, 0xcc, + 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x47, 0x0a, 0x0f, 0x64, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, + 0x90, 0x3f, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, + 0x65, 0x79, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, + 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, + 0x62, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, + 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, + 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, + 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, + 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, + 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, + 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, + 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x46, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, + 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, + 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, + 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1e, 0x0a, + 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x26, 0x0a, + 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, + 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, + 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, + 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x0f, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, + 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, + 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, + 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, + 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, + 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, + 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x73, + 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, 0x0a, + 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, + 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, + 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, + 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, + 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, + 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, + 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, + 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, + 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, + 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0xea, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, + 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, + 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, + 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, 0x6d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, + 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, + 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, 0x01, 0x0a, + 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, + 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, + 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, + 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, + 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, + 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, + 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x88, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1c, + 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x15, + 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, + 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, + 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, + 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, 0x64, - 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, - 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, - 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, - 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x41, 0x0a, 0x0c, - 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, - 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, - 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, - 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, - 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, - 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, - 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, - 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, - 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, - 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, - 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, - 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, - 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, - 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, - 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, - 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, - 0x73, 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, - 0x01, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, - 0x47, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, - 0x79, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, - 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, - 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, - 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, - 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, - 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, - 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, - 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0xea, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, - 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, - 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, - 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, - 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, - 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, - 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, - 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, - 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x88, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, - 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, - 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, - 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, - 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, - 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, - 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, - 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, - 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, - 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, - 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, - 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, - 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, - 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, - 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, - 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, - 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, - 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, - 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, - 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, - 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, - 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, - 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, - 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, - 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, - 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, - 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, - 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, - 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, - 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, - 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, - 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, - 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, - 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, - 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, - 0x12, 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, - 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, - 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, - 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, - 0x65, 0x72, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, - 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, - 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, - 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, - 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, - 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, - 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, + 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, + 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, + 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, + 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, + 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, + 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, + 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, + 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, + 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, + 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, + 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, + 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, + 0x75, 0x6c, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, 0x6d, 0x6f, + 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x4e, 0x0a, + 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, + 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, + 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, + 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, + 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, + 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, + 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, + 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5e, + 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, + 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, + 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x73, 0x65, + 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, 0x0a, 0x10, + 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, + 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, + 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, + 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, + 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, + 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, + 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, + 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, + 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, + 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, + 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, + 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, + 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index e3faa311..6fafe54d 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -19,23 +19,23 @@ import "sidecar.proto"; import "log_rate_limit.proto"; message ProtoDesiredLRPSchedulingInfo { - ProtoDesiredLRPKey desired_lrp_key = 1; + ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true]; string annotation = 2 [json_name = "annotation"]; int32 instances = 3 [json_name = "instances"]; - ProtoDesiredLRPResource desired_lrp_resource = 4; + ProtoDesiredLRPResource desired_lrp_resource = 4 [(bbs.bbs_by_value) = true]; ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; - ProtoModificationTag modification_tag = 6; + ProtoModificationTag modification_tag = 6 [(bbs.bbs_by_value) = true]; ProtoVolumePlacement volume_placement = 7; repeated string PlacementTags = 8 [json_name ="placement_tags"]; } message ProtoDesiredLRPRunInfo { - ProtoDesiredLRPKey desired_lrp_key = 1; + ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true]; - repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env"]; + repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env", (bbs.bbs_by_value) = false]; ProtoAction setup = 3; ProtoAction action = 4; ProtoAction monitor = 5; @@ -46,7 +46,7 @@ message ProtoDesiredLRPRunInfo { uint32 cpu_weight = 8 [json_name = "cpu_weight"]; repeated uint32 ports = 9 [packed = false]; - repeated ProtoSecurityGroupRule egress_rules = 10; + repeated ProtoSecurityGroupRule egress_rules = 10 [(bbs.bbs_by_value) = false]; string log_source = 11 [json_name = "log_source"]; string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid"]; int64 created_at = 13 [json_name = "created_at"]; diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 581c2902..34a78f5b 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -8,12 +8,12 @@ package models // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly type DesiredLRPSchedulingInfo struct { - DesiredLrpKey *DesiredLRPKey + DesiredLrpKey DesiredLRPKey Annotation string Instances int32 - DesiredLrpResource *DesiredLRPResource + DesiredLrpResource DesiredLRPResource Routes Routes - ModificationTag *ModificationTag + ModificationTag ModificationTag VolumePlacement *VolumePlacement PlacementTags []string } @@ -40,7 +40,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLrpKey.Equal(*that1.DesiredLrpKey) { + if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { return false } if this.Annotation != that1.Annotation { @@ -49,13 +49,13 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if this.Instances != that1.Instances { return false } - if !this.DesiredLrpResource.Equal(*that1.DesiredLrpResource) { + if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { return false } if !this.Routes.Equal(that1.Routes) { return false } - if !this.ModificationTag.Equal(*that1.ModificationTag) { + if !this.ModificationTag.Equal(that1.ModificationTag) { return false } if !this.VolumePlacement.Equal(*that1.VolumePlacement) { @@ -71,13 +71,7 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPSchedulingInfo) GetDesiredLrpKey() *DesiredLRPKey { - if m != nil { - return m.DesiredLrpKey - } - return nil -} -func (m *DesiredLRPSchedulingInfo) SetDesiredLrpKey(value *DesiredLRPKey) { +func (m *DesiredLRPSchedulingInfo) SetDesiredLrpKey(value DesiredLRPKey) { if m != nil { m.DesiredLrpKey = value } @@ -104,35 +98,17 @@ func (m *DesiredLRPSchedulingInfo) SetInstances(value int32) { m.Instances = value } } -func (m *DesiredLRPSchedulingInfo) GetDesiredLrpResource() *DesiredLRPResource { - if m != nil { - return m.DesiredLrpResource - } - return nil -} -func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value *DesiredLRPResource) { +func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value DesiredLRPResource) { if m != nil { m.DesiredLrpResource = value } } -func (m *DesiredLRPSchedulingInfo) GetRoutes() Routes { - if m != nil { - return m.Routes - } - return nil -} func (m *DesiredLRPSchedulingInfo) SetRoutes(value Routes) { if m != nil { m.Routes = value } } -func (m *DesiredLRPSchedulingInfo) GetModificationTag() *ModificationTag { - if m != nil { - return m.ModificationTag - } - return nil -} -func (m *DesiredLRPSchedulingInfo) SetModificationTag(value *ModificationTag) { +func (m *DesiredLRPSchedulingInfo) SetModificationTag(value ModificationTag) { if m != nil { m.ModificationTag = value } @@ -183,12 +159,12 @@ func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { } copysafe := &DesiredLRPSchedulingInfo{ - DesiredLrpKey: x.DesiredLrpKey.FromProto(), + DesiredLrpKey: *x.DesiredLrpKey.FromProto(), Annotation: x.Annotation, Instances: x.Instances, - DesiredLrpResource: x.DesiredLrpResource.FromProto(), + DesiredLrpResource: *x.DesiredLrpResource.FromProto(), Routes: *x.Routes.FromProto(), - ModificationTag: x.ModificationTag.FromProto(), + ModificationTag: *x.ModificationTag.FromProto(), VolumePlacement: x.VolumePlacement.FromProto(), PlacementTags: x.PlacementTags, } @@ -219,7 +195,7 @@ func DesiredLRPSchedulingInfoFromProtoSlice(values []*ProtoDesiredLRPSchedulingI // Prevent copylock errors when using ProtoDesiredLRPRunInfo directly type DesiredLRPRunInfo struct { - DesiredLrpKey *DesiredLRPKey + DesiredLrpKey DesiredLRPKey EnvironmentVariables []*EnvironmentVariable Setup *Action Action *Action @@ -270,7 +246,7 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } - if !this.DesiredLrpKey.Equal(*that1.DesiredLrpKey) { + if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { return false } if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { @@ -393,13 +369,7 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { } return true } -func (m *DesiredLRPRunInfo) GetDesiredLrpKey() *DesiredLRPKey { - if m != nil { - return m.DesiredLrpKey - } - return nil -} -func (m *DesiredLRPRunInfo) SetDesiredLrpKey(value *DesiredLRPKey) { +func (m *DesiredLRPRunInfo) SetDesiredLrpKey(value DesiredLRPKey) { if m != nil { m.DesiredLrpKey = value } @@ -742,7 +712,7 @@ func (x *ProtoDesiredLRPRunInfo) FromProto() *DesiredLRPRunInfo { } copysafe := &DesiredLRPRunInfo{ - DesiredLrpKey: x.DesiredLrpKey.FromProto(), + DesiredLrpKey: *x.DesiredLrpKey.FromProto(), EnvironmentVariables: EnvironmentVariableFromProtoSlice(x.EnvironmentVariables), Setup: x.Setup.FromProto(), Action: x.Action.FromProto(), diff --git a/models/events.pb.go b/models/events.pb.go index becfb199..96f32696 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -933,45 +933,46 @@ var File_events_proto protoreflect.FileDescriptor var file_events_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, - 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x67, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, - 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x31, 0x0a, 0x05, - 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x3a, - 0x02, 0x18, 0x01, 0x22, 0x67, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x12, 0x45, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x77, 0x0a, 0x22, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0xdf, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4c, 0x0a, 0x13, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, - 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x1a, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x3a, + 0x02, 0x18, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x67, + 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x10, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x77, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x35, 0x0a, + 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, + 0x22, 0xee, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x51, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, + 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, @@ -982,111 +983,113 @@ var file_events_proto_rawDesc = []byte{ 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, - 0x69, 0x6e, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, - 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, - 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, - 0x65, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x52, - 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, - 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, - 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, - 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, - 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xc1, 0x02, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, - 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, - 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, - 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x62, 0x65, 0x66, - 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, + 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x74, 0x61, 0x67, 0x12, 0x40, 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, + 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x08, 0x70, 0x72, 0x65, + 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, + 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0xcb, 0x02, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x44, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, + 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x5d, + 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, + 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, + 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, + 0x65, 0x12, 0x30, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, + 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, + 0x77, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x30, 0x0a, - 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, - 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x77, 0x0a, 0x22, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, - 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, - 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, - 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, - 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, 0x01, 0x0a, 0x1b, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, - 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x65, 0x66, - 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x61, 0x66, - 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, - 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x12, 0x1a, - 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x92, 0x02, 0x0a, 0x1a, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, - 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, - 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, - 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, - 0x61, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, - 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, - 0x2f, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, - 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, - 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, - 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, - 0x22, 0x6b, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, - 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, - 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, - 0x66, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, - 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, - 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, - 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x50, 0x52, 0x09, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, + 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, + 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, 0x01, + 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, + 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, + 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, + 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, + 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x9c, + 0x02, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x44, 0x0a, + 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, + 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, + 0x4b, 0x65, 0x79, 0x12, 0x5d, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, + 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, + 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x2f, 0x0a, + 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, 0x65, + 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x3e, + 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x6b, + 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, + 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, + 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1165,6 +1168,7 @@ func file_events_proto_init() { return } file_actual_lrp_proto_init() + file_bbs_proto_init() file_desired_lrp_proto_init() file_task_proto_init() file_modification_tag_proto_init() diff --git a/models/events.proto b/models/events.proto index a5ffd124..bd4e5375 100644 --- a/models/events.proto +++ b/models/events.proto @@ -4,6 +4,7 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; import "actual_lrp.proto"; +import "bbs.proto"; import "desired_lrp.proto"; import "task.proto"; import "modification_tag.proto"; @@ -30,24 +31,24 @@ message ProtoActualLRPInstanceCreatedEvent { } message ProtoActualLRPInfo { - ProtoActualLRPNetInfo actual_lrp_net_info = 3; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true]; int32 crash_count = 4 [json_name = "crash_count"]; string crash_reason = 5; string state = 6 [json_name = "state"]; string placement_error = 7; int64 since = 8 [json_name = "since"]; - ProtoModificationTag modification_tag = 9 [json_name = "modification_tag"]; - ProtoActualLRP.Presence presence = 10 [json_name = "presence"]; + ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true]; + ProtoActualLRP.Presence presence = 10 [json_name = "presence", (bbs.bbs_by_value) = true]; optional bool Routable = 11; string availability_zone = 12 [json_name = "availability_zone"]; } message ProtoActualLRPInstanceChangedEvent { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true]; ProtoActualLRPInfo before = 3; ProtoActualLRPInfo after = 4; - string trace_id = 5 [json_name = "trace_id"]; + string trace_id = 5 [json_name = "trace_id"]; } message ProtoActualLRPInstanceRemovedEvent { @@ -72,8 +73,8 @@ message ProtoDesiredLRPRemovedEvent { } message ProtoActualLRPCrashedEvent { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true]; int32 crash_count = 3 [json_name = "crash_count"]; string crash_reason = 4; int64 since = 5 [json_name = "since"]; diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 033272aa..380cb380 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -390,13 +390,13 @@ func ActualLRPInstanceCreatedEventFromProtoSlice(values []*ProtoActualLRPInstanc // Prevent copylock errors when using ProtoActualLRPInfo directly type ActualLRPInfo struct { - ActualLrpNetInfo *ActualLRPNetInfo + ActualLrpNetInfo ActualLRPNetInfo CrashCount int32 CrashReason string State string PlacementError string Since int64 - ModificationTag *ModificationTag + ModificationTag ModificationTag Presence ActualLRP_Presence Routable *bool AvailabilityZone string @@ -424,7 +424,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { return false } - if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { + if !this.ActualLrpNetInfo.Equal(that1.ActualLrpNetInfo) { return false } if this.CrashCount != that1.CrashCount { @@ -442,7 +442,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { if this.Since != that1.Since { return false } - if !this.ModificationTag.Equal(*that1.ModificationTag) { + if !this.ModificationTag.Equal(that1.ModificationTag) { return false } if this.Presence != that1.Presence { @@ -456,13 +456,7 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInfo) GetActualLrpNetInfo() *ActualLRPNetInfo { - if m != nil { - return m.ActualLrpNetInfo - } - return nil -} -func (m *ActualLRPInfo) SetActualLrpNetInfo(value *ActualLRPNetInfo) { +func (m *ActualLRPInfo) SetActualLrpNetInfo(value ActualLRPNetInfo) { if m != nil { m.ActualLrpNetInfo = value } @@ -522,23 +516,11 @@ func (m *ActualLRPInfo) SetSince(value int64) { m.Since = value } } -func (m *ActualLRPInfo) GetModificationTag() *ModificationTag { - if m != nil { - return m.ModificationTag - } - return nil -} -func (m *ActualLRPInfo) SetModificationTag(value *ModificationTag) { +func (m *ActualLRPInfo) SetModificationTag(value ModificationTag) { if m != nil { m.ModificationTag = value } } -func (m *ActualLRPInfo) GetPresence() ActualLRP_Presence { - if m != nil { - return m.Presence - } - return 0 -} func (m *ActualLRPInfo) SetPresence(value ActualLRP_Presence) { if m != nil { m.Presence = value @@ -595,13 +577,13 @@ func (x *ProtoActualLRPInfo) FromProto() *ActualLRPInfo { } copysafe := &ActualLRPInfo{ - ActualLrpNetInfo: x.ActualLrpNetInfo.FromProto(), + ActualLrpNetInfo: *x.ActualLrpNetInfo.FromProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, State: x.State, PlacementError: x.PlacementError, Since: x.Since, - ModificationTag: x.ModificationTag.FromProto(), + ModificationTag: *x.ModificationTag.FromProto(), Presence: ActualLRP_Presence(x.Presence), Routable: x.Routable, AvailabilityZone: x.AvailabilityZone, @@ -633,8 +615,8 @@ func ActualLRPInfoFromProtoSlice(values []*ProtoActualLRPInfo) []*ActualLRPInfo // Prevent copylock errors when using ProtoActualLRPInstanceChangedEvent directly type ActualLRPInstanceChangedEvent struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpKey ActualLRPKey + ActualLrpInstanceKey ActualLRPInstanceKey Before *ActualLRPInfo After *ActualLRPInfo TraceId string @@ -662,10 +644,10 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } if !this.Before.Equal(*that1.Before) { @@ -679,24 +661,12 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPInstanceChangedEvent) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} -func (m *ActualLRPInstanceChangedEvent) SetActualLrpKey(value *ActualLRPKey) { +func (m *ActualLRPInstanceChangedEvent) SetActualLrpKey(value ActualLRPKey) { if m != nil { m.ActualLrpKey = value } } -func (m *ActualLRPInstanceChangedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} -func (m *ActualLRPInstanceChangedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRPInstanceChangedEvent) SetActualLrpInstanceKey(value ActualLRPInstanceKey) { if m != nil { m.ActualLrpInstanceKey = value } @@ -755,8 +725,8 @@ func (x *ProtoActualLRPInstanceChangedEvent) FromProto() *ActualLRPInstanceChang } copysafe := &ActualLRPInstanceChangedEvent{ - ActualLrpKey: x.ActualLrpKey.FromProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + ActualLrpKey: *x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: *x.ActualLrpInstanceKey.FromProto(), Before: x.Before.FromProto(), After: x.After.FromProto(), TraceId: x.TraceId, @@ -1221,8 +1191,8 @@ func DesiredLRPRemovedEventFromProtoSlice(values []*ProtoDesiredLRPRemovedEvent) // Prevent copylock errors when using ProtoActualLRPCrashedEvent directly type ActualLRPCrashedEvent struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpKey ActualLRPKey + ActualLrpInstanceKey ActualLRPInstanceKey CrashCount int32 CrashReason string Since int64 @@ -1250,10 +1220,10 @@ func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if !this.ActualLrpKey.Equal(that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } if this.CrashCount != that1.CrashCount { @@ -1267,24 +1237,12 @@ func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { } return true } -func (m *ActualLRPCrashedEvent) GetActualLrpKey() *ActualLRPKey { - if m != nil { - return m.ActualLrpKey - } - return nil -} -func (m *ActualLRPCrashedEvent) SetActualLrpKey(value *ActualLRPKey) { +func (m *ActualLRPCrashedEvent) SetActualLrpKey(value ActualLRPKey) { if m != nil { m.ActualLrpKey = value } } -func (m *ActualLRPCrashedEvent) GetActualLrpInstanceKey() *ActualLRPInstanceKey { - if m != nil { - return m.ActualLrpInstanceKey - } - return nil -} -func (m *ActualLRPCrashedEvent) SetActualLrpInstanceKey(value *ActualLRPInstanceKey) { +func (m *ActualLRPCrashedEvent) SetActualLrpInstanceKey(value ActualLRPInstanceKey) { if m != nil { m.ActualLrpInstanceKey = value } @@ -1343,8 +1301,8 @@ func (x *ProtoActualLRPCrashedEvent) FromProto() *ActualLRPCrashedEvent { } copysafe := &ActualLRPCrashedEvent{ - ActualLrpKey: x.ActualLrpKey.FromProto(), - ActualLrpInstanceKey: x.ActualLrpInstanceKey.FromProto(), + ActualLrpKey: *x.ActualLrpKey.FromProto(), + ActualLrpInstanceKey: *x.ActualLrpInstanceKey.FromProto(), CrashCount: x.CrashCount, CrashReason: x.CrashReason, Since: x.Since, From b8e9612e041e5bc1267ab39793c227eaadcef44d Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 16 May 2024 15:28:28 +0000 Subject: [PATCH 079/155] Update pointers to reflect new ByValue types --- models/actual_lrp.go | 30 ++++---- models/actual_lrp_test.go | 94 +++++++++++------------ models/desired_lrp.go | 14 ++-- models/events.go | 24 +++--- models/events_test.go | 16 ++-- models/test/model_helpers/constructors.go | 10 +-- test_helpers/actual_lrp_group_matcher.go | 4 +- test_helpers/actual_lrp_matcher.go | 2 +- 8 files changed, 97 insertions(+), 97 deletions(-) diff --git a/models/actual_lrp.go b/models/actual_lrp.go index aa6f15dd..f2de904f 100644 --- a/models/actual_lrp.go +++ b/models/actual_lrp.go @@ -125,7 +125,7 @@ func (actual ActualLRP) CellIsMissing(cellSet CellSet) bool { return false } - return !cellSet.HasCellID(actual.GetActualLrpInstanceKey().CellId) + return !cellSet.HasCellID(actual.ActualLrpInstanceKey.CellId) } func (actual ActualLRP) ShouldRestartImmediately(calc RestartCalculator) bool { @@ -227,7 +227,7 @@ func (group ActualLRPGroup) Resolve() (*ActualLRP, bool, error) { func NewUnclaimedActualLRP(lrpKey ActualLRPKey, since int64) *ActualLRP { return &ActualLRP{ - ActualLrpKey: &lrpKey, + ActualLrpKey: lrpKey, State: ActualLRPStateUnclaimed, Since: since, } @@ -235,8 +235,8 @@ func NewUnclaimedActualLRP(lrpKey ActualLRPKey, since int64) *ActualLRP { func NewClaimedActualLRP(lrpKey ActualLRPKey, instanceKey ActualLRPInstanceKey, since int64) *ActualLRP { return &ActualLRP{ - ActualLrpKey: &lrpKey, - ActualLrpInstanceKey: &instanceKey, + ActualLrpKey: lrpKey, + ActualLrpInstanceKey: instanceKey, State: ActualLRPStateClaimed, Since: since, } @@ -244,9 +244,9 @@ func NewClaimedActualLRP(lrpKey ActualLRPKey, instanceKey ActualLRPInstanceKey, func NewRunningActualLRP(lrpKey ActualLRPKey, instanceKey ActualLRPInstanceKey, netInfo ActualLRPNetInfo, since int64) *ActualLRP { return &ActualLRP{ - ActualLrpKey: &lrpKey, - ActualLrpInstanceKey: &instanceKey, - ActualLrpNetInfo: &netInfo, + ActualLrpKey: lrpKey, + ActualLrpInstanceKey: instanceKey, + ActualLrpNetInfo: netInfo, State: ActualLRPStateRunning, Since: since, } @@ -261,8 +261,8 @@ func (actualLRPInfo *ActualLRPInfo) ToActualLRP(lrpKey ActualLRPKey, lrpInstance return nil } lrp := ActualLRP{ - ActualLrpKey: &lrpKey, - ActualLrpInstanceKey: &lrpInstanceKey, + ActualLrpKey: lrpKey, + ActualLrpInstanceKey: lrpInstanceKey, ActualLrpNetInfo: actualLRPInfo.ActualLrpNetInfo, AvailabilityZone: actualLRPInfo.AvailabilityZone, CrashCount: actualLRPInfo.CrashCount, @@ -478,14 +478,14 @@ func ResolveActualLRPGroups(lrps []*ActualLRP) []*ActualLRPGroup { // one for the evacuating. When building the list of actual LRP groups (where // a group is the instance and corresponding evacuating), make sure we don't add the same // actual lrp twice. - if mapOfGroups[*actualLRP.ActualLrpKey] == nil { - mapOfGroups[*actualLRP.ActualLrpKey] = &ActualLRPGroup{} - result = append(result, mapOfGroups[*actualLRP.ActualLrpKey]) + if mapOfGroups[actualLRP.ActualLrpKey] == nil { + mapOfGroups[actualLRP.ActualLrpKey] = &ActualLRPGroup{} + result = append(result, mapOfGroups[actualLRP.ActualLrpKey]) } if actualLRP.Presence == ActualLRP_Evacuating { - mapOfGroups[*actualLRP.ActualLrpKey].Evacuating = actualLRP - } else if hasHigherPriority(actualLRP, mapOfGroups[*actualLRP.ActualLrpKey].Instance) { - mapOfGroups[*actualLRP.ActualLrpKey].Instance = actualLRP + mapOfGroups[actualLRP.ActualLrpKey].Evacuating = actualLRP + } else if hasHigherPriority(actualLRP, mapOfGroups[actualLRP.ActualLrpKey].Instance) { + mapOfGroups[actualLRP.ActualLrpKey].Instance = actualLRP } } diff --git a/models/actual_lrp_test.go b/models/actual_lrp_test.go index a57f40e3..6d80f323 100644 --- a/models/actual_lrp_test.go +++ b/models/actual_lrp_test.go @@ -13,7 +13,7 @@ import ( func defaultCrashedActual(crashCount int32, lastCrashed int64) *models.ActualLRP { actualLrpKey := models.NewActualLRPKey("p-guid", 0, "domain") return &models.ActualLRP{ - ActualLrpKey: &actualLrpKey, + ActualLrpKey: actualLrpKey, State: models.ActualLRPStateCrashed, CrashCount: crashCount, Since: lastCrashed, @@ -186,7 +186,7 @@ var _ = Describe("ActualLRP", func() { It("sets routable to provided value", func() { actualLRP := actualLRPInfo.ToActualLRP(models.NewActualLRPKey("p-guid", 0, "domain"), models.NewActualLRPInstanceKey("i-1", "cell-1")) Expect(actualLRP.RoutableExists()).To(Equal(true)) - Expect(actualLRP.GetRoutable()).To(Equal(false)) + Expect(*actualLRP.GetRoutable()).To(Equal(false)) }) }) @@ -199,7 +199,7 @@ var _ = Describe("ActualLRP", func() { It("sets routable to provided value", func() { actualLRP := actualLRPInfo.ToActualLRP(models.NewActualLRPKey("p-guid", 0, "domain"), models.NewActualLRPInstanceKey("i-1", "cell-1")) Expect(actualLRP.RoutableExists()).To(Equal(true)) - Expect(actualLRP.GetRoutable()).To(Equal(true)) + Expect(*actualLRP.GetRoutable()).To(Equal(true)) }) }) }) @@ -369,11 +369,11 @@ var _ = Describe("ActualLRP", func() { BeforeEach(func() { lrpKey := models.NewActualLRPKey("process-guid", 1, "domain") instanceLRP = &models.ActualLRP{ - ActualLrpKey: &lrpKey, + ActualLrpKey: lrpKey, Since: 1138, } evacuatingLRP = &models.ActualLRP{ - ActualLrpKey: &lrpKey, + ActualLrpKey: lrpKey, Since: 3417, } }) @@ -500,13 +500,13 @@ var _ = Describe("ActualLRP", func() { netInfo = models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown, models.NewPortMapping(5678, 8080), models.NewPortMapping(1234, 8081)) lrp = models.ActualLRP{ - ActualLrpKey: &lrpKey, - ActualLrpInstanceKey: &instanceKey, - ActualLrpNetInfo: &netInfo, + ActualLrpKey: lrpKey, + ActualLrpInstanceKey: instanceKey, + ActualLrpNetInfo: netInfo, CrashCount: 1, State: models.ActualLRPStateRunning, Since: 1138, - ModificationTag: &models.ModificationTag{ + ModificationTag: models.ModificationTag{ Epoch: "some-guid", Index: 50, }, @@ -522,10 +522,10 @@ var _ = Describe("ActualLRP", func() { BeforeEach(func() { actualLrpKey := models.NewActualLRPKey("fake-process-guid", 1, "fake-domain") before = &models.ActualLRP{ - ActualLrpKey: &actualLrpKey, + ActualLrpKey: actualLrpKey, } afterKey = models.ActualLRPKey{} - afterKey = *before.ActualLrpKey + afterKey = before.ActualLrpKey }) Context("when the ProcessGuid fields differ", func() { @@ -535,7 +535,7 @@ var _ = Describe("ActualLRP", func() { }) It("is not allowed", func() { - Expect(before.AllowsTransitionTo(&afterKey, before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) + Expect(before.AllowsTransitionTo(&afterKey, &before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) }) }) @@ -546,7 +546,7 @@ var _ = Describe("ActualLRP", func() { }) It("is not allowed", func() { - Expect(before.AllowsTransitionTo(&afterKey, before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) + Expect(before.AllowsTransitionTo(&afterKey, &before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) }) }) @@ -557,7 +557,7 @@ var _ = Describe("ActualLRP", func() { }) It("is not allowed", func() { - Expect(before.AllowsTransitionTo(&afterKey, before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) + Expect(before.AllowsTransitionTo(&afterKey, &before.ActualLrpInstanceKey, before.GetState())).To(BeFalse()) }) }) @@ -633,8 +633,8 @@ var _ = Describe("ActualLRP", func() { entry := entry It(EntryToString(entry), func() { before.State = entry.BeforeState - before.ActualLrpInstanceKey = &entry.BeforeInstanceKey - Expect(before.AllowsTransitionTo(before.ActualLrpKey, &entry.AfterInstanceKey, entry.AfterState)).To(Equal(entry.Allowed)) + before.ActualLrpInstanceKey = entry.BeforeInstanceKey + Expect(before.AllowsTransitionTo(&before.ActualLrpKey, &entry.AfterInstanceKey, entry.AfterState)).To(Equal(entry.Allowed)) }) } }) @@ -644,7 +644,7 @@ var _ = Describe("ActualLRP", func() { Context("when state is unclaimed", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLrpKey: &lrpKey, + ActualLrpKey: lrpKey, State: models.ActualLRPStateUnclaimed, Since: 1138, } @@ -660,8 +660,8 @@ var _ = Describe("ActualLRP", func() { Context("when state is claimed", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLrpKey: &lrpKey, - ActualLrpInstanceKey: &instanceKey, + ActualLrpKey: lrpKey, + ActualLrpInstanceKey: instanceKey, State: models.ActualLRPStateClaimed, Since: 1138, } @@ -676,9 +676,9 @@ var _ = Describe("ActualLRP", func() { Context("when state is running", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLrpKey: &lrpKey, - ActualLrpInstanceKey: &instanceKey, - ActualLrpNetInfo: &netInfo, + ActualLrpKey: lrpKey, + ActualLrpInstanceKey: instanceKey, + ActualLrpNetInfo: netInfo, State: models.ActualLRPStateRunning, Since: 1138, } @@ -693,7 +693,7 @@ var _ = Describe("ActualLRP", func() { Context("when state is not set", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLrpKey: &lrpKey, + ActualLrpKey: lrpKey, State: "", Since: 1138, } @@ -710,7 +710,7 @@ var _ = Describe("ActualLRP", func() { Context("when since is not set", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLrpKey: &lrpKey, + ActualLrpKey: lrpKey, State: models.ActualLRPStateUnclaimed, Since: 0, } @@ -726,7 +726,7 @@ var _ = Describe("ActualLRP", func() { Context("when state is crashed", func() { BeforeEach(func() { lrp = models.ActualLRP{ - ActualLrpKey: &lrpKey, + ActualLrpKey: lrpKey, State: models.ActualLRPStateCrashed, Since: 1138, } @@ -745,16 +745,16 @@ var _ = Describe("ActualLRP", func() { actualLrpKey1 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") actualLrpInstanceKey1 := models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0") lrp1 := &models.ActualLRP{ - ActualLrpKey: &actualLrpKey1, - ActualLrpInstanceKey: &actualLrpInstanceKey1, + ActualLrpKey: actualLrpKey1, + ActualLrpInstanceKey: actualLrpInstanceKey1, Presence: models.ActualLRP_Ordinary, State: models.ActualLRPStateRunning, } actualLrpKey2 := models.NewActualLRPKey("process-guid-1", 1, "domain-1") actualLrpInstanceKey2 := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-0") lrp2 := &models.ActualLRP{ - ActualLrpKey: &actualLrpKey2, - ActualLrpInstanceKey: &actualLrpInstanceKey2, + ActualLrpKey: actualLrpKey2, + ActualLrpInstanceKey: actualLrpInstanceKey2, Presence: models.ActualLRP_Ordinary, State: models.ActualLRPStateRunning, } @@ -769,16 +769,16 @@ var _ = Describe("ActualLRP", func() { actualLrpKey1 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") actualLrpInstanceKey1 := models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0") lrp1 := &models.ActualLRP{ - ActualLrpKey: &actualLrpKey1, - ActualLrpInstanceKey: &actualLrpInstanceKey1, + ActualLrpKey: actualLrpKey1, + ActualLrpInstanceKey: actualLrpInstanceKey1, Presence: models.ActualLRP_Evacuating, State: models.ActualLRPStateRunning, } actualLrpKey2 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") actualLrpInstanceKey2 := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1") lrp2 := &models.ActualLRP{ - ActualLrpKey: &actualLrpKey2, - ActualLrpInstanceKey: &actualLrpInstanceKey2, + ActualLrpKey: actualLrpKey2, + ActualLrpInstanceKey: actualLrpInstanceKey2, Presence: models.ActualLRP_Ordinary, State: models.ActualLRPStateRunning, } @@ -797,16 +797,16 @@ var _ = Describe("ActualLRP", func() { actualLrpKey1 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") actualLrpInstanceKey1 := models.NewActualLRPInstanceKey("instance-guid-0", "cell-id-0") supLRP := &models.ActualLRP{ - ActualLrpKey: &actualLrpKey1, - ActualLrpInstanceKey: &actualLrpInstanceKey1, + ActualLrpKey: actualLrpKey1, + ActualLrpInstanceKey: actualLrpInstanceKey1, Presence: supLRPPresence, State: supLRPState, } actualLrpKey2 := models.NewActualLRPKey("process-guid-0", 0, "domain-0") actualLrpInstanceKey2 := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1") infLRP := &models.ActualLRP{ - ActualLrpKey: &actualLrpKey2, - ActualLrpInstanceKey: &actualLrpInstanceKey2, + ActualLrpKey: actualLrpKey2, + ActualLrpInstanceKey: actualLrpInstanceKey2, Presence: infLRPPresence, State: infLRPState, } @@ -871,7 +871,7 @@ func itValidatesPresenceOfTheLRPKey(lrp *models.ActualLRP) { Context("when the lrp key is set", func() { BeforeEach(func() { actualLrpKey := models.NewActualLRPKey("some-guid", 1, "domain") - lrp.ActualLrpKey = &actualLrpKey + lrp.ActualLrpKey = actualLrpKey }) It("validate does not return an error", func() { @@ -881,7 +881,7 @@ func itValidatesPresenceOfTheLRPKey(lrp *models.ActualLRP) { Context("when the lrp key is not set", func() { BeforeEach(func() { - lrp.ActualLrpKey = &models.ActualLRPKey{} + lrp.ActualLrpKey = models.ActualLRPKey{} }) It("validate returns an error", func() { @@ -896,7 +896,7 @@ func itValidatesPresenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is set", func() { BeforeEach(func() { actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-instance", "some-cell") - lrp.ActualLrpInstanceKey = &actualLrpInstanceKey + lrp.ActualLrpInstanceKey = actualLrpInstanceKey }) It("validate does not return an error", func() { @@ -906,7 +906,7 @@ func itValidatesPresenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is not set", func() { BeforeEach(func() { - lrp.ActualLrpInstanceKey = &models.ActualLRPInstanceKey{} + lrp.ActualLrpInstanceKey = models.ActualLRPInstanceKey{} }) It("validate returns an error", func() { @@ -921,7 +921,7 @@ func itValidatesAbsenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is set", func() { BeforeEach(func() { actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-instance", "some-cell") - lrp.ActualLrpInstanceKey = &actualLrpInstanceKey + lrp.ActualLrpInstanceKey = actualLrpInstanceKey }) It("validate returns an error", func() { @@ -933,7 +933,7 @@ func itValidatesAbsenceOfTheInstanceKey(lrp *models.ActualLRP) { Context("when the instance key is not set", func() { BeforeEach(func() { - lrp.ActualLrpInstanceKey = &models.ActualLRPInstanceKey{} + lrp.ActualLrpInstanceKey = models.ActualLRPInstanceKey{} }) It("validate does not return an error", func() { @@ -946,7 +946,7 @@ func itValidatesPresenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is set", func() { BeforeEach(func() { actualLrpNetInfo := models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown) - lrp.ActualLrpNetInfo = &actualLrpNetInfo + lrp.ActualLrpNetInfo = actualLrpNetInfo }) It("validate does not return an error", func() { @@ -956,7 +956,7 @@ func itValidatesPresenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is not set", func() { BeforeEach(func() { - lrp.ActualLrpNetInfo = &models.ActualLRPNetInfo{} + lrp.ActualLrpNetInfo = models.ActualLRPNetInfo{} }) It("validate returns an error", func() { @@ -971,7 +971,7 @@ func itValidatesAbsenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is set", func() { BeforeEach(func() { actualLrpNetInfo := models.NewActualLRPNetInfo("1.2.3.4", "2.2.2.2", models.ActualLRPNetInfo_PreferredAddressUnknown) - lrp.ActualLrpNetInfo = &actualLrpNetInfo + lrp.ActualLrpNetInfo = actualLrpNetInfo }) It("validate returns an error", func() { @@ -983,7 +983,7 @@ func itValidatesAbsenceOfNetInfo(lrp *models.ActualLRP) { Context("when net info is not set", func() { BeforeEach(func() { - lrp.ActualLrpNetInfo = &models.ActualLRPNetInfo{} + lrp.ActualLrpNetInfo = models.ActualLRPNetInfo{} }) It("validate does not return an error", func() { diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 093d1667..0e856cda 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -39,8 +39,8 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) copy(runInfo.EgressRules, egressRules) - desiredLrpKey := schedInfo.GetDesiredLrpKey() - desiredLrpResource := schedInfo.GetDesiredLrpResource() + desiredLrpKey := schedInfo.DesiredLrpKey + desiredLrpResource := schedInfo.DesiredLrpResource return DesiredLRP{ ProcessGuid: desiredLrpKey.ProcessGuid, @@ -53,7 +53,7 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo Instances: schedInfo.Instances, Annotation: schedInfo.Annotation, Routes: &schedInfo.Routes, - ModificationTag: schedInfo.ModificationTag, + ModificationTag: &schedInfo.ModificationTag, EnvironmentVariables: environmentVariables, CachedDependencies: runInfo.CachedDependencies, Setup: runInfo.Setup, @@ -511,12 +511,12 @@ func NewDesiredLRPSchedulingInfo( placementTags []string, ) DesiredLRPSchedulingInfo { return DesiredLRPSchedulingInfo{ - DesiredLrpKey: &key, + DesiredLrpKey: key, Annotation: annotation, Instances: instances, - DesiredLrpResource: &resource, + DesiredLrpResource: resource, Routes: routes, - ModificationTag: &modTag, + ModificationTag: modTag, VolumePlacement: volumePlacement, PlacementTags: placementTags, } @@ -632,7 +632,7 @@ func NewDesiredLRPRunInfo( logRateLimit *LogRateLimit, ) DesiredLRPRunInfo { return DesiredLRPRunInfo{ - DesiredLrpKey: &key, + DesiredLrpKey: key, CreatedAt: createdAt.UnixNano(), EnvironmentVariables: envVars, CachedDependencies: cacheDeps, diff --git a/models/events.go b/models/events.go index 72e20f65..f2265cfe 100644 --- a/models/events.go +++ b/models/events.go @@ -129,21 +129,21 @@ func (event *DesiredLRPRemovedEvent) ToEventProto() proto.Message { // FIXME: change the signature func NewActualLRPInstanceChangedEvent(before, after *ActualLRP, traceId string) *ActualLRPInstanceChangedEvent { var ( - actualLRPKey *ActualLRPKey - actualLRPInstanceKey *ActualLRPInstanceKey + actualLRPKey ActualLRPKey + actualLRPInstanceKey ActualLRPInstanceKey ) - if (before != nil && before.ActualLrpKey != &ActualLRPKey{}) { + if (before != nil && before.ActualLrpKey != ActualLRPKey{}) { actualLRPKey = before.ActualLrpKey } - if (after != nil && after.ActualLrpKey != &ActualLRPKey{}) { + if (after != nil && after.ActualLrpKey != ActualLRPKey{}) { actualLRPKey = after.ActualLrpKey } - if (before != nil && before.ActualLrpInstanceKey != &ActualLRPInstanceKey{}) { + if (before != nil && before.ActualLrpInstanceKey != ActualLRPInstanceKey{}) { actualLRPInstanceKey = before.ActualLrpInstanceKey } - if (after != nil && after.ActualLrpInstanceKey != &ActualLRPInstanceKey{}) { + if (after != nil && after.ActualLrpInstanceKey != ActualLRPInstanceKey{}) { actualLRPInstanceKey = after.ActualLrpInstanceKey } @@ -161,7 +161,7 @@ func (event *ActualLRPInstanceChangedEvent) EventType() string { } func (event *ActualLRPInstanceChangedEvent) Key() string { - return event.GetActualLrpInstanceKey().GetInstanceGuid() + return event.ActualLrpInstanceKey.GetInstanceGuid() } func (event *ActualLRPInstanceChangedEvent) ToEventProto() proto.Message { @@ -187,7 +187,7 @@ func (event *ActualLRPChangedEvent) Key() string { if resolveError != nil { return "" } - return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() + return actualLRP.ActualLrpInstanceKey.GetInstanceGuid() } // Deprecated: use the ActualLRPInstance versions of this instead @@ -235,7 +235,7 @@ func (event *ActualLRPRemovedEvent) Key() string { if resolveError != nil { return "" } - return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() + return actualLRP.ActualLrpInstanceKey.GetInstanceGuid() } // Deprecated: use the ActualLRPInstance versions of this instead @@ -258,7 +258,7 @@ func (event *ActualLRPInstanceRemovedEvent) Key() string { if event.ActualLrp == nil { return "" } - return event.ActualLrp.GetActualLrpInstanceKey().GetInstanceGuid() + return event.ActualLrp.ActualLrpInstanceKey.GetInstanceGuid() } func (event *ActualLRPInstanceRemovedEvent) ToEventProto() proto.Message { @@ -283,7 +283,7 @@ func (event *ActualLRPCreatedEvent) Key() string { if resolveError != nil { return "" } - return actualLRP.GetActualLrpInstanceKey().GetInstanceGuid() + return actualLRP.ActualLrpInstanceKey.GetInstanceGuid() } func (event *ActualLRPCreatedEvent) ToEventProto() proto.Message { @@ -305,7 +305,7 @@ func (event *ActualLRPInstanceCreatedEvent) Key() string { if event.ActualLrp == nil { return "" } - return event.ActualLrp.GetActualLrpInstanceKey().GetInstanceGuid() + return event.ActualLrp.ActualLrpInstanceKey.GetInstanceGuid() } func (event *ActualLRPInstanceCreatedEvent) ToEventProto() proto.Message { diff --git a/models/events_test.go b/models/events_test.go index ed22b1ca..d885b3c1 100644 --- a/models/events_test.go +++ b/models/events_test.go @@ -14,12 +14,12 @@ var _ = Describe("Events", func() { Context("when before is set", func() { BeforeEach(func() { before = &models.ActualLRP{ - ActualLrpKey: &models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "before-process-guid", Index: 5, Domain: "before-domain", }, - ActualLrpInstanceKey: &models.ActualLRPInstanceKey{ + ActualLrpInstanceKey: models.ActualLRPInstanceKey{ InstanceGuid: "before-instance-guid", CellId: "before-cell-id", }, @@ -29,12 +29,12 @@ var _ = Describe("Events", func() { Context("when after is set", func() { BeforeEach(func() { after = &models.ActualLRP{ - ActualLrpKey: &models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "after-process-guid", Index: 7, Domain: "after-domain", }, - ActualLrpInstanceKey: &models.ActualLRPInstanceKey{ + ActualLrpInstanceKey: models.ActualLRPInstanceKey{ InstanceGuid: "after-instance-guid", CellId: "after-cell-id", }, @@ -51,7 +51,7 @@ var _ = Describe("Events", func() { Context("when after is unclaimed", func() { BeforeEach(func() { after = &models.ActualLRP{ - ActualLrpKey: &models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "after-process-guid", Index: 7, Domain: "after-domain", @@ -88,12 +88,12 @@ var _ = Describe("Events", func() { Context("when after is set", func() { BeforeEach(func() { after = &models.ActualLRP{ - ActualLrpKey: &models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "after-process-guid", Index: 7, Domain: "after-domain", }, - ActualLrpInstanceKey: &models.ActualLRPInstanceKey{ + ActualLrpInstanceKey: models.ActualLRPInstanceKey{ InstanceGuid: "after-instance-guid", CellId: "after-cell-id", }, @@ -109,7 +109,7 @@ var _ = Describe("Events", func() { Context("when before is unclaimed", func() { BeforeEach(func() { before = &models.ActualLRP{ - ActualLrpKey: &models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "before-process-guid", Index: 5, Domain: "before-domain", diff --git a/models/test/model_helpers/constructors.go b/models/test/model_helpers/constructors.go index c4a4f181..7ac1bb2e 100644 --- a/models/test/model_helpers/constructors.go +++ b/models/test/model_helpers/constructors.go @@ -13,9 +13,9 @@ func NewValidActualLRP(guid string, index int32) *models.ActualLRP { actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-guid", "some-cell") actualLrpNetInfo := models.NewActualLRPNetInfo("some-address", "container-address", models.ActualLRPNetInfo_PreferredAddressUnknown, models.NewPortMapping(2222, 4444)) actualLRP := &models.ActualLRP{ - ActualLrpKey: &actualLrpKey, - ActualLrpInstanceKey: &actualLrpInstanceKey, - ActualLrpNetInfo: &actualLrpNetInfo, + ActualLrpKey: actualLrpKey, + ActualLrpInstanceKey: actualLrpInstanceKey, + ActualLrpNetInfo: actualLrpNetInfo, ActualLrpInternalRoutes: NewActualLRPInternalRoutes(), MetricTags: NewActualLRPMetricTags(), AvailabilityZone: "some-zone", @@ -23,7 +23,7 @@ func NewValidActualLRP(guid string, index int32) *models.ActualLRP { CrashReason: "badness", State: models.ActualLRPStateRunning, Since: 1138, - ModificationTag: &models.ModificationTag{ + ModificationTag: models.ModificationTag{ Epoch: "some-epoch", Index: 999, }, @@ -52,7 +52,7 @@ func NewValidEvacuatingActualLRP(guid string, index int32) *models.ActualLRP { actualLRP := NewValidActualLRP(guid, index) actualLRP.Presence = models.ActualLRP_Evacuating actualLrpInstanceKey := models.NewActualLRPInstanceKey("some-guid", "some-evacuating-cell") - actualLRP.ActualLrpInstanceKey = &actualLrpInstanceKey + actualLRP.ActualLrpInstanceKey = actualLrpInstanceKey return actualLRP } diff --git a/test_helpers/actual_lrp_group_matcher.go b/test_helpers/actual_lrp_group_matcher.go index bba949fe..b4ebc65d 100644 --- a/test_helpers/actual_lrp_group_matcher.go +++ b/test_helpers/actual_lrp_group_matcher.go @@ -14,12 +14,12 @@ func MatchActualLRPGroup(expected *models.ActualLRPGroup) types.GomegaMatcher { if newLRP.Instance != nil { newLRP.Instance.Since = 0 - newLRP.Instance.ModificationTag = &models.ModificationTag{} + newLRP.Instance.ModificationTag = models.ModificationTag{} } if newLRP.Evacuating != nil { newLRP.Evacuating.Since = 0 - newLRP.Evacuating.ModificationTag = &models.ModificationTag{} + newLRP.Evacuating.ModificationTag = models.ModificationTag{} } return &newLRP } diff --git a/test_helpers/actual_lrp_matcher.go b/test_helpers/actual_lrp_matcher.go index bf070973..528c9148 100644 --- a/test_helpers/actual_lrp_matcher.go +++ b/test_helpers/actual_lrp_matcher.go @@ -11,7 +11,7 @@ func MatchActualLRP(expected *models.ActualLRP) types.GomegaMatcher { newLRP := *lrp newLRP.Since = 0 - newLRP.ModificationTag = &models.ModificationTag{} + newLRP.ModificationTag = models.ModificationTag{} return &newLRP } From 5e4b96515523242d342a21df7861cf115c811309 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 16 May 2024 17:38:24 +0000 Subject: [PATCH 080/155] Use protojson for Marshal/Unmarshal functionality --- models/routes_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/models/routes_test.go b/models/routes_test.go index 5dd5a4b2..d5576bd0 100644 --- a/models/routes_test.go +++ b/models/routes_test.go @@ -4,6 +4,7 @@ import ( "encoding/json" "code.cloudfoundry.org/bbs/models" + "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" . "github.com/onsi/ginkgo/v2" @@ -12,8 +13,9 @@ import ( var _ = Describe("Routes", func() { var update models.DesiredLRPUpdate - var aJson models.DesiredLRPUpdate + var aJson models.ProtoDesiredLRPUpdate var aProto models.DesiredLRPUpdate + var resultProto models.ProtoDesiredLRPUpdate itSerializes := func(routes *models.Routes) { BeforeEach(func() { @@ -36,23 +38,22 @@ var _ = Describe("Routes", func() { 2024-05-15: It remains to be seen if this extra layer is going to cause performance issues */ - b, err := json.Marshal(update) + b, err := protojson.Marshal(update.ToProto()) Expect(err).NotTo(HaveOccurred()) - err = json.Unmarshal(b, &aJson) + err = protojson.Unmarshal(b, &aJson) Expect(err).NotTo(HaveOccurred()) protoUpdate := update.ToProto() b, err = proto.Marshal(protoUpdate) Expect(err).NotTo(HaveOccurred()) - protoA := aProto.ToProto() // aProto is empty ProtoDesiredLRPUpdate - err = proto.Unmarshal(b, protoA) + err = proto.Unmarshal(b, &resultProto) Expect(err).NotTo(HaveOccurred()) - aProto = *protoA.FromProto() // make sure we convert back to non-proto + aProto = *resultProto.FromProto() // make sure we convert back to non-proto }) It("marshals JSON properly", func() { - Expect(update.Equal(&aJson)).To(BeTrue()) - Expect(update).To(Equal(aJson)) + Expect(update.Equal(aJson.FromProto())).To(BeTrue()) + Expect(update).To(Equal(*aJson.FromProto())) }) It("marshals Proto properly", func() { From 5882354e0ea6699121e59bda4a0758a53ce436c9 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 16 May 2024 22:05:22 +0000 Subject: [PATCH 081/155] Add json_name tags to prevent camelCase from happening Regen protos --- models/actions.pb.go | 186 +++++++++++++++++++++---------------------- models/actions.proto | 6 +- 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index 9e1aaec1..b509e6fc 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -153,8 +153,8 @@ type ProtoDownloadAction struct { CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` - ChecksumAlgorithm string `protobuf:"bytes,7,opt,name=checksum_algorithm,json=checksumAlgorithm,proto3" json:"checksum_algorithm,omitempty"` - ChecksumValue string `protobuf:"bytes,8,opt,name=checksum_value,json=checksumValue,proto3" json:"checksum_value,omitempty"` + ChecksumAlgorithm string `protobuf:"bytes,7,opt,name=checksum_algorithm,proto3" json:"checksum_algorithm,omitempty"` + ChecksumValue string `protobuf:"bytes,8,opt,name=checksum_value,proto3" json:"checksum_value,omitempty"` } func (x *ProtoDownloadAction) Reset() { @@ -333,7 +333,7 @@ type ProtoRunAction struct { Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` Dir string `protobuf:"bytes,3,opt,name=dir,proto3" json:"dir,omitempty"` Env []*ProtoEnvironmentVariable `protobuf:"bytes,4,rep,name=env,proto3" json:"env,omitempty"` - ResourceLimits *ProtoResourceLimits `protobuf:"bytes,5,opt,name=resource_limits,json=resourceLimits,proto3" json:"resource_limits,omitempty"` + ResourceLimits *ProtoResourceLimits `protobuf:"bytes,5,opt,name=resource_limits,proto3" json:"resource_limits,omitempty"` User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` LogSource string `protobuf:"bytes,7,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` SuppressLogOutput bool `protobuf:"varint,8,opt,name=suppress_log_output,proto3" json:"suppress_log_output,omitempty"` @@ -897,7 +897,7 @@ var file_actions_proto_rawDesc = []byte{ 0x64, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x0b, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x22, 0xfc, + 0x6e, 0x52, 0x0b, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x22, 0xfe, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, @@ -908,100 +908,100 @@ var file_actions_proto_rawDesc = []byte{ 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x41, 0x6c, 0x67, - 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, - 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x86, 0x01, - 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x12, - 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, - 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x74, 0x6f, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xa9, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, - 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, - 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x67, - 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x64, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, - 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, - 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x44, 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, 0x0e, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x12, 0x0a, - 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, - 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x12, 0x30, 0x0a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, - 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x73, - 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, - 0x75, 0x74, 0x22, 0xac, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, - 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, - 0x73, 0x22, 0xed, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, 0x50, - 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, - 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x0a, 0x16, 0x66, 0x61, - 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, - 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x66, 0x61, 0x69, 0x6c, - 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, - 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x22, 0x5c, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, - 0x63, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x22, 0x61, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, - 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, + 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, + 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, + 0x86, 0x01, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, + 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xaa, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, + 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, + 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x61, + 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x64, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x45, 0x0a, 0x0f, 0x72, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, + 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, + 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x75, 0x73, 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, + 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, + 0x75, 0x74, 0x70, 0x75, 0x74, 0x22, 0xac, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, + 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, 0x70, + 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, + 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, + 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, + 0x74, 0x5f, 0x6d, 0x73, 0x22, 0xed, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, + 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, + 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x75, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x0a, + 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x66, + 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, + 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x22, 0x5c, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x22, 0x63, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, + 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, - 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, - 0x66, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, - 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x04, 0x42, 0x02, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, - 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, - 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x61, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, + 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x16, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x22, 0x66, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, + 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, + 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, + 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, + 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, + 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/actions.proto b/models/actions.proto index 88b38ca1..6629d66c 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -34,8 +34,8 @@ message ProtoDownloadAction { string cache_key = 4 [json_name = "cache_key"]; string log_source = 5; string user = 6 [json_name = "user"] ; - string checksum_algorithm = 7; - string checksum_value = 8; + string checksum_algorithm = 7 [json_name = "checksum_algorithm"]; + string checksum_value = 8 [json_name = "checksum_value"]; } message ProtoUploadAction { @@ -51,7 +51,7 @@ message ProtoRunAction { repeated string args = 2; string dir = 3; repeated ProtoEnvironmentVariable env = 4; - ProtoResourceLimits resource_limits = 5; + ProtoResourceLimits resource_limits = 5 [json_name = "resource_limits"]; string user = 6 [json_name = "user"]; string log_source = 7; bool suppress_log_output = 8 [json_name = "suppress_log_output"]; From 103b38443c2e44e68d01a5dcd48b7a18e6b5d360 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 16 May 2024 22:06:20 +0000 Subject: [PATCH 082/155] Add GetProto for Actions so we can marshal/unmarshal correctly --- models/actions.go | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/models/actions.go b/models/actions.go index 22d29247..37c57d1c 100644 --- a/models/actions.go +++ b/models/actions.go @@ -8,6 +8,7 @@ import ( "time" "code.cloudfoundry.org/bbs/format" + "google.golang.org/protobuf/proto" ) const ( @@ -60,6 +61,37 @@ func (a *Action) GetValue() interface{} { return nil } +func (a *Action) GetProto() proto.Message { + if a.DownloadAction != nil { + return a.DownloadAction.ToProto() + } + if a.UploadAction != nil { + return a.UploadAction.ToProto() + } + if a.RunAction != nil { + return a.RunAction.ToProto() + } + if a.TimeoutAction != nil { + return a.TimeoutAction.ToProto() + } + if a.EmitProgressAction != nil { + return a.EmitProgressAction.ToProto() + } + if a.TryAction != nil { + return a.TryAction.ToProto() + } + if a.ParallelAction != nil { + return a.ParallelAction.ToProto() + } + if a.SerialAction != nil { + return a.SerialAction.ToProto() + } + if a.CodependentAction != nil { + return a.CodependentAction.ToProto() + } + return nil +} + func (a *Action) SetValue(value interface{}) bool { switch vt := value.(type) { case *DownloadAction: From a4e72106dac5105979e960185f8c98c68a49add9 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 16 May 2024 22:07:56 +0000 Subject: [PATCH 083/155] Update tests to account for protojson and protobuf changes --- models/actions_test.go | 99 ++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 33 deletions(-) diff --git a/models/actions_test.go b/models/actions_test.go index 02d46c21..5b58fe62 100644 --- a/models/actions_test.go +++ b/models/actions_test.go @@ -1,22 +1,23 @@ package models_test import ( - "encoding/json" "fmt" + "log" "time" "code.cloudfoundry.org/bbs/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/encoding/protojson" ) var _ = Describe("Actions", func() { itSerializes := func(actionPayload string, a *models.Action) { action := models.UnwrapAction(a) It("Action -> JSON for "+string(action.ActionType()), func() { - json, err := json.Marshal(action) + marshalJson, err := protojson.Marshal(a.GetProto()) Expect(err).NotTo(HaveOccurred()) - Expect(json).To(MatchJSON(actionPayload)) + Expect(string(marshalJson)).To(MatchJSON(actionPayload)) }) } @@ -24,10 +25,10 @@ var _ = Describe("Actions", func() { action := models.UnwrapAction(a) It("JSON -> Action for "+string(action.ActionType()), func() { wrappedJSON := fmt.Sprintf(`{"%s":%s}`, action.ActionType(), actionPayload) - marshalledAction := new(models.Action) - err := json.Unmarshal([]byte(wrappedJSON), marshalledAction) + marshalledAction := new(models.ProtoAction) + err := protojson.Unmarshal([]byte(wrappedJSON), marshalledAction) Expect(err).NotTo(HaveOccurred()) - Expect(marshalledAction).To(BeEquivalentTo(a)) + Expect(marshalledAction.FromProto()).To(BeEquivalentTo(a)) }) } @@ -58,20 +59,32 @@ var _ = Describe("Actions", func() { Describe("Nil Actions", func() { It("Action -> JSON for a Nil action", func() { - var action *models.Action = nil + var action *models.ProtoAction = nil By("marshalling to JSON", func() { - json, err := json.Marshal(action) + json, err := protojson.Marshal(action) Expect(err).NotTo(HaveOccurred()) - Expect(json).To(MatchJSON("null")) + log.Printf("%+v\n", json) + Expect(json).To(MatchJSON("{}")) }) }) It("JSON -> Action for Nil action", func() { By("unwrapping", func() { - var unmarshalledAction *models.Action - err := json.Unmarshal([]byte("null"), &unmarshalledAction) + unmarshalledAction := new(models.ProtoAction) + err := protojson.Unmarshal([]byte("{}"), unmarshalledAction) Expect(err).NotTo(HaveOccurred()) - Expect(unmarshalledAction).To(BeNil()) + // TODO: protojson.Unmarshal requires a non-nil pointer in order to work + // see if we can find an alternative way of doing this so the following line works + // Expect(unmarshalledAction).To(BeNil()) + Expect(unmarshalledAction.DownloadAction).To(BeNil()) + Expect(unmarshalledAction.UploadAction).To(BeNil()) + Expect(unmarshalledAction.RunAction).To(BeNil()) + Expect(unmarshalledAction.TimeoutAction).To(BeNil()) + Expect(unmarshalledAction.EmitProgressAction).To(BeNil()) + Expect(unmarshalledAction.TryAction).To(BeNil()) + Expect(unmarshalledAction.ParallelAction).To(BeNil()) + Expect(unmarshalledAction.SerialAction).To(BeNil()) + Expect(unmarshalledAction.CodependentAction).To(BeNil()) }) }) @@ -191,7 +204,7 @@ var _ = Describe("Actions", func() { Context("with checksum", func() { for _, testCase := range []ValidatorErrorCase{ - ValidatorErrorCase{ + { "checksum value", &models.DownloadAction{ From: "web_location", @@ -201,7 +214,7 @@ var _ = Describe("Actions", func() { ChecksumValue: "", }, }, - ValidatorErrorCase{ + { "checksum algorithm", &models.DownloadAction{ From: "web_location", @@ -211,7 +224,7 @@ var _ = Describe("Actions", func() { ChecksumValue: "some checksum", }, }, - ValidatorErrorCase{ + { "invalid algorithm", &models.DownloadAction{ From: "web_location", @@ -305,9 +318,13 @@ var _ = Describe("Actions", func() { {"name":"FOO", "value":"1"}, {"name":"BAR", "value":"2"} ], - "resource_limits":{"nofile": 10, "nproc": 20}, - "suppress_log_output": false + "resource_limits":{"nofile": "10", "nproc": "20"} }`, + //TODO: double-check these properties + // protobuf v3 makes uint64 a string + //"resource_limits":{"nofile": 10, "nproc": 20} + // protojson does not emit this + //"suppress_log_output": false models.WrapAction(&models.RunAction{ User: "me", Path: "rm", @@ -318,6 +335,7 @@ var _ = Describe("Actions", func() { {"BAR", "2"}, }, ResourceLimits: resourceLimits, + // SuppressLogOutput: false, }), ) @@ -366,15 +384,20 @@ var _ = Describe("Actions", func() { "action": { "run": { "path": "echo", - "user": "someone", "resource_limits":{ - "nofile": 10 + "nofile": "10" }, - "suppress_log_output": false + "user": "someone" } }, - "timeout_ms": 10 + "timeout_ms": "10" }`, + //TODO: double-check these properties + // protobuf v3 makes uint64 a string + //"resource_limits":{"nofile": 10} + //"timeout_ms": 10 + // protojson does not emit this + //"suppress_log_output": false models.WrapAction( models.Timeout( &models.RunAction{ @@ -451,11 +474,13 @@ var _ = Describe("Actions", func() { "run": { "path": "echo", "resource_limits":{}, - "user": "me", - "suppress_log_output": false + "user": "me" } } }`, + //TODO: double-check these properties + // protojson does not emit this + //"suppress_log_output": false models.WrapAction(models.Try(&models.RunAction{ Path: "echo", User: "me", @@ -520,12 +545,14 @@ var _ = Describe("Actions", func() { "run": { "resource_limits": {}, "path": "echo", - "user": "me", - "suppress_log_output": false + "user": "me" } } ] }`, + //TODO: double-check these properties + // protojson does not emit this + //"suppress_log_output": false models.WrapAction(models.Parallel( &models.DownloadAction{ From: "web_location", @@ -548,7 +575,7 @@ var _ = Describe("Actions", func() { It("is valid", func() { parallelAction = &models.ParallelAction{ Actions: []*models.Action{ - &models.Action{ + { UploadAction: &models.UploadAction{ From: "local_location", To: "web_location", @@ -584,7 +611,7 @@ var _ = Describe("Actions", func() { "from", &models.ParallelAction{ Actions: []*models.Action{ - &models.Action{ + { UploadAction: &models.UploadAction{ To: "web_location", }, @@ -614,12 +641,14 @@ var _ = Describe("Actions", func() { "run": { "resource_limits": {}, "path": "echo", - "user": "me", - "suppress_log_output": false + "user": "me" } } ] }`, + //TODO: double-check these properties + // protojson does not emit this + //"suppress_log_output": false models.WrapAction(models.Serial( &models.DownloadAction{ From: "web_location", @@ -693,11 +722,13 @@ var _ = Describe("Actions", func() { "run": { "path": "echo", "resource_limits":{}, - "user": "me", - "suppress_log_output": false + "user": "me" } } }`, + //TODO: double-check these properties + // protojson does not emit this + //"suppress_log_output": false models.WrapAction(models.EmitProgressFor( &models.RunAction{ Path: "echo", @@ -763,12 +794,14 @@ var _ = Describe("Actions", func() { "run": { "resource_limits": {}, "path": "echo", - "user": "me", - "suppress_log_output": false + "user": "me" } } ] }`, + //TODO: double-check these properties + // protojson does not emit this + //"suppress_log_output": false models.WrapAction(models.Codependent( &models.DownloadAction{ From: "web_location", From be14418020b177808409c339372f5a5780d9745f Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 17 May 2024 15:17:27 +0000 Subject: [PATCH 084/155] Codegen: Add support for ExcludeFromEqual feature and regenerate codegen protos --- models/bbs.pb.go | 51 ++++++++++++++++++++++++------------- protoc-gen-go-bbs/bbs.go | 8 ++++++ protoc-gen-go-bbs/bbs.pb.go | 51 ++++++++++++++++++++++++------------- protoc-gen-go-bbs/bbs.proto | 1 + 4 files changed, 77 insertions(+), 34 deletions(-) diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 9ff7c93f..b21985b9 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -37,6 +37,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "varint,1010,opt,name=bbs_by_value", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 1020, + Name: "bbs.bbs_exclude_from_equal", + Tag: "varint,1020,opt,name=bbs_exclude_from_equal", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -53,12 +61,14 @@ var ( E_BbsJsonName = &file_bbs_proto_extTypes[0] // optional bool bbs_by_value = 1010; E_BbsByValue = &file_bbs_proto_extTypes[1] + // optional bool bbs_exclude_from_equal = 1020; + E_BbsExcludeFromEqual = &file_bbs_proto_extTypes[2] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[2] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[3] ) var File_bbs_proto protoreflect.FileDescriptor @@ -75,16 +85,22 @@ var file_bbs_proto_rawDesc = []byte{ 0x5f, 0x62, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, - 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, - 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, + 0x0a, 0x16, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, + 0x6f, 0x6d, 0x5f, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, + 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, + 0x62, 0x62, 0x73, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, + 0x75, 0x61, 0x6c, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, + 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, + 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, + 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, + 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var file_bbs_proto_goTypes = []interface{}{ @@ -94,11 +110,12 @@ var file_bbs_proto_goTypes = []interface{}{ var file_bbs_proto_depIdxs = []int32{ 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions - 1, // 2: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 3, // [3:3] is the sub-list for method output_type - 3, // [3:3] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 0, // [0:3] is the sub-list for extension extendee + 0, // 2: bbs.bbs_exclude_from_equal:extendee -> google.protobuf.FieldOptions + 1, // 3: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 0, // [0:4] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -114,7 +131,7 @@ func file_bbs_proto_init() { RawDescriptor: file_bbs_proto_rawDesc, NumEnums: 0, NumMessages: 0, - NumExtensions: 3, + NumExtensions: 4, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 9cf8cfa9..6182b742 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -111,6 +111,9 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa g.P(equalBuilder.String()) g.P() for _, field := range msg.Fields { + if isExcludedFromEqual(field) { + continue + } fieldName := getFieldName(field.GoName) if field.Desc.Cardinality() == protoreflect.Repeated { g.P("if len(this.", fieldName, ") != len(that1.", fieldName, ") {") @@ -292,6 +295,11 @@ func isByValueType(field *protogen.Field) bool { return isByValueType.(bool) } +func isExcludedFromEqual(field *protogen.Field) bool { + isExcludedFromEqual := proto.GetExtension(field.Desc.Options().(*descriptorpb.FieldOptions), E_BbsExcludeFromEqual) + return isExcludedFromEqual.(bool) +} + func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) { for _, eNuM := range msg.Enums { if *debug { diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index cbf912d6..6801cafb 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -37,6 +37,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "varint,1010,opt,name=bbs_by_value", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 1020, + Name: "bbs.bbs_exclude_from_equal", + Tag: "varint,1020,opt,name=bbs_exclude_from_equal", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -53,12 +61,14 @@ var ( E_BbsJsonName = &file_bbs_proto_extTypes[0] // optional bool bbs_by_value = 1010; E_BbsByValue = &file_bbs_proto_extTypes[1] + // optional bool bbs_exclude_from_equal = 1020; + E_BbsExcludeFromEqual = &file_bbs_proto_extTypes[2] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[2] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[3] ) var File_bbs_proto protoreflect.FileDescriptor @@ -75,16 +85,22 @@ var file_bbs_proto_rawDesc = []byte{ 0x5f, 0x62, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, - 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, - 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, + 0x0a, 0x16, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, + 0x6f, 0x6d, 0x5f, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, + 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, + 0x62, 0x62, 0x73, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, + 0x75, 0x61, 0x6c, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, + 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, + 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, + 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, + 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var file_bbs_proto_goTypes = []interface{}{ @@ -94,11 +110,12 @@ var file_bbs_proto_goTypes = []interface{}{ var file_bbs_proto_depIdxs = []int32{ 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions - 1, // 2: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 3, // [3:3] is the sub-list for method output_type - 3, // [3:3] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 0, // [0:3] is the sub-list for extension extendee + 0, // 2: bbs.bbs_exclude_from_equal:extendee -> google.protobuf.FieldOptions + 1, // 3: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 0, // [0:4] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -114,7 +131,7 @@ func file_bbs_proto_init() { RawDescriptor: file_bbs_proto_rawDesc, NumEnums: 0, NumMessages: 0, - NumExtensions: 3, + NumExtensions: 4, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/protoc-gen-go-bbs/bbs.proto b/protoc-gen-go-bbs/bbs.proto index 29d9b461..bfab3334 100644 --- a/protoc-gen-go-bbs/bbs.proto +++ b/protoc-gen-go-bbs/bbs.proto @@ -8,6 +8,7 @@ import "google/protobuf/descriptor.proto"; extend google.protobuf.FieldOptions { optional string bbs_json_name = 1000; optional bool bbs_by_value = 1010; + optional bool bbs_exclude_from_equal = 1020; } extend google.protobuf.EnumValueOptions { From 28b474716ec2e3bfcf2f47dac2cf22c574eae603 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 17 May 2024 15:19:14 +0000 Subject: [PATCH 085/155] Add ExcludeFromEqual to Error.Message; regenerate error.proto --- models/error.pb.go | 14 ++++++++------ models/error.proto | 4 +++- models/error_bbs.pb.go | 3 --- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/models/error.pb.go b/models/error.pb.go index 9242509f..69d6a00f 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -194,12 +194,13 @@ var File_error_proto protoreflect.FileDescriptor var file_error_proto_rawDesc = []byte{ 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0xbf, 0x05, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, - 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xe9, 0x04, 0x0a, 0x04, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0xc4, 0x05, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, + 0x2b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, + 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x07, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, + 0x3f, 0x01, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xe9, 0x04, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, @@ -276,6 +277,7 @@ func file_error_proto_init() { if File_error_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_error_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoError); i { diff --git a/models/error.proto b/models/error.proto index e278c03d..b84686ae 100644 --- a/models/error.proto +++ b/models/error.proto @@ -3,6 +3,8 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; + message ProtoError { enum Type { reserved 1, 2, 10, 20, 22, 23, 25; // previously used and removed values @@ -44,5 +46,5 @@ message ProtoError { } Type type = 1 [json_name = "type"]; - string message = 2 [json_name = "message"]; + string message = 2 [json_name = "message", (bbs.bbs_exclude_from_equal) = true]; } diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 0eb8585f..6c6a0232 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -137,9 +137,6 @@ func (this *Error) Equal(that interface{}) bool { if this.Type != that1.Type { return false } - if this.Message != that1.Message { - return false - } return true } func (m *Error) GetType() Error_Type { From 505dcb5a072d830d64653fb33a97fbb28e812d07 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 17 May 2024 16:49:52 +0000 Subject: [PATCH 086/155] Add special case for Action types (they need GetValue and SetValue) Regen protos --- models/actions_bbs.pb.go | 12 ++++++------ models/desired_lrp_bbs.pb.go | 24 ++++++++++++------------ models/sidecar_bbs.pb.go | 4 ++-- models/task_bbs.pb.go | 4 ++-- protoc-gen-go-bbs/bbs.go | 14 ++++++++++++-- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index bac0fd7d..797c341f 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -852,13 +852,13 @@ func (this *TimeoutAction) Equal(that interface{}) bool { } func (m *TimeoutAction) GetAction() *Action { if m != nil { - return m.Action + return m.Action.GetValue().(*Action) } return nil } func (m *TimeoutAction) SetAction(value *Action) { if m != nil { - m.Action = value + m.Action.SetValue(value) } } @@ -996,13 +996,13 @@ func (this *EmitProgressAction) Equal(that interface{}) bool { } func (m *EmitProgressAction) GetAction() *Action { if m != nil { - return m.Action + return m.Action.GetValue().(*Action) } return nil } func (m *EmitProgressAction) SetAction(value *Action) { if m != nil { - m.Action = value + m.Action.SetValue(value) } } func (m *EmitProgressAction) GetStartMessage() string { @@ -1139,13 +1139,13 @@ func (this *TryAction) Equal(that interface{}) bool { } func (m *TryAction) GetAction() *Action { if m != nil { - return m.Action + return m.Action.GetValue().(*Action) } return nil } func (m *TryAction) SetAction(value *Action) { if m != nil { - m.Action = value + m.Action.SetValue(value) } } func (m *TryAction) GetLogSource() string { diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 34a78f5b..ae2eeaf4 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -387,35 +387,35 @@ func (m *DesiredLRPRunInfo) SetEnvironmentVariables(value []*EnvironmentVariable } func (m *DesiredLRPRunInfo) GetSetup() *Action { if m != nil { - return m.Setup + return m.Setup.GetValue().(*Action) } return nil } func (m *DesiredLRPRunInfo) SetSetup(value *Action) { if m != nil { - m.Setup = value + m.Setup.SetValue(value) } } func (m *DesiredLRPRunInfo) GetAction() *Action { if m != nil { - return m.Action + return m.Action.GetValue().(*Action) } return nil } func (m *DesiredLRPRunInfo) SetAction(value *Action) { if m != nil { - m.Action = value + m.Action.SetValue(value) } } func (m *DesiredLRPRunInfo) GetMonitor() *Action { if m != nil { - return m.Monitor + return m.Monitor.GetValue().(*Action) } return nil } func (m *DesiredLRPRunInfo) SetMonitor(value *Action) { if m != nil { - m.Monitor = value + m.Monitor.SetValue(value) } } @@ -1498,24 +1498,24 @@ func (m *DesiredLRP) SetEnvironmentVariables(value []*EnvironmentVariable) { } func (m *DesiredLRP) GetSetup() *Action { if m != nil { - return m.Setup + return m.Setup.GetValue().(*Action) } return nil } func (m *DesiredLRP) SetSetup(value *Action) { if m != nil { - m.Setup = value + m.Setup.SetValue(value) } } func (m *DesiredLRP) GetAction() *Action { if m != nil { - return m.Action + return m.Action.GetValue().(*Action) } return nil } func (m *DesiredLRP) SetAction(value *Action) { if m != nil { - m.Action = value + m.Action.SetValue(value) } } func (m *DesiredLRP) GetStartTimeoutMs() int64 { @@ -1544,13 +1544,13 @@ func (m *DesiredLRP) SetDeprecatedStartTimeoutS(value uint32) { } func (m *DesiredLRP) GetMonitor() *Action { if m != nil { - return m.Monitor + return m.Monitor.GetValue().(*Action) } return nil } func (m *DesiredLRP) SetMonitor(value *Action) { if m != nil { - m.Monitor = value + m.Monitor.SetValue(value) } } func (m *DesiredLRP) GetDiskMb() int32 { diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 56f5ec60..778045d9 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -48,13 +48,13 @@ func (this *Sidecar) Equal(that interface{}) bool { } func (m *Sidecar) GetAction() *Action { if m != nil { - return m.Action + return m.Action.GetValue().(*Action) } return nil } func (m *Sidecar) SetAction(value *Action) { if m != nil { - m.Action = value + m.Action.SetValue(value) } } func (m *Sidecar) GetDiskMb() int32 { diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 5844d070..dae0fcaf 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -205,13 +205,13 @@ func (m *TaskDefinition) SetEnvironmentVariables(value []*EnvironmentVariable) { } func (m *TaskDefinition) GetAction() *Action { if m != nil { - return m.Action + return m.Action.GetValue().(*Action) } return nil } func (m *TaskDefinition) SetAction(value *Action) { if m != nil { - m.Action = value + m.Action.SetValue(value) } } func (m *TaskDefinition) GetDiskMb() int32 { diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 6182b742..7927deb1 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -194,9 +194,14 @@ func genGetter(g *protogen.GeneratedFile, copysafeName string, field *protogen.F optionalCheck = fmt.Sprintf("&& m.%s != nil ", fieldName) //extra space intentional genExists(g, copysafeName, field) } + // TODO: make this cleaner + actionGetValue := "" + if cut, ok := strings.CutPrefix(fieldType, "*"); ok && cut == "Action" { + actionGetValue = ".GetValue().(*Action)" + } g.P("func (m *", copysafeName, ") Get", fieldName, "() ", fieldType, " {") g.P("if m != nil ", optionalCheck, "{") - g.P("return m.", fieldName) + g.P("return m.", fieldName, actionGetValue) g.P("}") g.P("return ", defaultValue) g.P("}") @@ -206,9 +211,14 @@ func genSetter(g *protogen.GeneratedFile, copysafeName string, fieldName string, if *debug { log.Print("Setter...") } + // TODO: make this cleaner + setValue := " = value" + if cut, ok := strings.CutPrefix(fieldType, "*"); ok && cut == "Action" { + setValue = ".SetValue(value)" + } g.P("func (m *", copysafeName, ") Set", fieldName, "(value ", fieldType, ") {") g.P("if m != nil {") - g.P("m.", fieldName, " = value") + g.P("m.", fieldName, setValue) g.P("}") g.P("}") } From 34bccf0e4a651915c196a28eea371c2da48de02f Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 17 May 2024 16:50:58 +0000 Subject: [PATCH 087/155] Update SecurityGroups test for protobuf and protojson changes --- models/security_groups_test.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/models/security_groups_test.go b/models/security_groups_test.go index 5d7f00a7..2821a362 100644 --- a/models/security_groups_test.go +++ b/models/security_groups_test.go @@ -1,11 +1,10 @@ package models_test import ( - "encoding/json" - "code.cloudfoundry.org/bbs/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" ) @@ -376,9 +375,11 @@ var _ = Describe("SecurityGroupRule", func() { "destinations": [ "0.0.0.0-9.255.255.255" ], - "log": false, - "annotations":["quack"] + "annotations":["quack"] }` + // TODO: double-check these fields + // protojson doesn't emit this + // "log": false, securityGroup = models.SecurityGroupRule{ Protocol: "all", @@ -389,7 +390,7 @@ var _ = Describe("SecurityGroupRule", func() { }) It("successfully round trips through json and protobuf", func() { - jsonSerialization, err := json.Marshal(securityGroup) + jsonSerialization, err := protojson.Marshal(securityGroup.ToProto()) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(securityGroupJson)) @@ -400,7 +401,7 @@ var _ = Describe("SecurityGroupRule", func() { err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) - Expect(protoDeserialization.FromProto()).To(Equal(securityGroup)) + Expect(*protoDeserialization.FromProto()).To(Equal(securityGroup)) }) Context("when annotations are empty", func() { @@ -409,15 +410,17 @@ var _ = Describe("SecurityGroupRule", func() { "protocol": "all", "destinations": [ "0.0.0.0-9.255.255.255" - ], - "log": false + ] }` + // TODO: double-check these fields + // protojson doesn't emit this + // "log": false, securityGroup.Annotations = []string{} }) It("successfully json serializes empty arrays to nil", func() { - jsonSerialization, err := json.Marshal(securityGroup) + jsonSerialization, err := protojson.Marshal(securityGroup.ToProto()) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(securityGroupJson)) }) From 5d3cfde18e71780b20e48a8809413d31a683e624 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 17 May 2024 21:38:30 +0000 Subject: [PATCH 088/155] Add json_names for fields with underscores Regen protos --- models/actions.pb.go | 146 +++---- models/actions.proto | 14 +- models/actual_lrp.pb.go | 176 ++++---- models/actual_lrp.proto | 8 +- models/actual_lrp_requests.pb.go | 276 ++++++------ models/actual_lrp_requests.proto | 28 +- models/cached_dependency.pb.go | 24 +- models/cached_dependency.proto | 4 +- models/cells.pb.go | 49 ++- models/cells.proto | 4 +- models/certificate_properties.pb.go | 16 +- models/certificate_properties.proto | 2 +- models/check_definition.pb.go | 74 ++-- models/check_definition.proto | 14 +- models/desired_lrp.pb.go | 653 ++++++++++++++-------------- models/desired_lrp.proto | 60 +-- models/desired_lrp_requests.pb.go | 143 +++--- models/desired_lrp_requests.proto | 12 +- models/evacuation.pb.go | 190 ++++---- models/evacuation.proto | 26 +- models/events.pb.go | 315 +++++++------- models/events.proto | 28 +- models/image_layer.pb.go | 64 +-- models/image_layer.proto | 4 +- models/log_rate_limit.pb.go | 16 +- models/log_rate_limit.proto | 2 +- models/security_group.pb.go | 30 +- models/security_group.proto | 4 +- models/task.pb.go | 214 ++++----- models/task.proto | 24 +- 30 files changed, 1316 insertions(+), 1304 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index b509e6fc..00a0bc42 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -335,7 +335,7 @@ type ProtoRunAction struct { Env []*ProtoEnvironmentVariable `protobuf:"bytes,4,rep,name=env,proto3" json:"env,omitempty"` ResourceLimits *ProtoResourceLimits `protobuf:"bytes,5,opt,name=resource_limits,proto3" json:"resource_limits,omitempty"` User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` - LogSource string `protobuf:"bytes,7,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,7,opt,name=log_source,proto3" json:"log_source,omitempty"` SuppressLogOutput bool `protobuf:"varint,8,opt,name=suppress_log_output,proto3" json:"suppress_log_output,omitempty"` } @@ -435,7 +435,7 @@ type ProtoTimeoutAction struct { Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` // Deprecated: Marked as deprecated in actions.proto. DeprecatedTimeoutNs int64 `protobuf:"varint,2,opt,name=deprecated_timeout_ns,json=timeout,proto3" json:"deprecated_timeout_ns,omitempty"` - LogSource string `protobuf:"bytes,3,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,3,opt,name=log_source,proto3" json:"log_source,omitempty"` TimeoutMs int64 `protobuf:"varint,4,opt,name=timeout_ms,proto3" json:"timeout_ms,omitempty"` } @@ -509,7 +509,7 @@ type ProtoEmitProgressAction struct { StartMessage string `protobuf:"bytes,2,opt,name=start_message,proto3" json:"start_message,omitempty"` SuccessMessage string `protobuf:"bytes,3,opt,name=success_message,proto3" json:"success_message,omitempty"` FailureMessagePrefix string `protobuf:"bytes,4,opt,name=failure_message_prefix,proto3" json:"failure_message_prefix,omitempty"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` } func (x *ProtoEmitProgressAction) Reset() { @@ -585,7 +585,7 @@ type ProtoTryAction struct { unknownFields protoimpl.UnknownFields Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` } func (x *ProtoTryAction) Reset() { @@ -640,7 +640,7 @@ type ProtoParallelAction struct { unknownFields protoimpl.UnknownFields Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` } func (x *ProtoParallelAction) Reset() { @@ -695,7 +695,7 @@ type ProtoSerialAction struct { unknownFields protoimpl.UnknownFields Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` } func (x *ProtoSerialAction) Reset() { @@ -750,7 +750,7 @@ type ProtoCodependentAction struct { unknownFields protoimpl.UnknownFields Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` } func (x *ProtoCodependentAction) Reset() { @@ -922,7 +922,7 @@ var file_actions_proto_rawDesc = []byte{ 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xaa, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f, + 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xab, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x61, @@ -936,72 +936,72 @@ var file_actions_proto_rawDesc = []byte{ 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, - 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, - 0x75, 0x74, 0x70, 0x75, 0x74, 0x22, 0xac, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, - 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, 0x70, - 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, - 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, - 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, - 0x74, 0x5f, 0x6d, 0x73, 0x22, 0xed, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, - 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, - 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x75, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x0a, - 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x66, - 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, - 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x22, 0x5c, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x22, 0x63, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, - 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, - 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x61, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x75, 0x73, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, + 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, + 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x22, 0xad, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, + 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, - 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x16, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x22, 0x66, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, - 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, - 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, - 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, - 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, - 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, + 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, + 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, + 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x22, 0xee, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x24, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, + 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, + 0x36, 0x0a, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, + 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x5d, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x64, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, + 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, + 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x62, 0x0a, 0x11, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x22, 0x67, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, + 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, + 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x13, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, + 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, + 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, + 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x18, 0x01, + 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, + 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, + 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/actions.proto b/models/actions.proto index 6629d66c..02a4a4bb 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -53,14 +53,14 @@ message ProtoRunAction { repeated ProtoEnvironmentVariable env = 4; ProtoResourceLimits resource_limits = 5 [json_name = "resource_limits"]; string user = 6 [json_name = "user"]; - string log_source = 7; + string log_source = 7 [json_name = "log_source"]; bool suppress_log_output = 8 [json_name = "suppress_log_output"]; } message ProtoTimeoutAction { ProtoAction action = 1; int64 deprecated_timeout_ns = 2 [json_name = "timeout", deprecated=true]; - string log_source = 3; + string log_source = 3 [json_name = "log_source"]; int64 timeout_ms = 4 [json_name = "timeout_ms"]; } @@ -69,27 +69,27 @@ message ProtoEmitProgressAction { string start_message = 2 [json_name = "start_message"]; string success_message = 3 [json_name = "success_message"]; string failure_message_prefix = 4 [json_name = "failure_message_prefix"]; - string log_source = 5; + string log_source = 5 [json_name = "log_source"]; } message ProtoTryAction { ProtoAction action = 1; - string log_source = 2; + string log_source = 2 [json_name = "log_source"]; } message ProtoParallelAction { repeated ProtoAction actions = 1; - string log_source = 2; + string log_source = 2 [json_name = "log_source"]; } message ProtoSerialAction { repeated ProtoAction actions = 1; - string log_source = 2; + string log_source = 2 [json_name = "log_source"]; } message ProtoCodependentAction { repeated ProtoAction actions = 1; - string log_source = 2; + string log_source = 2 [json_name = "log_source"]; } message ProtoResourceLimits { diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index e8fd7137..ae44aa03 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -370,7 +370,7 @@ type ProtoActualLRPNetInfo struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` Ports []*ProtoPortMapping `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty"` - InstanceAddress string `protobuf:"bytes,3,opt,name=instance_address,json=instanceAddress,proto3" json:"instance_address,omitempty"` + InstanceAddress string `protobuf:"bytes,3,opt,name=instance_address,proto3" json:"instance_address,omitempty"` PreferredAddress ProtoActualLRPNetInfo_PreferredAddress `protobuf:"varint,4,opt,name=preferred_address,proto3,enum=models.ProtoActualLRPNetInfo_PreferredAddress" json:"preferred_address,omitempty"` } @@ -490,14 +490,14 @@ type ProtoActualLRP struct { ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` CrashCount int32 `protobuf:"varint,4,opt,name=crash_count,proto3" json:"crash_count,omitempty"` - CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` + CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,proto3" json:"crash_reason,omitempty"` State string `protobuf:"bytes,6,opt,name=state,proto3" json:"state,omitempty"` - PlacementError string `protobuf:"bytes,7,opt,name=placement_error,json=placementError,proto3" json:"placement_error,omitempty"` + PlacementError string `protobuf:"bytes,7,opt,name=placement_error,proto3" json:"placement_error,omitempty"` Since int64 `protobuf:"varint,8,opt,name=since,proto3" json:"since,omitempty"` ModificationTag *ProtoModificationTag `protobuf:"bytes,9,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` Presence ProtoActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ProtoActualLRP_Presence" json:"presence,omitempty"` ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,11,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,12,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricTags map[string]string `protobuf:"bytes,12,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Routable *bool `protobuf:"varint,13,opt,name=routable,proto3,oneof" json:"routable,omitempty"` AvailabilityZone string `protobuf:"bytes,14,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` } @@ -672,98 +672,98 @@ var file_actual_lrp_proto_rawDesc = []byte{ 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, - 0x69, 0x64, 0x22, 0xf6, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x69, 0x64, 0x22, 0xf7, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2e, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, - 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x5c, 0x0a, 0x11, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x72, 0x65, 0x66, - 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x11, 0x70, 0x72, - 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, - 0x89, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x12, 0x27, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, - 0x00, 0x1a, 0x1a, 0x82, 0x7d, 0x17, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x29, 0x0a, - 0x08, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x01, 0x1a, 0x1b, 0x82, 0x7d, 0x18, - 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, - 0x10, 0x02, 0x1a, 0x17, 0x82, 0x7d, 0x14, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, - 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x6f, 0x73, 0x74, 0x22, 0x39, 0x0a, 0x1b, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, - 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, - 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xd3, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x44, 0x0a, 0x0e, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, - 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, - 0x5d, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x51, - 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, - 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, - 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, - 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, - 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x27, 0x0a, 0x0f, - 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, - 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, + 0x52, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x12, 0x5c, 0x0a, 0x11, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, + 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x72, 0x65, + 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x11, 0x70, + 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x22, 0x89, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x27, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, + 0x10, 0x00, 0x1a, 0x1a, 0x82, 0x7d, 0x17, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x29, + 0x0a, 0x08, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x01, 0x1a, 0x1b, 0x82, 0x7d, + 0x18, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x48, 0x4f, 0x53, + 0x54, 0x10, 0x02, 0x1a, 0x17, 0x82, 0x7d, 0x14, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, + 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x6f, 0x73, 0x74, 0x22, 0x39, 0x0a, 0x1b, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, + 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, + 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xd6, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x44, 0x0a, 0x0e, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, + 0x3f, 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, + 0x12, 0x5d, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, + 0x51, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, + 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x70, - 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, - 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x0b, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, + 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, + 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, + 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, + 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x28, + 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, + 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, + 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, + 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, + 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, - 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, - 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, - 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x22, 0x5d, 0x0a, 0x08, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, - 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, 0x82, 0x7d, 0x08, 0x4f, - 0x72, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, 0x56, 0x41, 0x43, 0x55, - 0x41, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, 0x45, 0x76, 0x61, 0x63, - 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, 0x53, 0x50, 0x45, 0x43, - 0x54, 0x10, 0x02, 0x1a, 0x0a, 0x82, 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, 0x65, 0x63, 0x74, 0x42, - 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, - 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, - 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, + 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x0b, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x26, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, + 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5d, 0x0a, 0x08, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, + 0x12, 0x19, 0x0a, 0x08, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, + 0x82, 0x7d, 0x08, 0x4f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, + 0x56, 0x41, 0x43, 0x55, 0x41, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, + 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, + 0x53, 0x50, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x0a, 0x82, 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, + 0x65, 0x63, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, + 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index f58a3cb5..ba6f5f3b 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -33,7 +33,7 @@ message ProtoActualLRPInstanceKey { message ProtoActualLRPNetInfo { string address = 1 [json_name = "address"]; repeated ProtoPortMapping ports = 2 [json_name = "ports"]; - string instance_address = 3; + string instance_address = 3 [json_name = "instance_address"]; enum PreferredAddress { UNKNOWN = 0 [(bbs.bbs_enumvalue_customname) = "PreferredAddressUnknown"]; @@ -59,14 +59,14 @@ message ProtoActualLRP { ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true]; ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true]; int32 crash_count = 4 [json_name = "crash_count"]; - string crash_reason = 5; + string crash_reason = 5 [json_name = "crash_reason"]; string state = 6 [json_name = "state"]; - string placement_error = 7; + string placement_error = 7 [json_name = "placement_error"]; int64 since = 8 [json_name = "since"]; ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true]; Presence presence = 10 [json_name = "presence"]; repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 11; - map metric_tags = 12; + map metric_tags = 12 [json_name = "metric_tags"]; optional bool routable = 13 [json_name = "routable"]; string availability_zone = 14 [json_name = "availability_zone"]; } diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index c317ab7f..ae882293 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -74,7 +74,7 @@ type ProtoActualLRPGroupsResponse struct { unknownFields protoimpl.UnknownFields Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrpGroups []*ProtoActualLRPGroup `protobuf:"bytes,2,rep,name=actual_lrp_groups,json=actualLrpGroups,proto3" json:"actual_lrp_groups,omitempty"` + ActualLrpGroups []*ProtoActualLRPGroup `protobuf:"bytes,2,rep,name=actual_lrp_groups,proto3" json:"actual_lrp_groups,omitempty"` } func (x *ProtoActualLRPGroupsResponse) Reset() { @@ -130,7 +130,7 @@ type ProtoActualLRPGroupResponse struct { unknownFields protoimpl.UnknownFields Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` } func (x *ProtoActualLRPGroupResponse) Reset() { @@ -346,7 +346,7 @@ type ProtoClaimActualLRPRequest struct { ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` } func (x *ProtoClaimActualLRPRequest) Reset() { @@ -407,11 +407,11 @@ type ProtoStartActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` - ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` - ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,4,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,5,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,proto3" json:"actual_lrp_net_info,omitempty"` + ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,4,rep,name=actual_lrp_internal_routes,proto3" json:"actual_lrp_internal_routes,omitempty"` + MetricTags map[string]string `protobuf:"bytes,5,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Routable *bool `protobuf:"varint,6,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` AvailabilityZone string `protobuf:"bytes,7,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` } @@ -502,8 +502,8 @@ type ProtoCrashActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,proto3" json:"error_message,omitempty"` } @@ -565,7 +565,7 @@ type ProtoFailActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,proto3" json:"error_message,omitempty"` } @@ -620,7 +620,7 @@ type ProtoRetireActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` } func (x *ProtoRetireActualLRPRequest) Reset() { @@ -669,7 +669,7 @@ type ProtoRemoveActualLRPRequest struct { ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` } func (x *ProtoRemoveActualLRPRequest) Reset() { @@ -731,7 +731,7 @@ type ProtoActualLRPsResponse struct { unknownFields protoimpl.UnknownFields Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrps []*ProtoActualLRP `protobuf:"bytes,2,rep,name=actual_lrps,json=actualLrps,proto3" json:"actual_lrps,omitempty"` + ActualLrps []*ProtoActualLRP `protobuf:"bytes,2,rep,name=actual_lrps,proto3" json:"actual_lrps,omitempty"` } func (x *ProtoActualLRPsResponse) Reset() { @@ -863,139 +863,141 @@ var file_actual_lrp_requests_proto_rawDesc = []byte{ 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, - 0x95, 0x01, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x97, 0x01, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, - 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x47, 0x0a, 0x11, 0x61, 0x63, + 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x49, 0x0a, 0x11, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x73, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x92, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x12, 0x45, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x53, 0x0a, 0x1b, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, - 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, - 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x3a, 0x02, 0x18, - 0x01, 0x22, 0x52, 0x0a, 0x28, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, - 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x6f, 0x0a, 0x2f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x50, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x41, 0x6e, 0x64, 0x49, 0x6e, 0x64, 0x65, - 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, - 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xb0, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, - 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0xd7, 0x04, 0x0a, 0x1a, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x4b, 0x65, 0x79, 0x12, 0x4c, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, - 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x12, 0x53, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, - 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, - 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x22, 0xdd, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x72, 0x61, - 0x73, 0x68, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, - 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, + 0x75, 0x70, 0x52, 0x11, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, + 0x72, 0x6f, 0x75, 0x70, 0x73, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x1b, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x12, 0x47, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, + 0x22, 0x53, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, + 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x52, 0x0a, 0x28, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x42, 0x79, 0x50, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x6f, 0x0a, 0x2f, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x41, 0x6e, 0x64, + 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, + 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xb3, 0x01, 0x0a, 0x1a, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, + 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, - 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x22, 0x82, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, - 0x6c, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, - 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5e, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x22, 0xb1, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, - 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, + 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, + 0x22, 0xe3, 0x04, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, + 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, - 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0x7c, 0x0a, 0x17, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x12, 0x37, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x16, 0x50, + 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, + 0x4f, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, + 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x13, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, + 0x12, 0x63, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x54, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, + 0x74, 0x61, 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x52, + 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, + 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, + 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, + 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, + 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xe2, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x43, 0x72, 0x61, 0x73, 0x68, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, + 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x84, 0x01, 0x0a, 0x19, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, 0x6c, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x22, 0x60, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, + 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xb4, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5b, + 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, + 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0x7d, 0x0a, 0x17, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x12, 0x38, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index 5db4d8f6..566ea43e 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -13,13 +13,13 @@ message ProtoActualLRPLifecycleResponse { message ProtoActualLRPGroupsResponse { option deprecated = true; ProtoError error = 1; - repeated ProtoActualLRPGroup actual_lrp_groups = 2; + repeated ProtoActualLRPGroup actual_lrp_groups = 2 [json_name = "actual_lrp_groups"]; } message ProtoActualLRPGroupResponse { option deprecated = true; ProtoError error = 1; - ProtoActualLRPGroup actual_lrp_group = 2; + ProtoActualLRPGroup actual_lrp_group = 2 [json_name = "actual_lrp_group"]; } message ProtoActualLRPGroupsRequest { @@ -42,43 +42,43 @@ message ProtoActualLRPGroupByProcessGuidAndIndexRequest { message ProtoClaimActualLRPRequest { string process_guid = 1 [json_name = "process_guid"]; int32 index = 2 [json_name = "index"]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 3; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 3 [json_name = "actual_lrp_instance_key"]; } message ProtoStartActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; - ProtoActualLRPNetInfo actual_lrp_net_info = 3; - repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 4; - map metric_tags = 5; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "actual_lrp_net_info"]; + repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 4 [json_name = "actual_lrp_internal_routes"]; + map metric_tags = 5 [json_name = "metric_tags"]; optional bool Routable = 6; string availability_zone = 7 [json_name= "availability_zone"]; } message ProtoCrashActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; string error_message = 3 [json_name = "error_message"]; } message ProtoFailActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; string error_message = 2 [json_name = "error_message"]; } message ProtoRetireActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; } message ProtoRemoveActualLRPRequest { string process_guid = 1 [json_name = "process_guid"]; int32 index = 2 [json_name = "index"]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 3; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 3 [json_name = "actual_lrp_instance_key"]; } message ProtoActualLRPsResponse { ProtoError error = 1; - repeated ProtoActualLRP actual_lrps = 2; + repeated ProtoActualLRP actual_lrps = 2 [json_name = "actual_lrps"]; } message ProtoActualLRPsRequest { diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 4e1cb3c1..260771f8 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -30,8 +30,8 @@ type ProtoCachedDependency struct { To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` - ChecksumAlgorithm string `protobuf:"bytes,6,opt,name=checksum_algorithm,json=checksumAlgorithm,proto3" json:"checksum_algorithm,omitempty"` - ChecksumValue string `protobuf:"bytes,7,opt,name=checksum_value,json=checksumValue,proto3" json:"checksum_value,omitempty"` + ChecksumAlgorithm string `protobuf:"bytes,6,opt,name=checksum_algorithm,proto3" json:"checksum_algorithm,omitempty"` + ChecksumValue string `protobuf:"bytes,7,opt,name=checksum_value,proto3" json:"checksum_value,omitempty"` } func (x *ProtoCachedDependency) Reset() { @@ -120,7 +120,7 @@ var File_cached_dependency_proto protoreflect.FileDescriptor var file_cached_dependency_proto_rawDesc = []byte{ 0x0a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x22, 0xe3, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, + 0x73, 0x22, 0xe5, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, @@ -129,15 +129,15 @@ var file_cached_dependency_proto_rawDesc = []byte{ 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, - 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, - 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, - 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, + 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, + 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, + 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, + 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index 33c90c8f..a2ff4204 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -9,6 +9,6 @@ message ProtoCachedDependency { string to = 3 [json_name = "to"]; string cache_key = 4 [json_name = "cache_key"]; string log_source = 5 [json_name = "log_source"]; - string checksum_algorithm = 6; - string checksum_value = 7; + string checksum_algorithm = 6 [json_name = "checksum_algorithm"]; + string checksum_value = 7 [json_name = "checksum_value"]; } diff --git a/models/cells.pb.go b/models/cells.pb.go index ad3df8b2..21a754d7 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -93,8 +93,8 @@ type ProtoCellPresence struct { Zone string `protobuf:"bytes,3,opt,name=zone,proto3" json:"zone,omitempty"` Capacity *ProtoCellCapacity `protobuf:"bytes,4,opt,name=capacity,proto3" json:"capacity,omitempty"` RootfsProviders []*ProtoProvider `protobuf:"bytes,5,rep,name=rootfs_providers,json=rootfs_provider_list,proto3" json:"rootfs_providers,omitempty"` - PlacementTags []string `protobuf:"bytes,6,rep,name=placement_tags,json=placementTags,proto3" json:"placement_tags,omitempty"` - OptionalPlacementTags []string `protobuf:"bytes,7,rep,name=optional_placement_tags,json=optionalPlacementTags,proto3" json:"optional_placement_tags,omitempty"` + PlacementTags []string `protobuf:"bytes,6,rep,name=placement_tags,proto3" json:"placement_tags,omitempty"` + OptionalPlacementTags []string `protobuf:"bytes,7,rep,name=optional_placement_tags,proto3" json:"optional_placement_tags,omitempty"` RepUrl string `protobuf:"bytes,8,opt,name=rep_url,proto3" json:"rep_url,omitempty"` } @@ -308,7 +308,7 @@ var file_cells_proto_rawDesc = []byte{ 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x22, - 0xda, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, + 0xdd, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, @@ -322,28 +322,29 @@ var file_cells_proto_rawDesc = []byte{ 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x14, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x6c, - 0x69, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x12, 0x36, 0x0a, 0x17, 0x6f, 0x70, + 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x38, 0x0a, 0x17, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x15, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, - 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x22, 0x43, 0x0a, 0x0d, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, - 0x73, 0x22, 0x6f, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x12, 0x2f, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x05, 0x63, 0x65, 0x6c, - 0x6c, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, - 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x22, + 0x43, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, + 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2f, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x05, + 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, + 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, + 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/models/cells.proto b/models/cells.proto index 371510f4..c043e3cd 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -17,8 +17,8 @@ message ProtoCellPresence { string zone = 3 [json_name = "zone"]; ProtoCellCapacity capacity = 4; repeated ProtoProvider rootfs_providers = 5 [json_name = "rootfs_provider_list"]; - repeated string placement_tags = 6; - repeated string optional_placement_tags = 7; + repeated string placement_tags = 6 [json_name = "placement_tags"]; + repeated string optional_placement_tags = 7 [json_name = "optional_placement_tags"]; string rep_url = 8 [json_name = "rep_url"]; } diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 4b5350e7..2493c1f8 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -25,7 +25,7 @@ type ProtoCertificateProperties struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - OrganizationalUnit []string `protobuf:"bytes,1,rep,name=organizational_unit,json=organizationalUnit,proto3" json:"organizational_unit,omitempty"` + OrganizationalUnit []string `protobuf:"bytes,1,rep,name=organizational_unit,proto3" json:"organizational_unit,omitempty"` } func (x *ProtoCertificateProperties) Reset() { @@ -72,15 +72,15 @@ var File_certificate_properties_proto protoreflect.FileDescriptor var file_certificate_properties_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x4d, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x4e, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, + 0x74, 0x69, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x12, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, - 0x6c, 0x55, 0x6e, 0x69, 0x74, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, - 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x09, 0x52, 0x13, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, + 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, + 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, + 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/models/certificate_properties.proto b/models/certificate_properties.proto index 5396374a..efbbee2f 100644 --- a/models/certificate_properties.proto +++ b/models/certificate_properties.proto @@ -4,6 +4,6 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; message ProtoCertificateProperties { - repeated string organizational_unit = 1; + repeated string organizational_unit = 1 [json_name = "organizational_unit"]; } diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 501cf5d6..6faf7ec2 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -27,7 +27,7 @@ type ProtoCheckDefinition struct { Checks []*ProtoCheck `protobuf:"bytes,1,rep,name=checks,proto3" json:"checks,omitempty"` LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` - ReadinessChecks []*ProtoCheck `protobuf:"bytes,3,rep,name=readiness_checks,json=readinessChecks,proto3" json:"readiness_checks,omitempty"` + ReadinessChecks []*ProtoCheck `protobuf:"bytes,3,rep,name=readiness_checks,proto3" json:"readiness_checks,omitempty"` } func (x *ProtoCheckDefinition) Reset() { @@ -90,8 +90,8 @@ type ProtoCheck struct { // oneof is hard to use right now, instead we can do this check in validation // oneof check { - TcpCheck *ProtoTCPCheck `protobuf:"bytes,1,opt,name=tcp_check,json=tcpCheck,proto3" json:"tcp_check,omitempty"` - HttpCheck *ProtoHTTPCheck `protobuf:"bytes,2,opt,name=http_check,json=httpCheck,proto3" json:"http_check,omitempty"` // } + TcpCheck *ProtoTCPCheck `protobuf:"bytes,1,opt,name=tcp_check,proto3" json:"tcp_check,omitempty"` + HttpCheck *ProtoHTTPCheck `protobuf:"bytes,2,opt,name=http_check,proto3" json:"http_check,omitempty"` // } } func (x *ProtoCheck) Reset() { @@ -146,8 +146,8 @@ type ProtoTCPCheck struct { unknownFields protoimpl.UnknownFields Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` - ConnectTimeoutMs uint64 `protobuf:"varint,2,opt,name=connect_timeout_ms,json=connectTimeoutMs,proto3" json:"connect_timeout_ms,omitempty"` - IntervalMs uint64 `protobuf:"varint,3,opt,name=interval_ms,json=intervalMs,proto3" json:"interval_ms,omitempty"` + ConnectTimeoutMs uint64 `protobuf:"varint,2,opt,name=connect_timeout_ms,proto3" json:"connect_timeout_ms,omitempty"` + IntervalMs uint64 `protobuf:"varint,3,opt,name=interval_ms,proto3" json:"interval_ms,omitempty"` } func (x *ProtoTCPCheck) Reset() { @@ -209,9 +209,9 @@ type ProtoHTTPCheck struct { unknownFields protoimpl.UnknownFields Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` - RequestTimeoutMs uint64 `protobuf:"varint,2,opt,name=request_timeout_ms,json=requestTimeoutMs,proto3" json:"request_timeout_ms,omitempty"` + RequestTimeoutMs uint64 `protobuf:"varint,2,opt,name=request_timeout_ms,proto3" json:"request_timeout_ms,omitempty"` Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` - IntervalMs uint64 `protobuf:"varint,4,opt,name=interval_ms,json=intervalMs,proto3" json:"interval_ms,omitempty"` + IntervalMs uint64 `protobuf:"varint,4,opt,name=interval_ms,proto3" json:"interval_ms,omitempty"` } func (x *ProtoHTTPCheck) Reset() { @@ -279,43 +279,43 @@ var File_check_definition_proto protoreflect.FileDescriptor var file_check_definition_proto_rawDesc = []byte{ 0x0a, 0x16, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, + 0x22, 0xa2, 0x01, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x06, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3d, 0x0a, 0x10, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x10, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x52, 0x0f, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x73, 0x22, 0x77, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, - 0x63, 0x6b, 0x12, 0x32, 0x0a, 0x09, 0x74, 0x63, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x08, 0x74, 0x63, - 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x35, 0x0a, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, - 0x63, 0x6b, 0x52, 0x09, 0x68, 0x74, 0x74, 0x70, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x72, 0x0a, - 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, - 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, - 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, - 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, - 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x4d, - 0x73, 0x22, 0x87, 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, - 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x0a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x4d, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x63, 0x6b, 0x52, 0x10, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0x79, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x12, 0x33, 0x0a, 0x09, 0x74, 0x63, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x09, 0x74, + 0x63, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x36, 0x0a, 0x0a, 0x68, 0x74, 0x74, 0x70, + 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x52, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x22, 0x75, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, + 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, + 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, + 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, + 0x6c, 0x5f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x22, 0x8a, 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, + 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, + 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, + 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x12, + 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, + 0x74, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, + 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, + 0x6c, 0x5f, 0x6d, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, + 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, + 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/check_definition.proto b/models/check_definition.proto index a647f515..c50908a9 100644 --- a/models/check_definition.proto +++ b/models/check_definition.proto @@ -8,26 +8,26 @@ option go_package="code.cloudfoundry.org/bbs/models"; message ProtoCheckDefinition { repeated ProtoCheck checks = 1; string log_source = 2 [json_name = "log_source"]; - repeated ProtoCheck readiness_checks = 3; + repeated ProtoCheck readiness_checks = 3 [json_name = "readiness_checks"]; } message ProtoCheck { // oneof is hard to use right now, instead we can do this check in validation // oneof check { - ProtoTCPCheck tcp_check = 1; - ProtoHTTPCheck http_check = 2; + ProtoTCPCheck tcp_check = 1 [json_name = "tcp_check"]; + ProtoHTTPCheck http_check = 2 [json_name = "http_check"]; // } } message ProtoTCPCheck { uint32 port = 1 [json_name = "port"]; - uint64 connect_timeout_ms = 2; - uint64 interval_ms = 3; + uint64 connect_timeout_ms = 2 [json_name = "connect_timeout_ms"]; + uint64 interval_ms = 3 [json_name = "interval_ms"]; } message ProtoHTTPCheck { uint32 port = 1 [json_name = "port"]; - uint64 request_timeout_ms = 2; + uint64 request_timeout_ms = 2 [json_name = "request_timeout_ms"]; string path = 3 [json_name = "path"]; - uint64 interval_ms = 4; + uint64 interval_ms = 4 [json_name = "interval_ms"]; } diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 18f95c68..dcb092ec 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -25,13 +25,13 @@ type ProtoDesiredLRPSchedulingInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,json=desiredLrpKey,proto3" json:"desired_lrp_key,omitempty"` + DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,proto3" json:"desired_lrp_key,omitempty"` Annotation string `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation,omitempty"` Instances int32 `protobuf:"varint,3,opt,name=instances,proto3" json:"instances,omitempty"` - DesiredLrpResource *ProtoDesiredLRPResource `protobuf:"bytes,4,opt,name=desired_lrp_resource,json=desiredLrpResource,proto3" json:"desired_lrp_resource,omitempty"` + DesiredLrpResource *ProtoDesiredLRPResource `protobuf:"bytes,4,opt,name=desired_lrp_resource,proto3" json:"desired_lrp_resource,omitempty"` Routes *ProtoRoutes `protobuf:"bytes,5,opt,name=routes,proto3" json:"routes,omitempty"` - ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag,omitempty"` - VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,json=volumePlacement,proto3" json:"volume_placement,omitempty"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` + VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,proto3" json:"volume_placement,omitempty"` PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` } @@ -128,7 +128,7 @@ type ProtoDesiredLRPRunInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,json=desiredLrpKey,proto3" json:"desired_lrp_key,omitempty"` + DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,proto3" json:"desired_lrp_key,omitempty"` EnvironmentVariables []*ProtoEnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=env,proto3" json:"environment_variables,omitempty"` Setup *ProtoAction `protobuf:"bytes,3,opt,name=setup,proto3" json:"setup,omitempty"` Action *ProtoAction `protobuf:"bytes,4,opt,name=action,proto3" json:"action,omitempty"` @@ -138,26 +138,26 @@ type ProtoDesiredLRPRunInfo struct { Privileged bool `protobuf:"varint,7,opt,name=privileged,proto3" json:"privileged,omitempty"` CpuWeight uint32 `protobuf:"varint,8,opt,name=cpu_weight,proto3" json:"cpu_weight,omitempty"` Ports []uint32 `protobuf:"varint,9,rep,name=ports,proto3" json:"ports,omitempty"` - EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,10,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` + EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,10,rep,name=egress_rules,proto3" json:"egress_rules,omitempty"` LogSource string `protobuf:"bytes,11,opt,name=log_source,proto3" json:"log_source,omitempty"` // Deprecated: Marked as deprecated in desired_lrp.proto. MetricsGuid string `protobuf:"bytes,12,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` CreatedAt int64 `protobuf:"varint,13,opt,name=created_at,proto3" json:"created_at,omitempty"` CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,14,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` // Deprecated: Marked as deprecated in desired_lrp.proto. - LegacyDownloadUser string `protobuf:"bytes,15,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` - TrustedSystemCertificatesPath string `protobuf:"bytes,16,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,17,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` + LegacyDownloadUser string `protobuf:"bytes,15,opt,name=legacy_download_user,proto3" json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `protobuf:"bytes,16,opt,name=trusted_system_certificates_path,proto3" json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,17,rep,name=volume_mounts,proto3" json:"volume_mounts,omitempty"` Network *ProtoNetwork `protobuf:"bytes,18,opt,name=network,proto3" json:"network,omitempty"` StartTimeoutMs int64 `protobuf:"varint,19,opt,name=start_timeout_ms,proto3" json:"start_timeout_ms,omitempty"` - CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,20,opt,name=certificate_properties,json=certificateProperties,proto3,oneof" json:"certificate_properties,omitempty"` - ImageUsername string `protobuf:"bytes,21,opt,name=image_username,json=imageUsername,proto3" json:"image_username,omitempty"` - ImagePassword string `protobuf:"bytes,22,opt,name=image_password,json=imagePassword,proto3" json:"image_password,omitempty"` - CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,23,opt,name=check_definition,json=checkDefinition,proto3" json:"check_definition,omitempty"` - ImageLayers []*ProtoImageLayer `protobuf:"bytes,24,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,25,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,20,opt,name=certificate_properties,proto3,oneof" json:"certificate_properties,omitempty"` + ImageUsername string `protobuf:"bytes,21,opt,name=image_username,proto3" json:"image_username,omitempty"` + ImagePassword string `protobuf:"bytes,22,opt,name=image_password,proto3" json:"image_password,omitempty"` + CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,23,opt,name=check_definition,proto3" json:"check_definition,omitempty"` + ImageLayers []*ProtoImageLayer `protobuf:"bytes,24,rep,name=image_layers,proto3" json:"image_layers,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,25,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Sidecars []*ProtoSidecar `protobuf:"bytes,26,rep,name=sidecars,proto3" json:"sidecars,omitempty"` - LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,27,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` + LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,27,opt,name=log_rate_limit,proto3" json:"log_rate_limit,omitempty"` } func (x *ProtoDesiredLRPRunInfo) Reset() { @@ -440,7 +440,7 @@ type ProtoDesiredLRPUpdate struct { Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` Routes *ProtoRoutes `protobuf:"bytes,2,opt,name=routes,proto3,oneof" json:"routes,omitempty"` Annotation *string `protobuf:"bytes,3,opt,name=annotation,proto3,oneof" json:"annotation,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *ProtoDesiredLRPUpdate) Reset() { @@ -664,24 +664,24 @@ type ProtoDesiredLRP struct { // Deprecated: Marked as deprecated in desired_lrp.proto. MetricsGuid string `protobuf:"bytes,18,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` Annotation string `protobuf:"bytes,19,opt,name=annotation,proto3" json:"annotation,omitempty"` - EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,20,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` - ModificationTag *ProtoModificationTag `protobuf:"bytes,21,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag,omitempty"` - CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,22,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` + EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,20,rep,name=egress_rules,proto3" json:"egress_rules,omitempty"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,21,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` + CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,22,rep,name=cached_dependencies,proto3" json:"cached_dependencies,omitempty"` // Deprecated: Marked as deprecated in desired_lrp.proto. - LegacyDownloadUser string `protobuf:"bytes,23,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` - TrustedSystemCertificatesPath string `protobuf:"bytes,24,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,25,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` + LegacyDownloadUser string `protobuf:"bytes,23,opt,name=legacy_download_user,proto3" json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `protobuf:"bytes,24,opt,name=trusted_system_certificates_path,proto3" json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,25,rep,name=volume_mounts,proto3" json:"volume_mounts,omitempty"` Network *ProtoNetwork `protobuf:"bytes,26,opt,name=network,proto3" json:"network,omitempty"` PlacementTags []string `protobuf:"bytes,28,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` MaxPids int32 `protobuf:"varint,29,opt,name=max_pids,proto3" json:"max_pids,omitempty"` - CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,30,opt,name=certificate_properties,json=certificateProperties,proto3,oneof" json:"certificate_properties,omitempty"` - ImageUsername string `protobuf:"bytes,31,opt,name=image_username,json=imageUsername,proto3" json:"image_username,omitempty"` - ImagePassword string `protobuf:"bytes,32,opt,name=image_password,json=imagePassword,proto3" json:"image_password,omitempty"` - CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,33,opt,name=check_definition,json=checkDefinition,proto3" json:"check_definition,omitempty"` - ImageLayers []*ProtoImageLayer `protobuf:"bytes,34,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,35,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,30,opt,name=certificate_properties,proto3,oneof" json:"certificate_properties,omitempty"` + ImageUsername string `protobuf:"bytes,31,opt,name=image_username,proto3" json:"image_username,omitempty"` + ImagePassword string `protobuf:"bytes,32,opt,name=image_password,proto3" json:"image_password,omitempty"` + CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,33,opt,name=check_definition,proto3" json:"check_definition,omitempty"` + ImageLayers []*ProtoImageLayer `protobuf:"bytes,34,rep,name=image_layers,proto3" json:"image_layers,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,35,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Sidecars []*ProtoSidecar `protobuf:"bytes,36,rep,name=sidecars,proto3" json:"sidecars,omitempty"` - LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,37,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` + LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,37,opt,name=log_rate_limit,proto3" json:"log_rate_limit,omitempty"` } func (x *ProtoDesiredLRP) Reset() { @@ -1000,309 +1000,312 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xee, 0x03, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf4, 0x03, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x47, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x49, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, - 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x12, 0x64, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, - 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x12, 0x4c, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x47, - 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, 0x61, - 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, - 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, - 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x22, 0xcc, - 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x47, 0x0a, 0x0f, 0x64, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, - 0x90, 0x3f, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x4b, - 0x65, 0x79, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, - 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, - 0x62, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, - 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, - 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, - 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, - 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, - 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x46, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, - 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, - 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, - 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1e, 0x0a, - 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x26, 0x0a, - 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, - 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, - 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, - 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x0f, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, - 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, - 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, - 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, - 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, - 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, - 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, - 0x5e, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, - 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, 0x0a, - 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, - 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, - 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, - 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, - 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, - 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, - 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, - 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, - 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, - 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, - 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0xea, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, - 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, - 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4e, 0x0a, 0x0b, 0x6d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, - 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, - 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, - 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, 0x01, 0x0a, - 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, - 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, - 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, - 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, - 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, - 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, - 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x88, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, - 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1c, - 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x15, - 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, - 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, - 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, - 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, - 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, - 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, - 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, - 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, - 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, - 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, - 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, - 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, - 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, - 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, - 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, - 0x75, 0x6c, 0x65, 0x73, 0x12, 0x47, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, + 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x64, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x12, 0x4d, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x0f, 0x6d, 0x6f, - 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x4e, 0x0a, - 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, - 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, - 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, - 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, - 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, - 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, - 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, - 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, - 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5e, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, + 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x74, 0x61, 0x67, 0x12, 0x48, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, + 0x6d, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x76, 0x6f, 0x6c, + 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, + 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x74, 0x61, 0x67, 0x73, 0x22, 0xdd, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, + 0x49, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, + 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, + 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, + 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, + 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, + 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, + 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, + 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, + 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, + 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, + 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, + 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x47, 0x0a, + 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x75, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, + 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, + 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, + 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, + 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, + 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, + 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, + 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, + 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, + 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, + 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, + 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x48, 0x01, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, - 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x47, 0x0a, 0x10, - 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, - 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, - 0x61, 0x79, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, - 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, - 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, - 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, - 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x3f, 0x0a, - 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, - 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, - 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, - 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, + 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, + 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, + 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, + 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, + 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, + 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, + 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, + 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, + 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, + 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xeb, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, + 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, + 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, + 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, + 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, + 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, + 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, + 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, + 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x99, 0x0f, + 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, + 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, + 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, + 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, + 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, + 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, + 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, + 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, + 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, + 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, + 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, + 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, + 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, + 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, + 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, + 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, + 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, + 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, + 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, + 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, + 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x48, 0x0a, + 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, + 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, + 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, + 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, + 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, + 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, + 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, + 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, + 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, + 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, + 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, + 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, + 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, + 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, + 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, + 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, + 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, + 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, + 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, + 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, + 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, + 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, + 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, + 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 6fafe54d..ceb8d67a 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -19,21 +19,21 @@ import "sidecar.proto"; import "log_rate_limit.proto"; message ProtoDesiredLRPSchedulingInfo { - ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true]; + ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_key"]; string annotation = 2 [json_name = "annotation"]; int32 instances = 3 [json_name = "instances"]; - ProtoDesiredLRPResource desired_lrp_resource = 4 [(bbs.bbs_by_value) = true]; + ProtoDesiredLRPResource desired_lrp_resource = 4 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_resource"]; ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; - ProtoModificationTag modification_tag = 6 [(bbs.bbs_by_value) = true]; - ProtoVolumePlacement volume_placement = 7; + ProtoModificationTag modification_tag = 6 [(bbs.bbs_by_value) = true, json_name = "modification_tag"]; + ProtoVolumePlacement volume_placement = 7 [json_name = "volume_placement"]; repeated string PlacementTags = 8 [json_name ="placement_tags"]; } message ProtoDesiredLRPRunInfo { - ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true]; + ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_key"]; repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env", (bbs.bbs_by_value) = false]; ProtoAction setup = 3; @@ -46,31 +46,31 @@ message ProtoDesiredLRPRunInfo { uint32 cpu_weight = 8 [json_name = "cpu_weight"]; repeated uint32 ports = 9 [packed = false]; - repeated ProtoSecurityGroupRule egress_rules = 10 [(bbs.bbs_by_value) = false]; + repeated ProtoSecurityGroupRule egress_rules = 10 [(bbs.bbs_by_value) = false, json_name = "egress_rules"]; string log_source = 11 [json_name = "log_source"]; string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid"]; int64 created_at = 13 [json_name = "created_at"]; repeated ProtoCachedDependency cached_dependencies = 14; - string legacy_download_user = 15 [deprecated=true]; - string trusted_system_certificates_path = 16; - repeated ProtoVolumeMount volume_mounts = 17; + string legacy_download_user = 15 [deprecated=true, json_name = "legacy_download_user"]; + string trusted_system_certificates_path = 16 [json_name = "trusted_system_certificates_path"]; + repeated ProtoVolumeMount volume_mounts = 17 [json_name = "volume_mounts"]; ProtoNetwork network = 18; int64 start_timeout_ms = 19 [json_name = "start_timeout_ms"]; - optional ProtoCertificateProperties certificate_properties = 20; + optional ProtoCertificateProperties certificate_properties = 20 [json_name = "certificate_properties"]; - string image_username = 21; - string image_password = 22; + string image_username = 21 [json_name = "image_username"]; + string image_password = 22 [json_name = "image_password"]; - ProtoCheckDefinition check_definition = 23; + ProtoCheckDefinition check_definition = 23 [json_name = "check_definition"]; - repeated ProtoImageLayer image_layers = 24; + repeated ProtoImageLayer image_layers = 24 [json_name = "image_layers"]; - map metric_tags = 25 [deprecated=true]; + map metric_tags = 25 [json_name = "metric_tags", deprecated=true]]; repeated ProtoSidecar sidecars = 26; - ProtoLogRateLimit log_rate_limit = 27; + ProtoLogRateLimit log_rate_limit = 27 [json_name = "log_rate_limit"]; } // helper message for marshalling routes @@ -82,7 +82,7 @@ message ProtoDesiredLRPUpdate { optional int32 instances = 1; optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; optional string annotation = 3; - map metric_tags = 4; + map metric_tags = 4 [json_name = "metric_tags"]; } message ProtoDesiredLRPKey { @@ -121,27 +121,27 @@ message ProtoDesiredLRP { string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; string annotation = 19 [json_name = "annotation"]; - repeated ProtoSecurityGroupRule egress_rules = 20; - ProtoModificationTag modification_tag = 21; - repeated ProtoCachedDependency cached_dependencies = 22; - string legacy_download_user = 23 [deprecated=true]; - string trusted_system_certificates_path = 24; - repeated ProtoVolumeMount volume_mounts = 25; + repeated ProtoSecurityGroupRule egress_rules = 20 [json_name = "egress_rules"]; + ProtoModificationTag modification_tag = 21 [json_name = "modification_tag"]; + repeated ProtoCachedDependency cached_dependencies = 22 [json_name = "cached_dependencies"]; + string legacy_download_user = 23 [deprecated=true, json_name = "legacy_download_user"]; + string trusted_system_certificates_path = 24 [json_name = "trusted_system_certificates_path"]; + repeated ProtoVolumeMount volume_mounts = 25 [json_name = "volume_mounts"]; ProtoNetwork network = 26; repeated string PlacementTags = 28 [json_name ="placement_tags"]; int32 max_pids = 29 [json_name = "max_pids"]; - optional ProtoCertificateProperties certificate_properties = 30; + optional ProtoCertificateProperties certificate_properties = 30 [json_name = "certificate_properties"]; - string image_username = 31; - string image_password = 32; + string image_username = 31 [json_name = "image_username"]; + string image_password = 32 [json_name = "image_password"]; - ProtoCheckDefinition check_definition = 33; + ProtoCheckDefinition check_definition = 33 [json_name = "check_definition"]; - repeated ProtoImageLayer image_layers = 34; + repeated ProtoImageLayer image_layers = 34 [json_name = "image_layers"]; - map metric_tags = 35; + map metric_tags = 35 [json_name = "metric_tags"]; repeated ProtoSidecar sidecars = 36; - ProtoLogRateLimit log_rate_limit = 37; + ProtoLogRateLimit log_rate_limit = 37 [json_name = "log_rate_limit"]; } diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 4fd7f88d..f8fd03ba 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -73,7 +73,7 @@ type ProtoDesiredLRPsResponse struct { unknownFields protoimpl.UnknownFields Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrps []*ProtoDesiredLRP `protobuf:"bytes,2,rep,name=desired_lrps,json=desiredLrps,proto3" json:"desired_lrps,omitempty"` + DesiredLrps []*ProtoDesiredLRP `protobuf:"bytes,2,rep,name=desired_lrps,proto3" json:"desired_lrps,omitempty"` } func (x *ProtoDesiredLRPsResponse) Reset() { @@ -128,7 +128,7 @@ type ProtoDesiredLRPsRequest struct { unknownFields protoimpl.UnknownFields Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` - ProcessGuids []string `protobuf:"bytes,2,rep,name=process_guids,json=processGuids,proto3" json:"process_guids,omitempty"` + ProcessGuids []string `protobuf:"bytes,2,rep,name=process_guids,proto3" json:"process_guids,omitempty"` } func (x *ProtoDesiredLRPsRequest) Reset() { @@ -183,7 +183,7 @@ type ProtoDesiredLRPResponse struct { unknownFields protoimpl.UnknownFields Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` } func (x *ProtoDesiredLRPResponse) Reset() { @@ -238,7 +238,7 @@ type ProtoDesiredLRPSchedulingInfosResponse struct { unknownFields protoimpl.UnknownFields Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrpSchedulingInfos []*ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,rep,name=desired_lrp_scheduling_infos,json=desiredLrpSchedulingInfos,proto3" json:"desired_lrp_scheduling_infos,omitempty"` + DesiredLrpSchedulingInfos []*ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,rep,name=desired_lrp_scheduling_infos,proto3" json:"desired_lrp_scheduling_infos,omitempty"` } func (x *ProtoDesiredLRPSchedulingInfosResponse) Reset() { @@ -293,7 +293,7 @@ type ProtoDesiredLRPSchedulingInfoByProcessGuidResponse struct { unknownFields protoimpl.UnknownFields Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrpSchedulingInfo *ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,opt,name=desired_lrp_scheduling_info,json=desiredLrpSchedulingInfo,proto3" json:"desired_lrp_scheduling_info,omitempty"` + DesiredLrpSchedulingInfo *ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,opt,name=desired_lrp_scheduling_info,proto3" json:"desired_lrp_scheduling_info,omitempty"` } func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) Reset() { @@ -394,7 +394,7 @@ type ProtoDesireLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` } func (x *ProtoDesireLRPRequest) Reset() { @@ -550,77 +550,78 @@ var file_desired_lrp_requests_proto_rawDesc = []byte{ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x22, 0x80, 0x01, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x6f, 0x72, 0x22, 0x81, 0x01, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, - 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x3a, 0x0a, 0x0c, 0x64, 0x65, 0x73, + 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x3b, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x4c, 0x72, 0x70, 0x73, 0x22, 0x56, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x73, 0x22, 0x7d, 0x0a, - 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, - 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x22, 0xba, 0x01, 0x0a, - 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x12, 0x66, 0x0a, 0x1c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x19, - 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, - 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x22, 0xc4, 0x01, 0x0a, 0x32, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, - 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x50, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, - 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x64, 0x0a, 0x1b, 0x64, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, - 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x25, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, - 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x18, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x72, 0x70, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, - 0x22, 0x49, 0x0a, 0x23, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, - 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, - 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x22, + 0x7e, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, + 0x6c, 0x72, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, 0x70, 0x22, 0x79, - 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, - 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, - 0x69, 0x64, 0x12, 0x35, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x42, 0x0a, 0x1c, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, - 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, - 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x22, + 0xbd, 0x01, 0x0a, 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, + 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x12, 0x69, 0x0a, 0x1c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, + 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, + 0x6f, 0x52, 0x1c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x73, + 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x22, + 0xc7, 0x01, 0x0a, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, + 0x6f, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x12, 0x67, 0x0a, 0x1b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, + 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x1b, 0x64, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, + 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x49, 0x0a, 0x23, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x42, 0x79, 0x50, 0x72, + 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x39, 0x0a, + 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x22, 0x79, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, + 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x06, + 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x22, 0x42, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, + 0x76, 0x65, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/models/desired_lrp_requests.proto b/models/desired_lrp_requests.proto index 8f462134..dea13c88 100644 --- a/models/desired_lrp_requests.proto +++ b/models/desired_lrp_requests.proto @@ -12,27 +12,27 @@ message ProtoDesiredLRPLifecycleResponse { message ProtoDesiredLRPsResponse { ProtoError error = 1; - repeated ProtoDesiredLRP desired_lrps = 2; + repeated ProtoDesiredLRP desired_lrps = 2 [json_name = "desired_lrps"]; } message ProtoDesiredLRPsRequest { string domain = 1 [json_name = "domain"]; - repeated string process_guids = 2; + repeated string process_guids = 2 [json_name = "process_guids"]; } message ProtoDesiredLRPResponse { ProtoError error = 1; - ProtoDesiredLRP desired_lrp = 2; + ProtoDesiredLRP desired_lrp = 2 [json_name = "desired_lrp"]; } message ProtoDesiredLRPSchedulingInfosResponse { ProtoError error = 1; - repeated ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_infos = 2; + repeated ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_infos = 2 [json_name = "desired_lrp_scheduling_infos"]; } message ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { ProtoError error = 1; - ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_info = 2; + ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_info = 2 [json_name = "desired_lrp_scheduling_info"]; } message ProtoDesiredLRPByProcessGuidRequest { @@ -40,7 +40,7 @@ message ProtoDesiredLRPByProcessGuidRequest { } message ProtoDesireLRPRequest { - ProtoDesiredLRP desired_lrp = 1; + ProtoDesiredLRP desired_lrp = 1 [json_name = "desired_lrp"]; } message ProtoUpdateDesiredLRPRequest { diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 008ff76a..6328658a 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -80,8 +80,8 @@ type ProtoEvacuateClaimedActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` } func (x *ProtoEvacuateClaimedActualLRPRequest) Reset() { @@ -135,11 +135,11 @@ type ProtoEvacuateRunningActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` - ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` - ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,5,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,6,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,proto3" json:"actual_lrp_net_info,omitempty"` + ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,5,rep,name=actual_lrp_internal_routes,proto3" json:"actual_lrp_internal_routes,omitempty"` + MetricTags map[string]string `protobuf:"bytes,6,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Routable *bool `protobuf:"varint,7,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` AvailabilityZone string `protobuf:"bytes,8,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` } @@ -230,8 +230,8 @@ type ProtoEvacuateStoppedActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` } func (x *ProtoEvacuateStoppedActualLRPRequest) Reset() { @@ -285,8 +285,8 @@ type ProtoEvacuateCrashedActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,proto3" json:"error_message,omitempty"` } @@ -348,8 +348,8 @@ type ProtoRemoveEvacuatingActualLRPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` } func (x *ProtoRemoveEvacuatingActualLRPRequest) Reset() { @@ -458,97 +458,99 @@ var file_evacuation_proto_rawDesc = []byte{ 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x26, 0x0a, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x22, 0xc1, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x22, 0xc6, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, + 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, - 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, - 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x22, 0xf1, 0x04, 0x0a, 0x24, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, - 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, - 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x4c, - 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, - 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x60, 0x0a, 0x1a, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, - 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x5d, + 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, + 0xfd, 0x04, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, + 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, + 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x4f, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x63, 0x0a, 0x1a, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x5e, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, - 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, - 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, - 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, - 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, - 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, - 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0xc1, - 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, - 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, + 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, + 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, + 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, + 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, + 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, + 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, + 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, + 0xc6, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, + 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, + 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xec, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, + 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, - 0x65, 0x79, 0x22, 0xe7, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, - 0x75, 0x61, 0x74, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, - 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xc2, 0x01, 0x0a, - 0x25, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, - 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x58, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, - 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x14, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, + 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, + 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xc7, 0x01, 0x0a, 0x25, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, + 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0x52, 0x0a, 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, diff --git a/models/evacuation.proto b/models/evacuation.proto index 8f3eb3ec..88477cbc 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -12,36 +12,36 @@ message ProtoEvacuationResponse { } message ProtoEvacuateClaimedActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; } message ProtoEvacuateRunningActualLRPRequest { reserved 4; // previously removed ttl value - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; - ProtoActualLRPNetInfo actual_lrp_net_info = 3; - repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 5; - map metric_tags = 6; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "actual_lrp_net_info"]; + repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 5 [json_name = "actual_lrp_internal_routes"]; + map metric_tags = 6 [json_name = "metric_tags"]; optional bool Routable = 7; string availability_zone = 8 [json_name = "availability_zone"]; } message ProtoEvacuateStoppedActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; } message ProtoEvacuateCrashedActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; string error_message = 3 [json_name = "error_message"]; } message ProtoRemoveEvacuatingActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; } message ProtoRemoveEvacuatingActualLRPResponse { diff --git a/models/events.pb.go b/models/events.pb.go index 96f32696..84eaf104 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -26,7 +26,7 @@ type ProtoActualLRPCreatedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` } func (x *ProtoActualLRPCreatedEvent) Reset() { @@ -130,7 +130,7 @@ type ProtoActualLRPRemovedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,json=actualLrpGroup,proto3" json:"actual_lrp_group,omitempty"` + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` } func (x *ProtoActualLRPRemovedEvent) Reset() { @@ -177,7 +177,7 @@ type ProtoActualLRPInstanceCreatedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,json=actualLrp,proto3" json:"actual_lrp,omitempty"` + ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,proto3" json:"actual_lrp,omitempty"` TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` } @@ -232,11 +232,11 @@ type ProtoActualLRPInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` + ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,proto3" json:"actual_lrp_net_info,omitempty"` CrashCount int32 `protobuf:"varint,4,opt,name=crash_count,proto3" json:"crash_count,omitempty"` - CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` + CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,proto3" json:"crash_reason,omitempty"` State string `protobuf:"bytes,6,opt,name=state,proto3" json:"state,omitempty"` - PlacementError string `protobuf:"bytes,7,opt,name=placement_error,json=placementError,proto3" json:"placement_error,omitempty"` + PlacementError string `protobuf:"bytes,7,opt,name=placement_error,proto3" json:"placement_error,omitempty"` Since int64 `protobuf:"varint,8,opt,name=since,proto3" json:"since,omitempty"` ModificationTag *ProtoModificationTag `protobuf:"bytes,9,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` Presence ProtoActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ProtoActualLRP_Presence" json:"presence,omitempty"` @@ -351,8 +351,8 @@ type ProtoActualLRPInstanceChangedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` Before *ProtoActualLRPInfo `protobuf:"bytes,3,opt,name=before,proto3" json:"before,omitempty"` After *ProtoActualLRPInfo `protobuf:"bytes,4,opt,name=after,proto3" json:"after,omitempty"` TraceId string `protobuf:"bytes,5,opt,name=trace_id,proto3" json:"trace_id,omitempty"` @@ -430,7 +430,7 @@ type ProtoActualLRPInstanceRemovedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,json=actualLrp,proto3" json:"actual_lrp,omitempty"` + ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,proto3" json:"actual_lrp,omitempty"` TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` } @@ -485,7 +485,7 @@ type ProtoDesiredLRPCreatedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` } @@ -603,7 +603,7 @@ type ProtoDesiredLRPRemovedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,json=desiredLrp,proto3" json:"desired_lrp,omitempty"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` } @@ -658,10 +658,10 @@ type ProtoActualLRPCrashedEvent struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` - ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` CrashCount int32 `protobuf:"varint,3,opt,name=crash_count,proto3" json:"crash_count,omitempty"` - CrashReason string `protobuf:"bytes,4,opt,name=crash_reason,json=crashReason,proto3" json:"crash_reason,omitempty"` + CrashReason string `protobuf:"bytes,4,opt,name=crash_reason,proto3" json:"crash_reason,omitempty"` Since int64 `protobuf:"varint,5,opt,name=since,proto3" json:"since,omitempty"` } @@ -937,159 +937,160 @@ var file_events_proto_rawDesc = []byte{ 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x1a, 0x50, 0x72, + 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x69, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, + 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x47, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x3a, - 0x02, 0x18, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x67, - 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x10, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x77, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x35, 0x0a, - 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x09, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, - 0x22, 0xee, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x51, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, - 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, - 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, - 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, - 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, - 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, - 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, - 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, - 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x74, 0x61, 0x67, 0x12, 0x40, 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, - 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x08, 0x70, 0x72, 0x65, - 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, - 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0xcb, 0x02, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x44, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, - 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x5d, - 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, - 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, - 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, - 0x65, 0x12, 0x30, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, - 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, - 0x77, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x66, 0x74, + 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x3a, 0x02, 0x18, 0x01, + 0x22, 0x69, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x47, + 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x78, 0x0a, 0x22, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0xf3, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x54, 0x0a, 0x13, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, + 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x52, 0x09, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, + 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x13, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, + 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, + 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x28, + 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, + 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, + 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x40, 0x0a, + 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, + 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, + 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, + 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, + 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x0b, + 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xd0, 0x02, 0x0a, 0x22, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x12, 0x46, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x60, 0x0a, 0x17, 0x61, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, + 0x90, 0x3f, 0x01, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, + 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, + 0x12, 0x30, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, + 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x78, + 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x52, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, + 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x74, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x72, - 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, 0x01, - 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, - 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, - 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, - 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x73, 0x0a, 0x1b, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, - 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x9c, - 0x02, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x44, 0x0a, - 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, - 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, - 0x4b, 0x65, 0x79, 0x12, 0x5d, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, - 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, - 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, - 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x2f, 0x0a, - 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, 0x65, - 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x3e, - 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x6b, - 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, - 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, + 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, + 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, + 0x2d, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, + 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x74, 0x0a, 0x1b, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, + 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, + 0x22, 0xa2, 0x02, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, + 0x46, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, + 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x60, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, + 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, + 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, + 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, + 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, + 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x2f, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, + 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, + 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, + 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, + 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, + 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x6b, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, + 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, + 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, + 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, + 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, + 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, + 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, + 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, + 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, + 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, + 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/events.proto b/models/events.proto index bd4e5375..36937b31 100644 --- a/models/events.proto +++ b/models/events.proto @@ -11,7 +11,7 @@ import "modification_tag.proto"; message ProtoActualLRPCreatedEvent { option deprecated = true; - ProtoActualLRPGroup actual_lrp_group = 1; + ProtoActualLRPGroup actual_lrp_group = 1 [json_name = "actual_lrp_group"]; } message ProtoActualLRPChangedEvent { @@ -22,20 +22,20 @@ message ProtoActualLRPChangedEvent { message ProtoActualLRPRemovedEvent { option deprecated = true; - ProtoActualLRPGroup actual_lrp_group = 1; + ProtoActualLRPGroup actual_lrp_group = 1 [json_name = "actual_lrp_group"]; } message ProtoActualLRPInstanceCreatedEvent { - ProtoActualLRP actual_lrp = 1; + ProtoActualLRP actual_lrp = 1 [json_name = "actual_lrp"]; string trace_id = 2 [json_name = "trace_id"]; } message ProtoActualLRPInfo { - ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true]; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_net_info"]; int32 crash_count = 4 [json_name = "crash_count"]; - string crash_reason = 5; + string crash_reason = 5 [json_name = "crash_reason"]; string state = 6 [json_name = "state"]; - string placement_error = 7; + string placement_error = 7 [json_name = "placement_error"]; int64 since = 8 [json_name = "since"]; ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true]; ProtoActualLRP.Presence presence = 10 [json_name = "presence", (bbs.bbs_by_value) = true]; @@ -44,20 +44,20 @@ message ProtoActualLRPInfo { } message ProtoActualLRPInstanceChangedEvent { - ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true]; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_instance_key"]; ProtoActualLRPInfo before = 3; ProtoActualLRPInfo after = 4; string trace_id = 5 [json_name = "trace_id"]; } message ProtoActualLRPInstanceRemovedEvent { - ProtoActualLRP actual_lrp = 1; + ProtoActualLRP actual_lrp = 1 [json_name = "actual_lrp"]; string trace_id = 2 [json_name = "trace_id"]; } message ProtoDesiredLRPCreatedEvent { - ProtoDesiredLRP desired_lrp = 1; + ProtoDesiredLRP desired_lrp = 1 [json_name = "desired_lrp"]; string trace_id = 2 [json_name = "trace_id"]; } @@ -68,15 +68,15 @@ message ProtoDesiredLRPChangedEvent { } message ProtoDesiredLRPRemovedEvent { - ProtoDesiredLRP desired_lrp = 1; + ProtoDesiredLRP desired_lrp = 1 [json_name = "desired_lrp"]; string trace_id = 2 [json_name = "trace_id"]; } message ProtoActualLRPCrashedEvent { - ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true]; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_instance_key"]; int32 crash_count = 3 [json_name = "crash_count"]; - string crash_reason = 4; + string crash_reason = 4 [json_name = "crash_reason"]; int64 since = 5 [json_name = "since"]; } diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index e58053d3..29759761 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -181,8 +181,8 @@ type ProtoImageLayer struct { DestinationPath string `protobuf:"bytes,3,opt,name=destination_path,proto3" json:"destination_path,omitempty"` LayerType ProtoImageLayer_Type `protobuf:"varint,4,opt,name=layer_type,proto3,enum=models.ProtoImageLayer_Type" json:"layer_type,omitempty"` MediaType ProtoImageLayer_MediaType `protobuf:"varint,5,opt,name=media_type,proto3,enum=models.ProtoImageLayer_MediaType" json:"media_type,omitempty"` - DigestAlgorithm ProtoImageLayer_DigestAlgorithm `protobuf:"varint,6,opt,name=digest_algorithm,json=digestAlgorithm,proto3,enum=models.ProtoImageLayer_DigestAlgorithm" json:"digest_algorithm,omitempty"` - DigestValue string `protobuf:"bytes,7,opt,name=digest_value,json=digestValue,proto3" json:"digest_value,omitempty"` + DigestAlgorithm ProtoImageLayer_DigestAlgorithm `protobuf:"varint,6,opt,name=digest_algorithm,proto3,enum=models.ProtoImageLayer_DigestAlgorithm" json:"digest_algorithm,omitempty"` + DigestValue string `protobuf:"bytes,7,opt,name=digest_value,proto3" json:"digest_value,omitempty"` } func (x *ProtoImageLayer) Reset() { @@ -271,7 +271,7 @@ var File_image_layer_proto protoreflect.FileDescriptor var file_image_layer_proto_rawDesc = []byte{ 0x0a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xad, 0x05, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaf, 0x05, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, @@ -285,39 +285,39 @@ var file_image_layer_proto_rawDesc = []byte{ 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, - 0x65, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x52, 0x0a, + 0x65, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x53, 0x0a, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, - 0x52, 0x0f, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, - 0x6d, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7b, 0x0a, 0x0f, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, - 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x16, 0x44, 0x69, 0x67, 0x65, 0x73, - 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, - 0x64, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x01, 0x1a, - 0x18, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, - 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x26, 0x0a, 0x06, 0x53, 0x48, 0x41, - 0x35, 0x31, 0x32, 0x10, 0x02, 0x1a, 0x1a, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x35, 0x31, 0x32, 0x08, - 0x01, 0x22, 0x6f, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, - 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, - 0x69, 0x64, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x47, 0x5a, 0x10, 0x01, 0x1a, 0x0f, 0x82, - 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x67, 0x7a, 0x12, 0x18, - 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, - 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x03, 0x5a, 0x49, 0x50, 0x10, - 0x03, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x5a, - 0x69, 0x70, 0x22, 0x62, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x61, - 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, - 0x12, 0x1e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x10, 0x01, 0x1a, 0x12, 0x82, 0x7d, - 0x0f, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, - 0x12, 0x24, 0x0a, 0x09, 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, 0x49, 0x56, 0x45, 0x10, 0x02, 0x1a, - 0x15, 0x82, 0x7d, 0x12, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x45, 0x78, 0x63, - 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, - 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, - 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x52, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, + 0x68, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7b, 0x0a, 0x0f, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, + 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x16, 0x44, 0x69, 0x67, + 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x49, 0x6e, 0x76, 0x61, + 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, + 0x01, 0x1a, 0x18, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, + 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x26, 0x0a, 0x06, 0x53, + 0x48, 0x41, 0x35, 0x31, 0x32, 0x10, 0x02, 0x1a, 0x1a, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, + 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x35, 0x31, + 0x32, 0x08, 0x01, 0x22, 0x6f, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x47, 0x5a, 0x10, 0x01, 0x1a, + 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x67, 0x7a, + 0x12, 0x18, 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, + 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x03, 0x5a, 0x49, + 0x50, 0x10, 0x03, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, + 0x65, 0x5a, 0x69, 0x70, 0x22, 0x62, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, + 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, + 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x10, 0x01, 0x1a, 0x12, + 0x82, 0x7d, 0x0f, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x53, 0x68, 0x61, 0x72, + 0x65, 0x64, 0x12, 0x24, 0x0a, 0x09, 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, 0x49, 0x56, 0x45, 0x10, + 0x02, 0x1a, 0x15, 0x82, 0x7d, 0x12, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x45, + 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, + 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/image_layer.proto b/models/image_layer.proto index c6b06e80..33d8b996 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -30,6 +30,6 @@ message ProtoImageLayer { string destination_path = 3 [json_name = "destination_path"]; Type layer_type = 4 [json_name = "layer_type"]; MediaType media_type = 5 [json_name = "media_type"]; - DigestAlgorithm digest_algorithm = 6; - string digest_value = 7; + DigestAlgorithm digest_algorithm = 6 [json_name = "digest_algorithm"]; + string digest_value = 7 [json_name = "digest_value"]; } diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index 7259230c..de6e1869 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -25,7 +25,7 @@ type ProtoLogRateLimit struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BytesPerSecond int64 `protobuf:"varint,1,opt,name=bytes_per_second,json=bytesPerSecond,proto3" json:"bytes_per_second,omitempty"` + BytesPerSecond int64 `protobuf:"varint,1,opt,name=bytes_per_second,proto3" json:"bytes_per_second,omitempty"` } func (x *ProtoLogRateLimit) Reset() { @@ -71,14 +71,14 @@ var File_log_rate_limit_proto protoreflect.FileDescriptor var file_log_rate_limit_proto_rawDesc = []byte{ 0x0a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x3d, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x3f, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, - 0x6d, 0x69, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, - 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x62, - 0x79, 0x74, 0x65, 0x73, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x42, 0x22, 0x5a, - 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, - 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x69, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, + 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x62, + 0x79, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x42, + 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, + 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/log_rate_limit.proto b/models/log_rate_limit.proto index 08dc0637..1167f1f1 100644 --- a/models/log_rate_limit.proto +++ b/models/log_rate_limit.proto @@ -4,5 +4,5 @@ package models; option go_package="code.cloudfoundry.org/bbs/models"; message ProtoLogRateLimit { - int64 bytes_per_second = 1; + int64 bytes_per_second = 1 [json_name = "bytes_per_second"]; } diff --git a/models/security_group.pb.go b/models/security_group.pb.go index c6c3c079..9cba9c3b 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -138,8 +138,8 @@ type ProtoSecurityGroupRule struct { Protocol string `protobuf:"bytes,1,opt,name=protocol,proto3" json:"protocol,omitempty"` Destinations []string `protobuf:"bytes,2,rep,name=destinations,proto3" json:"destinations,omitempty"` Ports []uint32 `protobuf:"varint,3,rep,name=ports,proto3" json:"ports,omitempty"` - PortRange *ProtoPortRange `protobuf:"bytes,4,opt,name=port_range,json=portRange,proto3" json:"port_range,omitempty"` - IcmpInfo *ProtoICMPInfo `protobuf:"bytes,5,opt,name=icmp_info,json=icmpInfo,proto3" json:"icmp_info,omitempty"` + PortRange *ProtoPortRange `protobuf:"bytes,4,opt,name=port_range,proto3" json:"port_range,omitempty"` + IcmpInfo *ProtoICMPInfo `protobuf:"bytes,5,opt,name=icmp_info,proto3" json:"icmp_info,omitempty"` Log bool `protobuf:"varint,6,opt,name=log,proto3" json:"log,omitempty"` Annotations []string `protobuf:"bytes,7,rep,name=annotations,proto3" json:"annotations,omitempty"` } @@ -237,27 +237,27 @@ var file_security_group_proto_rawDesc = []byte{ 0x6f, 0x49, 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x22, 0x91, 0x02, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, + 0x65, 0x22, 0x93, 0x02, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, - 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, + 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x36, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, - 0x67, 0x65, 0x52, 0x09, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x32, 0x0a, - 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, - 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x69, 0x63, 0x6d, 0x70, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, - 0x6c, 0x6f, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, - 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x67, 0x65, 0x52, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x33, + 0x0a, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x49, 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, + 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/models/security_group.proto b/models/security_group.proto index e4da27fa..8f7de56c 100644 --- a/models/security_group.proto +++ b/models/security_group.proto @@ -18,8 +18,8 @@ message ProtoSecurityGroupRule { string protocol = 1; repeated string destinations = 2; repeated uint32 ports = 3 [packed = false]; - ProtoPortRange port_range = 4; - ProtoICMPInfo icmp_info = 5; + ProtoPortRange port_range = 4 [json_name = "port_range"]; + ProtoICMPInfo icmp_info = 5 [json_name = "icmp_info"]; bool log = 6 [json_name = "log"]; repeated string annotations = 7; } diff --git a/models/task.pb.go b/models/task.pb.go index 8bbf487a..9a2f18c6 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -91,23 +91,23 @@ type ProtoTaskDefinition struct { LogGuid string `protobuf:"bytes,9,opt,name=log_guid,proto3" json:"log_guid,omitempty"` MetricsGuid string `protobuf:"bytes,10,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` ResultFile string `protobuf:"bytes,11,opt,name=result_file,proto3" json:"result_file,omitempty"` - CompletionCallbackUrl string `protobuf:"bytes,12,opt,name=completion_callback_url,json=completionCallbackUrl,proto3" json:"completion_callback_url,omitempty"` + CompletionCallbackUrl string `protobuf:"bytes,12,opt,name=completion_callback_url,proto3" json:"completion_callback_url,omitempty"` Annotation string `protobuf:"bytes,13,opt,name=annotation,proto3" json:"annotation,omitempty"` - EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,14,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` - CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,15,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` + EgressRules []*ProtoSecurityGroupRule `protobuf:"bytes,14,rep,name=egress_rules,proto3" json:"egress_rules,omitempty"` + CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,15,rep,name=cached_dependencies,proto3" json:"cached_dependencies,omitempty"` // Deprecated: Marked as deprecated in task.proto. - LegacyDownloadUser string `protobuf:"bytes,16,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` - TrustedSystemCertificatesPath string `protobuf:"bytes,17,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,18,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` + LegacyDownloadUser string `protobuf:"bytes,16,opt,name=legacy_download_user,proto3" json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `protobuf:"bytes,17,opt,name=trusted_system_certificates_path,proto3" json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,18,rep,name=volume_mounts,proto3" json:"volume_mounts,omitempty"` Network *ProtoNetwork `protobuf:"bytes,19,opt,name=network,proto3" json:"network,omitempty"` - PlacementTags []string `protobuf:"bytes,20,rep,name=placement_tags,json=placementTags,proto3" json:"placement_tags,omitempty"` + PlacementTags []string `protobuf:"bytes,20,rep,name=placement_tags,proto3" json:"placement_tags,omitempty"` MaxPids int32 `protobuf:"varint,21,opt,name=max_pids,proto3" json:"max_pids,omitempty"` - CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,22,opt,name=certificate_properties,json=certificateProperties,proto3" json:"certificate_properties,omitempty"` + CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,22,opt,name=certificate_properties,proto3" json:"certificate_properties,omitempty"` ImageUsername string `protobuf:"bytes,23,opt,name=image_username,proto3" json:"image_username,omitempty"` ImagePassword string `protobuf:"bytes,24,opt,name=image_password,proto3" json:"image_password,omitempty"` - ImageLayers []*ProtoImageLayer `protobuf:"bytes,25,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` - LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,26,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,27,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ImageLayers []*ProtoImageLayer `protobuf:"bytes,25,rep,name=image_layers,proto3" json:"image_layers,omitempty"` + LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,26,opt,name=log_rate_limit,proto3" json:"log_rate_limit,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,27,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *ProtoTaskDefinition) Reset() { @@ -492,7 +492,7 @@ var file_task_proto_rawDesc = []byte{ 0x1a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89, 0x0b, 0x0a, + 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x99, 0x0b, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x44, 0x0a, @@ -518,108 +518,110 @@ var file_task_proto_rawDesc = []byte{ 0x67, 0x75, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x36, 0x0a, 0x17, 0x63, 0x6f, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x38, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, - 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x55, - 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, - 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0b, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, - 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, - 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, - 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x10, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, - 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x20, 0x74, - 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, - 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x53, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, - 0x50, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, - 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, - 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x13, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, - 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, - 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x59, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x15, 0x63, 0x65, 0x72, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, - 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x12, 0x3a, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, - 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, - 0x52, 0x0b, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x3f, 0x0a, - 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, - 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x52, 0x0c, 0x6c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x4c, - 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x1b, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x0a, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, + 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x63, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, + 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, + 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, + 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, + 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, + 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, + 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, + 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, + 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, + 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, + 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, + 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, + 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, + 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x12, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, + 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, + 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x26, 0x0a, + 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, + 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, + 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, + 0x73, 0x12, 0x5a, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x26, 0x0a, + 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, + 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x3b, 0x0a, + 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x19, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, + 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1a, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, + 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x4d, 0x0a, + 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x1b, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xae, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x36, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbd, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x45, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, - 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x00, 0x12, 0x1c, - 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, - 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x64, 0x5f, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, - 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x64, 0x5f, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, - 0x64, 0x5f, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, - 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, - 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, - 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, - 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, - 0x73, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, - 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, - 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, - 0x73, 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, - 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, - 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x74, 0x61, + 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, + 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, + 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, + 0x5f, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, + 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, + 0x5f, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, + 0x5f, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x0a, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x0e, + 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0b, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x72, + 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2a, + 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, + 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, + 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, 0x0a, + 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, 0x73, + 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, + 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/task.proto b/models/task.proto index a7b98122..473ebae2 100644 --- a/models/task.proto +++ b/models/task.proto @@ -26,22 +26,22 @@ message ProtoTaskDefinition { string log_guid = 9 [json_name = "log_guid"]; string metrics_guid = 10 [json_name = "metrics_guid"]; string result_file = 11 [json_name = "result_file"]; - string completion_callback_url = 12; + string completion_callback_url = 12 [json_name = "completion_callback_url"]; string annotation = 13; - repeated ProtoSecurityGroupRule egress_rules = 14; - repeated ProtoCachedDependency cached_dependencies = 15; - string legacy_download_user = 16 [deprecated=true]; - string trusted_system_certificates_path = 17; - repeated ProtoVolumeMount volume_mounts = 18; + repeated ProtoSecurityGroupRule egress_rules = 14 [json_name = "egress_rules"]; + repeated ProtoCachedDependency cached_dependencies = 15 [json_name = "cached_dependencies"]; + string legacy_download_user = 16 [deprecated=true, json_name = "legacy_download_user"]; + string trusted_system_certificates_path = 17 [json_name = "trusted_system_certificates_path"]; + repeated ProtoVolumeMount volume_mounts = 18 [json_name = "volume_mounts"]; ProtoNetwork network = 19; - repeated string placement_tags = 20; + repeated string placement_tags = 20 [json_name = "placement_tags"]; int32 max_pids = 21 [json_name = "max_pids"]; - ProtoCertificateProperties certificate_properties = 22; + ProtoCertificateProperties certificate_properties = 22 [json_name = "certificate_properties"]; string image_username = 23 [json_name = "image_username"]; string image_password = 24 [json_name = "image_password"]; - repeated ProtoImageLayer image_layers = 25; - ProtoLogRateLimit log_rate_limit = 26; - map metric_tags = 27; + repeated ProtoImageLayer image_layers = 25 [json_name = "image_layers"]; + ProtoLogRateLimit log_rate_limit = 26 [json_name = "log_rate_limit"]; + map metric_tags = 27 [json_name = "metric_tags"]; } message ProtoTask { @@ -53,7 +53,7 @@ message ProtoTask { Resolving = 4; } - ProtoTaskDefinition task_definition = 1 [json_name = ""]; + ProtoTaskDefinition task_definition = 1 [json_name = "task_definition"]; string task_guid = 2 [json_name = "task_guid"]; string domain = 3 [json_name = "domain"]; From cd445bfcc8b02edbf34dc770bb03bf50eb2c30c8 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 17 May 2024 21:42:32 +0000 Subject: [PATCH 089/155] Update Task test for protobuf and protojson changes --- models/task_test.go | 184 +++++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 86 deletions(-) diff --git a/models/task_test.go b/models/task_test.go index 6e8e3799..6690e848 100644 --- a/models/task_test.go +++ b/models/task_test.go @@ -10,116 +10,129 @@ import ( . "code.cloudfoundry.org/bbs/test_helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" ) var _ = Describe("Task", func() { var taskPayload string var task models.Task + var protoTask models.ProtoTask BeforeEach(func() { taskPayload = `{ "task_guid":"some-guid", "domain":"some-domain", - "rootfs": "docker:///docker.com/docker", - "env":[ - { - "name":"ENV_VAR_NAME", - "value":"an environmment value" - } - ], "cell_id":"cell", - "action": { - "download":{ - "from":"old_location", - "to":"new_location", - "cache_key":"the-cache-key", - "user":"someone", - "checksum_algorithm": "md5", - "checksum_value": "some value" - } - }, - "result_file":"some-file.txt", "result": "turboencabulated", "failed":true, "failure_reason":"because i said so", - "memory_mb":256, - "disk_mb":1024, - "log_rate_limit": { - "bytes_per_second": 2048 - }, - "cpu_weight": 42, - "privileged": true, - "log_guid": "123", - "log_source": "APP", - "metrics_guid": "456", - "created_at": 1393371971000000000, - "updated_at": 1393371971000000010, - "first_completed_at": 1393371971000000030, + "created_at": "1393371971000000000", + "updated_at": "1393371971000000010", + "first_completed_at": "1393371971000000030", "state": "Pending", - "annotation": "[{\"anything\": \"you want!\"}]... dude", - "network": { - "properties": { - "some-key": "some-value", - "some-other-key": "some-other-value" - } - }, - "egress_rules": [ - { - "protocol": "tcp", - "destinations": ["0.0.0.0/0"], - "port_range": { - "start": 1, - "end": 1024 + "task_definition" : { + "rootfs": "docker:///docker.com/docker", + "env":[ + { + "name":"ENV_VAR_NAME", + "value":"an environmment value" + } + ], + "action": { + "download":{ + "from":"old_location", + "to":"new_location", + "cache_key":"the-cache-key", + "user":"someone", + "checksum_algorithm": "md5", + "checksum_value": "some value" + } + }, + "result_file":"some-file.txt", + "memory_mb":256, + "disk_mb":1024, + "log_rate_limit": { + "bytes_per_second": "2048" + }, + "cpu_weight": 42, + "privileged": true, + "log_guid": "123", + "log_source": "APP", + "metrics_guid": "456", + "annotation": "[{\"anything\": \"you want!\"}]... dude", + "network": { + "properties": { + "some-key": "some-value", + "some-other-key": "some-other-value" + } + }, + "egress_rules": [ + { + "protocol": "tcp", + "destinations": ["0.0.0.0/0"], + "port_range": { + "start": 1, + "end": 1024 + }, + "log": true }, - "log": true + { + "protocol": "udp", + "destinations": ["8.8.0.0/16"], + "ports": [53] + } + ], + "completion_callback_url":"http://user:password@a.b.c/d/e/f", + "max_pids": 256, + "certificate_properties": { + "organizational_unit": ["stuff"] }, - { - "protocol": "udp", - "destinations": ["8.8.0.0/16"], - "ports": [53], - "log": false - } - ], - "completion_callback_url":"http://user:password@a.b.c/d/e/f", - "max_pids": 256, - "certificate_properties": { - "organizational_unit": ["stuff"] - }, - "image_username": "jake", - "image_password": "thedog", - "rejection_count": 0, - "rejection_reason": "", - "image_layers": [ - { - "url": "some-url", - "destination_path": "/tmp", - "media_type": "TGZ", - "layer_type": "SHARED" + "image_username": "jake", + "image_password": "thedog", + "image_layers": [ + { + "url": "some-url", + "destination_path": "/tmp", + "media_type": "TGZ", + "layer_type": "SHARED" + } + ], + "legacy_download_user": "some-user", + "metric_tags": { + "source_id": { + "static": "some-guid" + }, + "foo": { + "static": "some-value" + }, + "bar": { + "dynamic": "INDEX" + } } - ], - "legacy_download_user": "some-user", - "metric_tags": { - "source_id": { - "static": "some-guid" - }, - "foo": { - "static": "some-value" - }, - "bar": { - "dynamic": "INDEX" - } } }` - - task = models.Task{} - err := json.Unmarshal([]byte(taskPayload), &task) + // TODO: double-check these fields + // protobuf v3 makes uint64 a string + // "created_at": "1393371971000000000", + // "updated_at": "1393371971000000010", + // "first_completed_at": "1393371971000000030", + // "log_rate_limit": { + // "bytes_per_second": "2048" + // }, + // protojson does not emit this + // egress_rules -> "log": false + // "rejection_count": 0, + // "rejection_reason": "", + + err := protojson.Unmarshal([]byte(taskPayload), &protoTask) Expect(err).NotTo(HaveOccurred()) + task = *protoTask.FromProto() }) Describe("serialization", func() { It("successfully round trips through json and protobuf", func() { - jsonSerialization, err := json.Marshal(task) + jsonSerialization, err := protojson.Marshal(task.ToProto()) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(taskPayload)) @@ -129,8 +142,7 @@ var _ = Describe("Task", func() { var protoDeserialization models.ProtoTask err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) - - Expect(protoDeserialization.FromProto()).To(Equal(task)) + Expect(*protoDeserialization.FromProto()).To(Equal(task)) }) }) From 66e0094b05dabda59c9fb1cd3539c770ca3caa34 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 23 May 2024 21:29:27 +0000 Subject: [PATCH 090/155] Codegen: Remove extra log messages, use Desc.Name() for ignoredMessages --- protoc-gen-go-bbs/bbs.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 7927deb1..938524fe 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -75,10 +75,6 @@ type EqualField struct { func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Message) { if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { - if copysafeName == "Routes" { - log.Printf("FOUNDROUTES: %+v\n", msg) - } - equalBuilder := new(strings.Builder) equal, err := template.New("equal").Parse( ` @@ -324,7 +320,6 @@ func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protog func genEnumTypeWithValues(g *protogen.GeneratedFile, msg *protogen.Message, eNuM *protogen.Enum) { copysafeName, _ := getCopysafeName(g, eNuM.GoIdent) - log.Printf("%s\n", copysafeName) g.P("type ", copysafeName, " int32") g.P("const (") for _, enumValue := range eNuM.Values { @@ -375,7 +370,6 @@ func getEnumValueName(g *protogen.GeneratedFile, msg *protogen.Message, enumValu copysafeParentName, _ := getCopysafeName(g, msg.GoIdent) copysafeEnumValueName, _ := getCopysafeName(g, enumValue.GoIdent) customName := proto.GetExtension(enumValue.Desc.Options().(*descriptorpb.EnumValueOptions), E_BbsEnumvalueCustomname) - log.Printf("%+v\n", customName) result := copysafeEnumValueName if len(customName.(string)) > 0 { @@ -620,7 +614,7 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { } if slices.Contains(ignoredMessages, getUnsafeName(g, msg.GoIdent)) { - log.Printf("Ignoring message %s", msg.GoIdent) + log.Printf("Ignoring message %s", msg.Desc.Name()) continue } helper.genFriendlyEnums(g, msg) From 59ae0ec7a4717f806ccacb16b035874b81dc801b Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 23 May 2024 21:30:14 +0000 Subject: [PATCH 091/155] Add explicit json_name for static and dynamic --- models/metric_tags.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/metric_tags.proto b/models/metric_tags.proto index 0bbfb210..870565e2 100644 --- a/models/metric_tags.proto +++ b/models/metric_tags.proto @@ -14,6 +14,6 @@ message ProtoMetricTagValue { // Note: we only expect one of the following set of fields to be // set. - string static = 1; - DynamicValue dynamic = 2; + string static = 1 [json_name = "static"]; + DynamicValue dynamic = 2 [json_name = "dynamic"]; } From 684c21c2e45b9668d3a5cc7a2b7bf1ed71b1c5eb Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 23 May 2024 21:30:45 +0000 Subject: [PATCH 092/155] WIP: What if Routes wasn't a special case? --- models/desired_lrp.go | 30 +- models/desired_lrp.pb.go | 725 +++++++++++----------- models/desired_lrp.proto | 9 +- models/desired_lrp_bbs.pb.go | 63 +- models/desired_lrp_test.go | 94 +-- models/routes.go | 43 +- models/routes_test.go | 13 +- models/test/model_helpers/constructors.go | 3 +- 8 files changed, 538 insertions(+), 442 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 0e856cda..bd8c06f8 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -52,7 +52,7 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo RootFs: desiredLrpResource.RootFs, Instances: schedInfo.Instances, Annotation: schedInfo.Annotation, - Routes: &schedInfo.Routes, + Routes: schedInfo.Routes, ModificationTag: &schedInfo.ModificationTag, EnvironmentVariables: environmentVariables, CachedDependencies: runInfo.CachedDependencies, @@ -210,7 +210,7 @@ func (d *DesiredLRP) DesiredLRPResource() DesiredLRPResource { func (d *DesiredLRP) DesiredLRPSchedulingInfo() DesiredLRPSchedulingInfo { var routes Routes if d.Routes != nil { - routes = *d.Routes + routes = *ParseRoutes(d.Routes) } var modificationTag ModificationTag if d.ModificationTag != nil { @@ -238,7 +238,7 @@ func (d *DesiredLRP) DesiredLRPSchedulingInfo() DesiredLRPSchedulingInfo { func (d *DesiredLRP) DesiredLRPRoutingInfo() DesiredLRP { var routes Routes if d.Routes != nil { - routes = *d.Routes + routes = *ParseRoutes(d.Routes) } var modificationTag ModificationTag @@ -340,8 +340,8 @@ func (desired DesiredLRP) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range *desired.Routes { - totalRoutesLength += len(*value) + for _, value := range desired.Routes { + totalRoutesLength += len(value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -380,8 +380,8 @@ func (desired *DesiredLRPUpdate) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range *desired.Routes { - totalRoutesLength += len(*value) + for _, value := range desired.Routes { + totalRoutesLength += len(value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -407,14 +407,14 @@ func (desired DesiredLRPUpdate) IsRoutesGroupUpdated(routes *Routes, routerGroup return true } - desiredRoutes, desiredRoutesPresent := (*desired.Routes)[routerGroup] + desiredRoutes, desiredRoutesPresent := (desired.Routes)[routerGroup] requestRoutes, requestRoutesPresent := (*routes)[routerGroup] if desiredRoutesPresent != requestRoutesPresent { return true } if desiredRoutesPresent && requestRoutesPresent { - return !bytes.Equal(*desiredRoutes, *requestRoutes) + return !bytes.Equal(desiredRoutes, *requestRoutes) } return true @@ -455,7 +455,7 @@ func (desired *DesiredLRPUpdate) UnmarshalJSON(data []byte) error { if update.Instances != nil { desired.SetInstances(update.Instances) } - desired.Routes = update.Routes + desired.Routes = *update.Routes.ToProto() if update.Annotation != nil { desired.SetAnnotation(update.Annotation) } @@ -470,7 +470,7 @@ func (desired DesiredLRPUpdate) MarshalJSON() ([]byte, error) { i := desired.GetInstances() update.Instances = i } - update.Routes = desired.Routes + update.Routes = ParseRoutes(desired.Routes) if desired.AnnotationExists() { a := desired.GetAnnotation() update.Annotation = a @@ -515,7 +515,7 @@ func NewDesiredLRPSchedulingInfo( Annotation: annotation, Instances: instances, DesiredLrpResource: resource, - Routes: routes, + Routes: *routes.ToProto(), ModificationTag: modTag, VolumePlacement: volumePlacement, PlacementTags: placementTags, @@ -534,7 +534,7 @@ func NewDesiredLRPRoutingInfo( Domain: key.Domain, LogGuid: key.LogGuid, Instances: instances, - Routes: routes, + Routes: *routes.ToProto(), ModificationTag: modTag, MetricTags: metrTags, } @@ -545,7 +545,7 @@ func (s *DesiredLRPSchedulingInfo) ApplyUpdate(update *DesiredLRPUpdate) { s.Instances = *update.GetInstances() } if update.Routes != nil { - s.Routes = *update.Routes + s.Routes = update.Routes } if update.AnnotationExists() { s.Annotation = *update.GetAnnotation() @@ -560,7 +560,7 @@ func (*DesiredLRPSchedulingInfo) Version() format.Version { func (s DesiredLRPSchedulingInfo) Validate() error { var validationError ValidationError - validationError = validationError.Check(s.DesiredLrpKey, s.DesiredLrpResource, s.Routes) + validationError = validationError.Check(s.DesiredLrpKey, s.DesiredLrpResource, ParseRoutes(s.Routes)) if s.GetInstances() < 0 { validationError = validationError.Append(ErrInvalidField{"instances"}) diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index dcb092ec..b5753444 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -29,10 +29,11 @@ type ProtoDesiredLRPSchedulingInfo struct { Annotation string `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation,omitempty"` Instances int32 `protobuf:"varint,3,opt,name=instances,proto3" json:"instances,omitempty"` DesiredLrpResource *ProtoDesiredLRPResource `protobuf:"bytes,4,opt,name=desired_lrp_resource,proto3" json:"desired_lrp_resource,omitempty"` - Routes *ProtoRoutes `protobuf:"bytes,5,opt,name=routes,proto3" json:"routes,omitempty"` - ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` - VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,proto3" json:"volume_placement,omitempty"` - PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` + // ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; + Routes map[string][]byte `protobuf:"bytes,5,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` + VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,proto3" json:"volume_placement,omitempty"` + PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` } func (x *ProtoDesiredLRPSchedulingInfo) Reset() { @@ -95,7 +96,7 @@ func (x *ProtoDesiredLRPSchedulingInfo) GetDesiredLrpResource() *ProtoDesiredLRP return nil } -func (x *ProtoDesiredLRPSchedulingInfo) GetRoutes() *ProtoRoutes { +func (x *ProtoDesiredLRPSchedulingInfo) GetRoutes() map[string][]byte { if x != nil { return x.Routes } @@ -437,8 +438,9 @@ type ProtoDesiredLRPUpdate struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` - Routes *ProtoRoutes `protobuf:"bytes,2,opt,name=routes,proto3,oneof" json:"routes,omitempty"` + Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` + // optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; + Routes map[string][]byte `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Annotation *string `protobuf:"bytes,3,opt,name=annotation,proto3,oneof" json:"annotation,omitempty"` MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } @@ -482,7 +484,7 @@ func (x *ProtoDesiredLRPUpdate) GetInstances() int32 { return 0 } -func (x *ProtoDesiredLRPUpdate) GetRoutes() *ProtoRoutes { +func (x *ProtoDesiredLRPUpdate) GetRoutes() map[string][]byte { if x != nil { return x.Routes } @@ -658,9 +660,10 @@ type ProtoDesiredLRP struct { CpuWeight uint32 `protobuf:"varint,12,opt,name=cpu_weight,proto3" json:"cpu_weight,omitempty"` Privileged bool `protobuf:"varint,13,opt,name=privileged,proto3" json:"privileged,omitempty"` Ports []uint32 `protobuf:"varint,14,rep,name=ports,proto3" json:"ports,omitempty"` - Routes *ProtoRoutes `protobuf:"bytes,15,opt,name=routes,proto3,oneof" json:"routes,omitempty"` - LogSource string `protobuf:"bytes,16,opt,name=log_source,proto3" json:"log_source,omitempty"` - LogGuid string `protobuf:"bytes,17,opt,name=log_guid,proto3" json:"log_guid,omitempty"` + // optional ProtoRoutes routes = 15 [(bbs.bbs_by_value) = false]; + Routes map[string][]byte `protobuf:"bytes,15,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + LogSource string `protobuf:"bytes,16,opt,name=log_source,proto3" json:"log_source,omitempty"` + LogGuid string `protobuf:"bytes,17,opt,name=log_guid,proto3" json:"log_guid,omitempty"` // Deprecated: Marked as deprecated in desired_lrp.proto. MetricsGuid string `protobuf:"bytes,18,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` Annotation string `protobuf:"bytes,19,opt,name=annotation,proto3" json:"annotation,omitempty"` @@ -822,7 +825,7 @@ func (x *ProtoDesiredLRP) GetPorts() []uint32 { return nil } -func (x *ProtoDesiredLRP) GetRoutes() *ProtoRoutes { +func (x *ProtoDesiredLRP) GetRoutes() map[string][]byte { if x != nil { return x.Routes } @@ -1000,7 +1003,7 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf4, 0x03, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcd, 0x04, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x49, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, @@ -1017,295 +1020,308 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x12, 0x4d, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, - 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x74, 0x61, 0x67, 0x12, 0x48, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, - 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x76, 0x6f, 0x6c, - 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, - 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x22, 0xdd, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x49, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, - 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, - 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, - 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, - 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, - 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, - 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, - 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, - 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, - 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, - 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, - 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x47, 0x0a, - 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x75, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, - 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, - 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, - 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, - 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, - 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, - 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, - 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, - 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, - 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, - 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, - 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x5f, - 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, - 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, - 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, - 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, - 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, - 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, - 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, - 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, - 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, - 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xeb, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, - 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, - 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, - 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, - 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, - 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, - 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, - 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, - 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, - 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0x99, 0x0f, - 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, - 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, - 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, - 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, - 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, - 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, - 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, - 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, - 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, - 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, - 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, - 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, - 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, - 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, - 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, - 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, - 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, - 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, - 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, - 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x48, 0x0a, + 0x63, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, + 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x12, 0x4d, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, - 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, + 0x67, 0x12, 0x48, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, + 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, + 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xdd, 0x0c, + 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x49, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, + 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x6b, 0x65, 0x79, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, + 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, + 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, + 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, + 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, + 0x74, 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, + 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, + 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, + 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, + 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x47, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, + 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, + 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, + 0x00, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, + 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, + 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, - 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, - 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, - 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, - 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, - 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, - 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, - 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, - 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, - 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, - 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, - 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, - 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, - 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, - 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, - 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, - 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, - 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, + 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, + 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, + 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, + 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, + 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, + 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, + 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, + 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, + 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, + 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, + 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, + 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, + 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, + 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, + 0x50, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, + 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, + 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, + 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, + 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, + 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, + 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, + 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0xac, 0x03, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, + 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x46, + 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x06, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0a, 0x61, 0x6e, + 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x39, 0x0a, 0x0b, + 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, + 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, + 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, + 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, + 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, + 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, + 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0xd4, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, + 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, + 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, + 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, + 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, + 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, + 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, + 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, + 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, + 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, + 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, + 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, + 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, + 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, + 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, + 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, + 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x03, 0x90, + 0x3f, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, + 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, + 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, + 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, + 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, + 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, + 0x65, 0x73, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, + 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, + 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, + 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, + 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, + 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, + 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, + 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, + 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, + 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, + 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, + 0x70, 0x69, 0x64, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, + 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, + 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, + 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, + 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, + 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, + 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, + 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, + 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x39, 0x0a, 0x0b, + 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, - 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, - 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, - 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, + 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, + 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1320,7 +1336,7 @@ func file_desired_lrp_proto_rawDescGZIP() []byte { return file_desired_lrp_proto_rawDescData } -var file_desired_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_desired_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 14) var file_desired_lrp_proto_goTypes = []interface{}{ (*ProtoDesiredLRPSchedulingInfo)(nil), // 0: models.ProtoDesiredLRPSchedulingInfo (*ProtoDesiredLRPRunInfo)(nil), // 1: models.ProtoDesiredLRPRunInfo @@ -1329,68 +1345,71 @@ var file_desired_lrp_proto_goTypes = []interface{}{ (*ProtoDesiredLRPKey)(nil), // 4: models.ProtoDesiredLRPKey (*ProtoDesiredLRPResource)(nil), // 5: models.ProtoDesiredLRPResource (*ProtoDesiredLRP)(nil), // 6: models.ProtoDesiredLRP - nil, // 7: models.ProtoDesiredLRPRunInfo.MetricTagsEntry - nil, // 8: models.ProtoRoutes.RoutesEntry - nil, // 9: models.ProtoDesiredLRPUpdate.MetricTagsEntry - nil, // 10: models.ProtoDesiredLRP.MetricTagsEntry - (*ProtoModificationTag)(nil), // 11: models.ProtoModificationTag - (*ProtoVolumePlacement)(nil), // 12: models.ProtoVolumePlacement - (*ProtoEnvironmentVariable)(nil), // 13: models.ProtoEnvironmentVariable - (*ProtoAction)(nil), // 14: models.ProtoAction - (*ProtoSecurityGroupRule)(nil), // 15: models.ProtoSecurityGroupRule - (*ProtoCachedDependency)(nil), // 16: models.ProtoCachedDependency - (*ProtoVolumeMount)(nil), // 17: models.ProtoVolumeMount - (*ProtoNetwork)(nil), // 18: models.ProtoNetwork - (*ProtoCertificateProperties)(nil), // 19: models.ProtoCertificateProperties - (*ProtoCheckDefinition)(nil), // 20: models.ProtoCheckDefinition - (*ProtoImageLayer)(nil), // 21: models.ProtoImageLayer - (*ProtoSidecar)(nil), // 22: models.ProtoSidecar - (*ProtoLogRateLimit)(nil), // 23: models.ProtoLogRateLimit - (*ProtoMetricTagValue)(nil), // 24: models.ProtoMetricTagValue + nil, // 7: models.ProtoDesiredLRPSchedulingInfo.RoutesEntry + nil, // 8: models.ProtoDesiredLRPRunInfo.MetricTagsEntry + nil, // 9: models.ProtoRoutes.RoutesEntry + nil, // 10: models.ProtoDesiredLRPUpdate.RoutesEntry + nil, // 11: models.ProtoDesiredLRPUpdate.MetricTagsEntry + nil, // 12: models.ProtoDesiredLRP.RoutesEntry + nil, // 13: models.ProtoDesiredLRP.MetricTagsEntry + (*ProtoModificationTag)(nil), // 14: models.ProtoModificationTag + (*ProtoVolumePlacement)(nil), // 15: models.ProtoVolumePlacement + (*ProtoEnvironmentVariable)(nil), // 16: models.ProtoEnvironmentVariable + (*ProtoAction)(nil), // 17: models.ProtoAction + (*ProtoSecurityGroupRule)(nil), // 18: models.ProtoSecurityGroupRule + (*ProtoCachedDependency)(nil), // 19: models.ProtoCachedDependency + (*ProtoVolumeMount)(nil), // 20: models.ProtoVolumeMount + (*ProtoNetwork)(nil), // 21: models.ProtoNetwork + (*ProtoCertificateProperties)(nil), // 22: models.ProtoCertificateProperties + (*ProtoCheckDefinition)(nil), // 23: models.ProtoCheckDefinition + (*ProtoImageLayer)(nil), // 24: models.ProtoImageLayer + (*ProtoSidecar)(nil), // 25: models.ProtoSidecar + (*ProtoLogRateLimit)(nil), // 26: models.ProtoLogRateLimit + (*ProtoMetricTagValue)(nil), // 27: models.ProtoMetricTagValue } var file_desired_lrp_proto_depIdxs = []int32{ 4, // 0: models.ProtoDesiredLRPSchedulingInfo.desired_lrp_key:type_name -> models.ProtoDesiredLRPKey 5, // 1: models.ProtoDesiredLRPSchedulingInfo.desired_lrp_resource:type_name -> models.ProtoDesiredLRPResource - 2, // 2: models.ProtoDesiredLRPSchedulingInfo.routes:type_name -> models.ProtoRoutes - 11, // 3: models.ProtoDesiredLRPSchedulingInfo.modification_tag:type_name -> models.ProtoModificationTag - 12, // 4: models.ProtoDesiredLRPSchedulingInfo.volume_placement:type_name -> models.ProtoVolumePlacement + 7, // 2: models.ProtoDesiredLRPSchedulingInfo.routes:type_name -> models.ProtoDesiredLRPSchedulingInfo.RoutesEntry + 14, // 3: models.ProtoDesiredLRPSchedulingInfo.modification_tag:type_name -> models.ProtoModificationTag + 15, // 4: models.ProtoDesiredLRPSchedulingInfo.volume_placement:type_name -> models.ProtoVolumePlacement 4, // 5: models.ProtoDesiredLRPRunInfo.desired_lrp_key:type_name -> models.ProtoDesiredLRPKey - 13, // 6: models.ProtoDesiredLRPRunInfo.environment_variables:type_name -> models.ProtoEnvironmentVariable - 14, // 7: models.ProtoDesiredLRPRunInfo.setup:type_name -> models.ProtoAction - 14, // 8: models.ProtoDesiredLRPRunInfo.action:type_name -> models.ProtoAction - 14, // 9: models.ProtoDesiredLRPRunInfo.monitor:type_name -> models.ProtoAction - 15, // 10: models.ProtoDesiredLRPRunInfo.egress_rules:type_name -> models.ProtoSecurityGroupRule - 16, // 11: models.ProtoDesiredLRPRunInfo.cached_dependencies:type_name -> models.ProtoCachedDependency - 17, // 12: models.ProtoDesiredLRPRunInfo.volume_mounts:type_name -> models.ProtoVolumeMount - 18, // 13: models.ProtoDesiredLRPRunInfo.network:type_name -> models.ProtoNetwork - 19, // 14: models.ProtoDesiredLRPRunInfo.certificate_properties:type_name -> models.ProtoCertificateProperties - 20, // 15: models.ProtoDesiredLRPRunInfo.check_definition:type_name -> models.ProtoCheckDefinition - 21, // 16: models.ProtoDesiredLRPRunInfo.image_layers:type_name -> models.ProtoImageLayer - 7, // 17: models.ProtoDesiredLRPRunInfo.metric_tags:type_name -> models.ProtoDesiredLRPRunInfo.MetricTagsEntry - 22, // 18: models.ProtoDesiredLRPRunInfo.sidecars:type_name -> models.ProtoSidecar - 23, // 19: models.ProtoDesiredLRPRunInfo.log_rate_limit:type_name -> models.ProtoLogRateLimit - 8, // 20: models.ProtoRoutes.routes:type_name -> models.ProtoRoutes.RoutesEntry - 2, // 21: models.ProtoDesiredLRPUpdate.routes:type_name -> models.ProtoRoutes - 9, // 22: models.ProtoDesiredLRPUpdate.metric_tags:type_name -> models.ProtoDesiredLRPUpdate.MetricTagsEntry - 13, // 23: models.ProtoDesiredLRP.environment_variables:type_name -> models.ProtoEnvironmentVariable - 14, // 24: models.ProtoDesiredLRP.setup:type_name -> models.ProtoAction - 14, // 25: models.ProtoDesiredLRP.action:type_name -> models.ProtoAction - 14, // 26: models.ProtoDesiredLRP.monitor:type_name -> models.ProtoAction - 2, // 27: models.ProtoDesiredLRP.routes:type_name -> models.ProtoRoutes - 15, // 28: models.ProtoDesiredLRP.egress_rules:type_name -> models.ProtoSecurityGroupRule - 11, // 29: models.ProtoDesiredLRP.modification_tag:type_name -> models.ProtoModificationTag - 16, // 30: models.ProtoDesiredLRP.cached_dependencies:type_name -> models.ProtoCachedDependency - 17, // 31: models.ProtoDesiredLRP.volume_mounts:type_name -> models.ProtoVolumeMount - 18, // 32: models.ProtoDesiredLRP.network:type_name -> models.ProtoNetwork - 19, // 33: models.ProtoDesiredLRP.certificate_properties:type_name -> models.ProtoCertificateProperties - 20, // 34: models.ProtoDesiredLRP.check_definition:type_name -> models.ProtoCheckDefinition - 21, // 35: models.ProtoDesiredLRP.image_layers:type_name -> models.ProtoImageLayer - 10, // 36: models.ProtoDesiredLRP.metric_tags:type_name -> models.ProtoDesiredLRP.MetricTagsEntry - 22, // 37: models.ProtoDesiredLRP.sidecars:type_name -> models.ProtoSidecar - 23, // 38: models.ProtoDesiredLRP.log_rate_limit:type_name -> models.ProtoLogRateLimit - 24, // 39: models.ProtoDesiredLRPRunInfo.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue - 24, // 40: models.ProtoDesiredLRPUpdate.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue - 24, // 41: models.ProtoDesiredLRP.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 16, // 6: models.ProtoDesiredLRPRunInfo.environment_variables:type_name -> models.ProtoEnvironmentVariable + 17, // 7: models.ProtoDesiredLRPRunInfo.setup:type_name -> models.ProtoAction + 17, // 8: models.ProtoDesiredLRPRunInfo.action:type_name -> models.ProtoAction + 17, // 9: models.ProtoDesiredLRPRunInfo.monitor:type_name -> models.ProtoAction + 18, // 10: models.ProtoDesiredLRPRunInfo.egress_rules:type_name -> models.ProtoSecurityGroupRule + 19, // 11: models.ProtoDesiredLRPRunInfo.cached_dependencies:type_name -> models.ProtoCachedDependency + 20, // 12: models.ProtoDesiredLRPRunInfo.volume_mounts:type_name -> models.ProtoVolumeMount + 21, // 13: models.ProtoDesiredLRPRunInfo.network:type_name -> models.ProtoNetwork + 22, // 14: models.ProtoDesiredLRPRunInfo.certificate_properties:type_name -> models.ProtoCertificateProperties + 23, // 15: models.ProtoDesiredLRPRunInfo.check_definition:type_name -> models.ProtoCheckDefinition + 24, // 16: models.ProtoDesiredLRPRunInfo.image_layers:type_name -> models.ProtoImageLayer + 8, // 17: models.ProtoDesiredLRPRunInfo.metric_tags:type_name -> models.ProtoDesiredLRPRunInfo.MetricTagsEntry + 25, // 18: models.ProtoDesiredLRPRunInfo.sidecars:type_name -> models.ProtoSidecar + 26, // 19: models.ProtoDesiredLRPRunInfo.log_rate_limit:type_name -> models.ProtoLogRateLimit + 9, // 20: models.ProtoRoutes.routes:type_name -> models.ProtoRoutes.RoutesEntry + 10, // 21: models.ProtoDesiredLRPUpdate.routes:type_name -> models.ProtoDesiredLRPUpdate.RoutesEntry + 11, // 22: models.ProtoDesiredLRPUpdate.metric_tags:type_name -> models.ProtoDesiredLRPUpdate.MetricTagsEntry + 16, // 23: models.ProtoDesiredLRP.environment_variables:type_name -> models.ProtoEnvironmentVariable + 17, // 24: models.ProtoDesiredLRP.setup:type_name -> models.ProtoAction + 17, // 25: models.ProtoDesiredLRP.action:type_name -> models.ProtoAction + 17, // 26: models.ProtoDesiredLRP.monitor:type_name -> models.ProtoAction + 12, // 27: models.ProtoDesiredLRP.routes:type_name -> models.ProtoDesiredLRP.RoutesEntry + 18, // 28: models.ProtoDesiredLRP.egress_rules:type_name -> models.ProtoSecurityGroupRule + 14, // 29: models.ProtoDesiredLRP.modification_tag:type_name -> models.ProtoModificationTag + 19, // 30: models.ProtoDesiredLRP.cached_dependencies:type_name -> models.ProtoCachedDependency + 20, // 31: models.ProtoDesiredLRP.volume_mounts:type_name -> models.ProtoVolumeMount + 21, // 32: models.ProtoDesiredLRP.network:type_name -> models.ProtoNetwork + 22, // 33: models.ProtoDesiredLRP.certificate_properties:type_name -> models.ProtoCertificateProperties + 23, // 34: models.ProtoDesiredLRP.check_definition:type_name -> models.ProtoCheckDefinition + 24, // 35: models.ProtoDesiredLRP.image_layers:type_name -> models.ProtoImageLayer + 13, // 36: models.ProtoDesiredLRP.metric_tags:type_name -> models.ProtoDesiredLRP.MetricTagsEntry + 25, // 37: models.ProtoDesiredLRP.sidecars:type_name -> models.ProtoSidecar + 26, // 38: models.ProtoDesiredLRP.log_rate_limit:type_name -> models.ProtoLogRateLimit + 27, // 39: models.ProtoDesiredLRPRunInfo.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 27, // 40: models.ProtoDesiredLRPUpdate.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 27, // 41: models.ProtoDesiredLRP.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue 42, // [42:42] is the sub-list for method output_type 42, // [42:42] is the sub-list for method input_type 42, // [42:42] is the sub-list for extension type_name @@ -1512,7 +1531,7 @@ func file_desired_lrp_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_desired_lrp_proto_rawDesc, NumEnums: 0, - NumMessages: 11, + NumMessages: 14, NumExtensions: 0, NumServices: 0, }, diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index ceb8d67a..fc78eefc 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -26,7 +26,8 @@ message ProtoDesiredLRPSchedulingInfo { ProtoDesiredLRPResource desired_lrp_resource = 4 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_resource"]; - ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; + /* ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; */ + map routes = 5 [(bbs.bbs_by_value) = true]; ProtoModificationTag modification_tag = 6 [(bbs.bbs_by_value) = true, json_name = "modification_tag"]; ProtoVolumePlacement volume_placement = 7 [json_name = "volume_placement"]; repeated string PlacementTags = 8 [json_name ="placement_tags"]; @@ -80,7 +81,8 @@ message ProtoRoutes { message ProtoDesiredLRPUpdate { optional int32 instances = 1; - optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; + /* optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; */ + map routes = 2 [(bbs.bbs_by_value) = false]; optional string annotation = 3; map metric_tags = 4 [json_name = "metric_tags"]; } @@ -116,7 +118,8 @@ message ProtoDesiredLRP { uint32 cpu_weight = 12 [json_name = "cpu_weight"]; bool privileged = 13 [json_name = "privileged"]; repeated uint32 ports = 14 [packed = false]; - optional ProtoRoutes routes = 15 [(bbs.bbs_by_value) = false]; + /* optional ProtoRoutes routes = 15 [(bbs.bbs_by_value) = false]; */ + map routes = 15 [(bbs.bbs_by_value) = false]; string log_source = 16 [json_name = "log_source"]; string log_guid = 17 [json_name = "log_guid"]; string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index ae2eeaf4..74a26714 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -6,13 +6,17 @@ package models +import ( + bytes "bytes" +) + // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly type DesiredLRPSchedulingInfo struct { DesiredLrpKey DesiredLRPKey Annotation string Instances int32 DesiredLrpResource DesiredLRPResource - Routes Routes + Routes map[string][]byte ModificationTag ModificationTag VolumePlacement *VolumePlacement PlacementTags []string @@ -52,9 +56,14 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { return false } - if !this.Routes.Equal(that1.Routes) { + if len(this.Routes) != len(that1.Routes) { return false } + for i := range this.Routes { + if !bytes.Equal(this.Routes[i], that1.Routes[i]) { + return false + } + } if !this.ModificationTag.Equal(that1.ModificationTag) { return false } @@ -103,7 +112,7 @@ func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value DesiredLRPResourc m.DesiredLrpResource = value } } -func (m *DesiredLRPSchedulingInfo) SetRoutes(value Routes) { +func (m *DesiredLRPSchedulingInfo) SetRoutes(value map[string][]byte) { if m != nil { m.Routes = value } @@ -145,7 +154,7 @@ func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { Annotation: x.Annotation, Instances: x.Instances, DesiredLrpResource: x.DesiredLrpResource.ToProto(), - Routes: x.Routes.ToProto(), + Routes: x.Routes, ModificationTag: x.ModificationTag.ToProto(), VolumePlacement: x.VolumePlacement.ToProto(), PlacementTags: x.PlacementTags, @@ -163,7 +172,7 @@ func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { Annotation: x.Annotation, Instances: x.Instances, DesiredLrpResource: *x.DesiredLrpResource.FromProto(), - Routes: *x.Routes.FromProto(), + Routes: x.Routes, ModificationTag: *x.ModificationTag.FromProto(), VolumePlacement: x.VolumePlacement.FromProto(), PlacementTags: x.PlacementTags, @@ -790,7 +799,7 @@ func DesiredLRPRunInfoMetricTagsFromProtoMap(values map[string]*ProtoMetricTagVa // Prevent copylock errors when using ProtoDesiredLRPUpdate directly type DesiredLRPUpdate struct { Instances *int32 - Routes *Routes + Routes map[string][]byte Annotation *string MetricTags map[string]*MetricTagValue } @@ -820,9 +829,14 @@ func (this *DesiredLRPUpdate) Equal(that interface{}) bool { if this.Instances != that1.Instances { return false } - if !this.Routes.Equal(*that1.Routes) { + if len(this.Routes) != len(that1.Routes) { return false } + for i := range this.Routes { + if !bytes.Equal(this.Routes[i], that1.Routes[i]) { + return false + } + } if this.Annotation != that1.Annotation { return false } @@ -850,16 +864,13 @@ func (m *DesiredLRPUpdate) SetInstances(value *int32) { m.Instances = value } } -func (m *DesiredLRPUpdate) RoutesExists() bool { - return m != nil && m.Routes != nil -} -func (m *DesiredLRPUpdate) GetRoutes() *Routes { - if m != nil && m.Routes != nil { +func (m *DesiredLRPUpdate) GetRoutes() map[string][]byte { + if m != nil { return m.Routes } return nil } -func (m *DesiredLRPUpdate) SetRoutes(value *Routes) { +func (m *DesiredLRPUpdate) SetRoutes(value map[string][]byte) { if m != nil { m.Routes = value } @@ -896,7 +907,7 @@ func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { proto := &ProtoDesiredLRPUpdate{ Instances: x.Instances, - Routes: x.Routes.ToProto(), + Routes: x.Routes, Annotation: x.Annotation, MetricTags: DesiredLRPUpdateMetricTagsToProtoMap(x.MetricTags), } @@ -910,7 +921,7 @@ func (x *ProtoDesiredLRPUpdate) FromProto() *DesiredLRPUpdate { copysafe := &DesiredLRPUpdate{ Instances: x.Instances, - Routes: x.Routes.FromProto(), + Routes: x.Routes, Annotation: x.Annotation, MetricTags: DesiredLRPUpdateMetricTagsFromProtoMap(x.MetricTags), } @@ -1237,7 +1248,7 @@ type DesiredLRP struct { CpuWeight uint32 Privileged bool Ports []uint32 - Routes *Routes + Routes map[string][]byte LogSource string LogGuid string MetricsGuid string @@ -1338,9 +1349,14 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.Routes.Equal(*that1.Routes) { + if len(this.Routes) != len(that1.Routes) { return false } + for i := range this.Routes { + if !bytes.Equal(this.Routes[i], that1.Routes[i]) { + return false + } + } if this.LogSource != that1.LogSource { return false } @@ -1608,16 +1624,13 @@ func (m *DesiredLRP) SetPorts(value []uint32) { m.Ports = value } } -func (m *DesiredLRP) RoutesExists() bool { - return m != nil && m.Routes != nil -} -func (m *DesiredLRP) GetRoutes() *Routes { - if m != nil && m.Routes != nil { +func (m *DesiredLRP) GetRoutes() map[string][]byte { + if m != nil { return m.Routes } return nil } -func (m *DesiredLRP) SetRoutes(value *Routes) { +func (m *DesiredLRP) SetRoutes(value map[string][]byte) { if m != nil { m.Routes = value } @@ -1881,7 +1894,7 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { CpuWeight: x.CpuWeight, Privileged: x.Privileged, Ports: x.Ports, - Routes: x.Routes.ToProto(), + Routes: x.Routes, LogSource: x.LogSource, LogGuid: x.LogGuid, MetricsGuid: x.MetricsGuid, @@ -1928,7 +1941,7 @@ func (x *ProtoDesiredLRP) FromProto() *DesiredLRP { CpuWeight: x.CpuWeight, Privileged: x.Privileged, Ports: x.Ports, - Routes: x.Routes.FromProto(), + Routes: x.Routes, LogSource: x.LogSource, LogGuid: x.LogGuid, MetricsGuid: x.MetricsGuid, diff --git a/models/desired_lrp_test.go b/models/desired_lrp_test.go index 2b85dbdd..625827ef 100644 --- a/models/desired_lrp_test.go +++ b/models/desired_lrp_test.go @@ -5,11 +5,13 @@ import ( "encoding/base64" "encoding/json" "fmt" + "log" "time" "code.cloudfoundry.org/bbs/format" "code.cloudfoundry.org/bbs/models" "code.cloudfoundry.org/bbs/models/test/model_helpers" + "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" . "code.cloudfoundry.org/bbs/test_helpers" @@ -350,12 +352,12 @@ var _ = Describe("DesiredLRP", func() { err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) - desiredRoutes := *desiredLRP.Routes - deserializedRoutes := *protoDeserialization.Routes.FromProto() + desiredRoutes := desiredLRP.Routes + deserializedRoutes := protoDeserialization.Routes Expect(deserializedRoutes).To(HaveLen(len(desiredRoutes))) for k := range desiredRoutes { - Expect(string(*deserializedRoutes[k])).To(MatchJSON(string(*desiredRoutes[k]))) + Expect(string(deserializedRoutes[k])).To(MatchJSON(string(desiredRoutes[k]))) } desiredLRP.Routes = nil @@ -381,13 +383,13 @@ var _ = Describe("DesiredLRP", func() { It("allows empty routes to be set", func() { update := &models.DesiredLRPUpdate{ - Routes: &models.Routes{}, + Routes: make(map[string][]byte), } schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = models.Routes{} + expectedSchedulingInfo.Routes = make(map[string][]byte) expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -426,18 +428,17 @@ var _ = Describe("DesiredLRP", func() { It("updates routes", func() { rawMessage := json.RawMessage([]byte(`{"port": 8080,"hosts":["new-route-1","new-route-2"]}`)) + routes := &models.Routes{ + "router": &rawMessage, + } update := &models.DesiredLRPUpdate{ - Routes: &models.Routes{ - "router": &rawMessage, - }, + Routes: *routes.ToProto(), } schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = models.Routes{ - "router": &rawMessage, - } + expectedSchedulingInfo.Routes = *routes.ToProto() expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -471,7 +472,7 @@ var _ = Describe("DesiredLRP", func() { Context("when update contains routes", func() { BeforeEach(func() { - update.Routes = routes + update.Routes = *routes.ToProto() }) It("returns true when provided routes are not set", func() { @@ -1299,17 +1300,22 @@ var _ = Describe("DesiredLRP", func() { }) var _ = Describe("DesiredLRPUpdate", func() { - var desiredLRPUpdate models.DesiredLRPUpdate + var desiredLRPUpdate models.ProtoDesiredLRPUpdate + var nonprotoDesiredLRPUpdate models.DesiredLRPUpdate BeforeEach(func() { instances := int32(2) - desiredLRPUpdate.SetInstances(&instances) - desiredLRPUpdate.Routes = &models.Routes{ + desiredLRPUpdate.Instances = &instances + nonprotoRoutes := &models.Routes{ "foo": &json.RawMessage{'"', 'b', 'a', 'r', '"'}, } + + desiredLRPUpdate.Routes = *nonprotoRoutes.ToProto() + //desiredLRPUpdate.Routes = nonprotoRoutes//.ToProto() + nonprotoDesiredLRPUpdate = *desiredLRPUpdate.FromProto() annotation := "some-text" - desiredLRPUpdate.SetAnnotation(&annotation) - desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{ + desiredLRPUpdate.Annotation = &annotation + desiredLRPUpdate.MetricTags = map[string]*models.ProtoMetricTagValue{ "some-tag": {Static: "some-value"}, } }) @@ -1323,49 +1329,49 @@ var _ = Describe("DesiredLRPUpdate", func() { It("requires a positive nonzero number of instances", func() { invalidInstances := int32(-1) - desiredLRPUpdate.SetInstances(&invalidInstances) - assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "instances") + desiredLRPUpdate.Instances = &invalidInstances + assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "instances") zeroInstances := int32(0) - desiredLRPUpdate.SetInstances(&zeroInstances) - validationErr := desiredLRPUpdate.Validate() + desiredLRPUpdate.Instances = &zeroInstances + validationErr := desiredLRPUpdate.FromProto().Validate() Expect(validationErr).NotTo(HaveOccurred()) oneInstance := int32(1) - desiredLRPUpdate.SetInstances(&oneInstance) - validationErr = desiredLRPUpdate.Validate() + desiredLRPUpdate.Instances = &oneInstance + validationErr = desiredLRPUpdate.FromProto().Validate() Expect(validationErr).NotTo(HaveOccurred()) }) It("limits the annotation length", func() { largeString := randStringBytes(50000) - desiredLRPUpdate.SetAnnotation(&largeString) - assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "annotation") + desiredLRPUpdate.Annotation = &largeString + assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "annotation") }) Context("metric tags", func() { It("is invalid when both static and dynamic values are provided for the same key", func() { - desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{ - "some_metric": {Static: "some-value", Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex}, + desiredLRPUpdate.MetricTags = map[string]*models.ProtoMetricTagValue{ + "some_metric": {Static: "some-value", Dynamic: models.ProtoMetricTagValue_DynamicValue(models.ProtoMetricTagValue_INDEX)}, } - assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "metric_tags") - assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "static") - assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "dynamic") + assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "metric_tags") + assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "static") + assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "dynamic") }) It("is valid when metric tags is empty", func() { - desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{} - Expect(desiredLRPUpdate.Validate()).To(Succeed()) + desiredLRPUpdate.MetricTags = map[string]*models.ProtoMetricTagValue{} + Expect(desiredLRPUpdate.FromProto().Validate()).To(Succeed()) }) It("is valid when metric tags is nil", func() { desiredLRPUpdate.MetricTags = nil - Expect(desiredLRPUpdate.Validate()).To(Succeed()) + Expect(desiredLRPUpdate.FromProto().Validate()).To(Succeed()) }) }) }) - Describe("serialization", func() { + FDescribe("serialization", func() { var expectedJSON string BeforeEach(func() { expectedJSON = `{ @@ -1383,11 +1389,25 @@ var _ = Describe("DesiredLRPUpdate", func() { }) It("can marshal to JSON and back", func() { - Expect(json.Marshal(desiredLRPUpdate)).To(MatchJSON(expectedJSON)) + log.Printf("\n") + log.Printf("NonProtoDesiredLRPUpdate: %+v\n", nonprotoDesiredLRPUpdate) + log.Printf("DesiredLRPUpdate Proto: %+v\n", &desiredLRPUpdate) + log.Printf("DesiredLRPUpdate.FromProto: %+v\n", desiredLRPUpdate.FromProto()) + log.Printf("DesiredLRPUpdate.FromProto Routes: %+v\n", desiredLRPUpdate.FromProto().Routes) + log.Printf("DesiredLRPUpdate Routes: %+v\n", desiredLRPUpdate.Routes) + // log.Printf("DesiredLRPUpdate Routes.FromProto: %+v\n", desiredLRPUpdate.Routes.FromProto()) + // log.Printf("DesiredLRPUpdate Routes.ToProto: %+v\n", desiredLRPUpdate.Routes.ToProto()) + // log.Printf("DesiredLRPUpdate Routes.ToProto Routes: %+v\n", desiredLRPUpdate.Routes.ToProto().Routes) + standard, _ := json.Marshal(&desiredLRPUpdate) + stdRoutes, _ := json.Marshal(&desiredLRPUpdate.Routes) + log.Printf("standard: %+v", string(standard)) + log.Printf("standard routes: %+v", string(stdRoutes)) + actual, _ := protojson.Marshal(&desiredLRPUpdate) + Expect(actual).To(MatchJSON(expectedJSON)) var testV models.DesiredLRPUpdate - Expect(json.Unmarshal([]byte(expectedJSON), &testV)).To(Succeed()) - Expect(testV).To(Equal(desiredLRPUpdate)) + Expect(protojson.Unmarshal([]byte(expectedJSON), testV.ToProto())).To(Succeed()) + Expect(testV).To(Equal(&desiredLRPUpdate)) }) }) diff --git a/models/routes.go b/models/routes.go index d8cd6638..7fbbaa3f 100644 --- a/models/routes.go +++ b/models/routes.go @@ -3,23 +3,39 @@ package models import ( bytes "bytes" "encoding/json" + "log" ) type Routes map[string]*json.RawMessage -func (r *Routes) ToProto() *ProtoRoutes { - if r == nil { +func ParseRoutes(b map[string][]byte) *Routes { + if b == nil { return nil } - pr := &ProtoRoutes{ - Routes: map[string][]byte{}, + + routes := Routes{} + for k, v := range b { + raw := json.RawMessage(v) + routes[k] = &raw + } + + return &routes +} + +func (r *Routes) ToProto() *map[string][]byte { + if r == nil { + return nil } + // pr := &ProtoRoutes{ + // Routes: map[string][]byte{}, + // } + pr := make(map[string][]byte) for k, v := range *r { - pr.Routes[k] = *v + pr[k] = *v } - return pr + return &pr } func (pr *ProtoRoutes) FromProto() *Routes { @@ -37,7 +53,11 @@ func (pr *ProtoRoutes) FromProto() *Routes { } // func (r *Routes) Marshal() ([]byte, error) { -// return r.protoRoutes().Marshal() +// return proto.Marshal(r.ToProto()) +// } + +// func (r *Routes) Unmarshal(b []byte) error { +// return proto.Unmarshal(b, r.ToProto()) // } // func (r *Routes) MarshalTo(data []byte) (n int, err error) { @@ -74,8 +94,17 @@ func (pr *ProtoRoutes) FromProto() *Routes { // } func (r *Routes) Equal(other Routes) bool { + log.Printf("Routes.Equal") + log.Printf("other: %+v", other) + log.Printf("r: %+v", r) + if other == nil { + return r == nil + } for k, v := range *r { + log.Printf("\n") + log.Printf("key: %+v, value: %+v", k, v) if !bytes.Equal(*v, *other[k]) { + log.Printf("bytes.Equal failed on v=%+v and other[k]=%+v\n", *v, *other[k]) return false } } diff --git a/models/routes_test.go b/models/routes_test.go index d5576bd0..12838e9d 100644 --- a/models/routes_test.go +++ b/models/routes_test.go @@ -2,6 +2,7 @@ package models_test import ( "encoding/json" + "log" "code.cloudfoundry.org/bbs/models" "google.golang.org/protobuf/encoding/protojson" @@ -20,8 +21,14 @@ var _ = Describe("Routes", func() { itSerializes := func(routes *models.Routes) { BeforeEach(func() { update = models.DesiredLRPUpdate{ - Routes: routes, + Routes: *routes.ToProto(), } + log.Printf("INPUT routes: %+v\n", routes) + log.Printf("INPUT update: %+v\n", update) + log.Printf("INPUT update.routes: %+v\n", update.Routes) + // for k, v := range *update.Routes { + // log.Printf("key: %+v, value: %+v", k, string(*v)) + // } /* The point of these tests is to go from non-proto struct to JSON/Protobuf (binary) representation and back. @@ -38,12 +45,16 @@ var _ = Describe("Routes", func() { 2024-05-15: It remains to be seen if this extra layer is going to cause performance issues */ + log.Printf("update.ToProto(): %+v\n", update.ToProto()) b, err := protojson.Marshal(update.ToProto()) Expect(err).NotTo(HaveOccurred()) err = protojson.Unmarshal(b, &aJson) + log.Printf("JSON-aJson: %+v\n", aJson.FromProto()) + log.Printf("JSON-aJson routes: %+v\n", aJson.FromProto().Routes) Expect(err).NotTo(HaveOccurred()) protoUpdate := update.ToProto() + log.Printf("protoUpdate: %+v\n", protoUpdate) b, err = proto.Marshal(protoUpdate) Expect(err).NotTo(HaveOccurred()) err = proto.Unmarshal(b, &resultProto) diff --git a/models/test/model_helpers/constructors.go b/models/test/model_helpers/constructors.go index 7ac1bb2e..85989cfa 100644 --- a/models/test/model_helpers/constructors.go +++ b/models/test/model_helpers/constructors.go @@ -59,6 +59,7 @@ func NewValidEvacuatingActualLRP(guid string, index int32) *models.ActualLRP { func NewValidDesiredLRP(guid string) *models.DesiredLRP { myRouterJSON := json.RawMessage(`{"foo":"bar"}`) modTag := models.NewModificationTag("epoch", 0) + routes := &models.Routes{"my-router": &myRouterJSON} desiredLRP := &models.DesiredLRP{ ProcessGuid: guid, Domain: "some-domain", @@ -95,7 +96,7 @@ func NewValidDesiredLRP(guid string) *models.DesiredLRP { MemoryMb: 1024, CpuWeight: 42, MaxPids: 1024, - Routes: &models.Routes{"my-router": &myRouterJSON}, + Routes: *routes.ToProto(), LogSource: "some-log-source", LogGuid: "some-log-guid", MetricsGuid: "some-metrics-guid", From 6e31fc1465abdb4bcb7a58e0c922effb2ceacbc8 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 29 May 2024 16:49:42 +0000 Subject: [PATCH 093/155] Redirect output from pushd/popd to /dev/null --- scripts/generate_protos.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/generate_protos.sh b/scripts/generate_protos.sh index 446e5d23..d3332425 100755 --- a/scripts/generate_protos.sh +++ b/scripts/generate_protos.sh @@ -2,16 +2,16 @@ set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" # regenerate protos for protoc plugin -pushd "${DIR}/../protoc-gen-go-bbs" +pushd "${DIR}/../protoc-gen-go-bbs" > /dev/null protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./*.proto # we need the custom bbs code from the plugin because of references made by some of the model protos cp ./bbs.pb.go "${DIR}/../models/" # we also need to change the package after it's been copied away sed -i 's/package models/package main/g' ./bbs.pb.go -popd +popd > /dev/null # regenerate protos for models -pushd "${DIR}/../models" +pushd "${DIR}/../models" > /dev/null protoc --proto_path=.:../protoc-gen-go-bbs --go_out=. --go-bbs_out=. --go_opt=paths=source_relative --go-bbs_opt=paths=source_relative ./*.proto -popd +popd > /dev/null From bcaf619311505ffc2dc57fe4e25e8bdf58fcfc24 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 29 May 2024 16:52:27 +0000 Subject: [PATCH 094/155] Add JsonAlwaysEmit and CustomType features; Regenerate protos for codegen --- protoc-gen-go-bbs/bbs.go | 39 ++++++++++++++-- protoc-gen-go-bbs/bbs.pb.go | 92 ++++++++++++++++++++++--------------- protoc-gen-go-bbs/bbs.proto | 3 +- 3 files changed, 92 insertions(+), 42 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 938524fe..2f0aef94 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -44,6 +44,21 @@ func getFieldName(goName string) string { return result } +func getJsonTag(field *protogen.Field) string { + jsonName := field.Desc.JSONName() + alwaysEmit := ",omitempty" + if isAlwaysEmit(field) { + alwaysEmit = "" + } + tag := fmt.Sprintf("`json:\"%s%s\"`", jsonName, alwaysEmit) + return tag +} + +func isAlwaysEmit(field *protogen.Field) bool { + isAlwaysEmit := proto.GetExtension(field.Desc.Options().(*descriptorpb.FieldOptions), E_BbsJsonAlwaysEmit) + return isAlwaysEmit.(bool) +} + func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *protogen.Message) { if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { g.P("// Prevent copylock errors when using ", msg.GoIdent.GoName, " directly") @@ -56,7 +71,8 @@ func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *proto } fieldName := getFieldName(field.GoName) fieldType := getActualType(g, field) - g.P(fieldName, " ", fieldType) + jsonTag := getJsonTag(field) + g.P(fieldName, " ", fieldType, " ", jsonTag) } g.P("}") @@ -249,7 +265,14 @@ func getActualType(g *protogen.GeneratedFile, field *protogen.Field) string { fieldType = "[]" } - if field.Desc.IsMap() { + if isCustomType(field) { + customType := getCustomType(field) + pointer := "*" + if isByValueType(field) { + pointer = "" + } + fieldType += pointer + customType + } else if field.Desc.IsMap() { // check for maps first because legacy protobuf would generate "Entry" messages, // and for some reason the Message field is still populated if *debug { @@ -306,6 +329,16 @@ func isExcludedFromEqual(field *protogen.Field) bool { return isExcludedFromEqual.(bool) } +func isCustomType(field *protogen.Field) bool { + customType := proto.GetExtension(field.Desc.Options().(*descriptorpb.FieldOptions), E_BbsCustomType) + return len(customType.(string)) > 0 +} + +func getCustomType(field *protogen.Field) string { + customType := proto.GetExtension(field.Desc.Options().(*descriptorpb.FieldOptions), E_BbsCustomType) + return customType.(string) +} + func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) { for _, eNuM := range msg.Enums { if *debug { @@ -614,7 +647,7 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { } if slices.Contains(ignoredMessages, getUnsafeName(g, msg.GoIdent)) { - log.Printf("Ignoring message %s", msg.Desc.Name()) + log.Printf("\tIgnoring message %s", msg.Desc.Name()) continue } helper.genFriendlyEnums(g, msg) diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 6801cafb..903a04b8 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: bbs.proto package main @@ -23,10 +23,10 @@ const ( var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ { ExtendedType: (*descriptorpb.FieldOptions)(nil), - ExtensionType: (*string)(nil), + ExtensionType: (*bool)(nil), Field: 1000, - Name: "bbs.bbs_json_name", - Tag: "bytes,1000,opt,name=bbs_json_name", + Name: "bbs.bbs_json_always_emit", + Tag: "varint,1000,opt,name=bbs_json_always_emit", Filename: "bbs.proto", }, { @@ -45,6 +45,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "varint,1020,opt,name=bbs_exclude_from_equal", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1030, + Name: "bbs.bbs_custom_type", + Tag: "bytes,1030,opt,name=bbs_custom_type", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -57,18 +65,20 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ // Extension fields to descriptorpb.FieldOptions. var ( - // optional string bbs_json_name = 1000; - E_BbsJsonName = &file_bbs_proto_extTypes[0] + // optional bool bbs_json_always_emit = 1000; + E_BbsJsonAlwaysEmit = &file_bbs_proto_extTypes[0] // optional bool bbs_by_value = 1010; E_BbsByValue = &file_bbs_proto_extTypes[1] // optional bool bbs_exclude_from_equal = 1020; E_BbsExcludeFromEqual = &file_bbs_proto_extTypes[2] + // optional string bbs_custom_type = 1030; + E_BbsCustomType = &file_bbs_proto_extTypes[3] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[3] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[4] ) var File_bbs_proto protoreflect.FileDescriptor @@ -77,30 +87,35 @@ var file_bbs_proto_rawDesc = []byte{ 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x3a, 0x45, 0x0a, 0x0d, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x62, 0x73, 0x4a, 0x73, - 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, - 0x5f, 0x62, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, - 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, - 0x0a, 0x16, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, - 0x6f, 0x6d, 0x5f, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, - 0x62, 0x62, 0x73, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, - 0x75, 0x61, 0x6c, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, - 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, - 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x3a, 0x52, 0x0a, 0x14, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x61, + 0x6c, 0x77, 0x61, 0x79, 0x73, 0x5f, 0x65, 0x6d, 0x69, 0x74, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, + 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x11, 0x62, 0x62, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x45, + 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, 0x5f, 0x62, 0x79, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x62, 0x62, + 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, 0x0a, 0x16, 0x62, + 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, + 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x62, 0x62, 0x73, + 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, 0x75, 0x61, 0x6c, + 0x88, 0x01, 0x01, 0x3a, 0x49, 0x0a, 0x0f, 0x62, 0x62, 0x73, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x62, + 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, + 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, + 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, + 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, + 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_bbs_proto_goTypes = []interface{}{ @@ -108,14 +123,15 @@ var file_bbs_proto_goTypes = []interface{}{ (*descriptorpb.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions } var file_bbs_proto_depIdxs = []int32{ - 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions + 0, // 0: bbs.bbs_json_always_emit:extendee -> google.protobuf.FieldOptions 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions 0, // 2: bbs.bbs_exclude_from_equal:extendee -> google.protobuf.FieldOptions - 1, // 3: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 0, // [0:4] is the sub-list for extension extendee + 0, // 3: bbs.bbs_custom_type:extendee -> google.protobuf.FieldOptions + 1, // 4: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 0, // [0:5] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -131,7 +147,7 @@ func file_bbs_proto_init() { RawDescriptor: file_bbs_proto_rawDesc, NumEnums: 0, NumMessages: 0, - NumExtensions: 4, + NumExtensions: 5, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/protoc-gen-go-bbs/bbs.proto b/protoc-gen-go-bbs/bbs.proto index bfab3334..ec2aa078 100644 --- a/protoc-gen-go-bbs/bbs.proto +++ b/protoc-gen-go-bbs/bbs.proto @@ -6,9 +6,10 @@ option go_package="code.cloudfoundry.org/bbs/models"; import "google/protobuf/descriptor.proto"; extend google.protobuf.FieldOptions { - optional string bbs_json_name = 1000; + optional bool bbs_json_always_emit = 1000; optional bool bbs_by_value = 1010; optional bool bbs_exclude_from_equal = 1020; + optional string bbs_custom_type = 1030; } extend google.protobuf.EnumValueOptions { From 887f23fcf823b9ebf3d4a49986b609960e963d61 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 30 May 2024 19:38:55 +0000 Subject: [PATCH 095/155] Codegen: alwaysEmit->jsonEmit --- protoc-gen-go-bbs/bbs.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 2f0aef94..8a9374e3 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -46,11 +46,11 @@ func getFieldName(goName string) string { func getJsonTag(field *protogen.Field) string { jsonName := field.Desc.JSONName() - alwaysEmit := ",omitempty" + jsonEmit := ",omitempty" if isAlwaysEmit(field) { - alwaysEmit = "" + jsonEmit = "" } - tag := fmt.Sprintf("`json:\"%s%s\"`", jsonName, alwaysEmit) + tag := fmt.Sprintf("`json:\"%s%s\"`", jsonName, jsonEmit) return tag } From b069c7c9b47e776e2bbb70633dbed3baa67b9745 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 30 May 2024 19:42:15 +0000 Subject: [PATCH 096/155] Codegen: Action no longer needs special Get/SetValue in accessors --- protoc-gen-go-bbs/bbs.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 8a9374e3..6bdeb376 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -206,14 +206,9 @@ func genGetter(g *protogen.GeneratedFile, copysafeName string, field *protogen.F optionalCheck = fmt.Sprintf("&& m.%s != nil ", fieldName) //extra space intentional genExists(g, copysafeName, field) } - // TODO: make this cleaner - actionGetValue := "" - if cut, ok := strings.CutPrefix(fieldType, "*"); ok && cut == "Action" { - actionGetValue = ".GetValue().(*Action)" - } g.P("func (m *", copysafeName, ") Get", fieldName, "() ", fieldType, " {") g.P("if m != nil ", optionalCheck, "{") - g.P("return m.", fieldName, actionGetValue) + g.P("return m.", fieldName) g.P("}") g.P("return ", defaultValue) g.P("}") @@ -223,11 +218,7 @@ func genSetter(g *protogen.GeneratedFile, copysafeName string, fieldName string, if *debug { log.Print("Setter...") } - // TODO: make this cleaner setValue := " = value" - if cut, ok := strings.CutPrefix(fieldType, "*"); ok && cut == "Action" { - setValue = ".SetValue(value)" - } g.P("func (m *", copysafeName, ") Set", fieldName, "(value ", fieldType, ") {") g.P("if m != nil {") g.P("m.", fieldName, setValue) From db69970b28ceb1b1df6b257b2bdf20e37e3ccc1b Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 30 May 2024 19:45:07 +0000 Subject: [PATCH 097/155] Codegen: Handle optional fields better: Make sure we're checking for nils Set default values where appropriate When a Map has a value of Message type, dereference for Equal --- protoc-gen-go-bbs/bbs.go | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 6bdeb376..d511b543 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -128,7 +128,11 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa } fieldName := getFieldName(field.GoName) if field.Desc.Cardinality() == protoreflect.Repeated { - g.P("if len(this.", fieldName, ") != len(that1.", fieldName, ") {") + g.P("if this.", fieldName, " == nil {") + g.P("if that1.", fieldName, " != nil {") + g.P("return false") + g.P("}") + g.P("} else if len(this.", fieldName, ") != len(that1.", fieldName, ") {") g.P("return false") g.P("}") g.P("for i := range this.", fieldName, " {") @@ -137,6 +141,8 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa } else if field.Desc.IsMap() && field.Desc.MapValue().Kind() == protoreflect.BytesKind { bytesEqual := protogen.GoIdent{GoName: "Equal", GoImportPath: "bytes"} g.P("if !", g.QualifiedGoIdent(bytesEqual), "(this.", fieldName, "[i], that1.", fieldName, "[i]) {") + } else if field.Desc.IsMap() && field.Desc.MapValue().Kind() == protoreflect.MessageKind { + g.P("if !this.", fieldName, "[i].Equal(that1.", fieldName, "[i]) {") } else { g.P("if this.", fieldName, "[i] != that1.", fieldName, "[i] {") } @@ -146,11 +152,26 @@ func (bbsGenerateHelper) genEqual(g *protogen.GeneratedFile, msg *protogen.Messa pointer := "*" if isByValueType(field) { pointer = "" + } else { + g.P("if this.", fieldName, " == nil {") + g.P("if that1.", fieldName, " != nil {") + g.P("return false") + g.P("}") + g.P("} else ") } g.P("if !this.", fieldName, ".Equal(", pointer, "that1.", fieldName, ") {") g.P("return false") } else { - g.P("if this.", fieldName, " != that1.", fieldName, " {") + pointer := "" + if field.Desc.HasOptionalKeyword() { + pointer = "*" + g.P("if this.", fieldName, " == nil {") + g.P("if that1.", fieldName, " != nil {") + g.P("return false") + g.P("}") + g.P("} else ") + } + g.P("if ", pointer, "this.", fieldName, " != ", pointer, "that1.", fieldName, " {") g.P("return false") } g.P("}") @@ -199,10 +220,11 @@ func genGetter(g *protogen.GeneratedFile, copysafeName string, field *protogen.F fieldName := getFieldName(field.GoName) fieldType := getActualType(g, field) defaultValue := getDefaultValueString(field) + defaultReturn := "defaultValue" isOptional := field.Desc.HasOptionalKeyword() optionalCheck := "" if isOptional { - defaultValue = "nil" + defaultReturn = "&" + defaultReturn optionalCheck = fmt.Sprintf("&& m.%s != nil ", fieldName) //extra space intentional genExists(g, copysafeName, field) } @@ -210,7 +232,14 @@ func genGetter(g *protogen.GeneratedFile, copysafeName string, field *protogen.F g.P("if m != nil ", optionalCheck, "{") g.P("return m.", fieldName) g.P("}") - g.P("return ", defaultValue) + if defaultValue == "nil" { + g.P("return nil") + } else { + valueType, _ := strings.CutPrefix(fieldType, "*") + g.P("var defaultValue ", valueType) + g.P("defaultValue = ", defaultValue) + g.P("return ", defaultReturn) + } g.P("}") } @@ -241,9 +270,6 @@ func getDefaultValueString(field *protogen.Field) string { case protoreflect.DoubleKind, protoreflect.Fixed32Kind, protoreflect.Fixed64Kind, protoreflect.FloatKind, protoreflect.Int32Kind, protoreflect.Sfixed32Kind, protoreflect.Sfixed64Kind, protoreflect.Sint32Kind, protoreflect.Sint64Kind, protoreflect.Uint32Kind, protoreflect.Uint64Kind, protoreflect.Int64Kind: return "0" case protoreflect.StringKind: - if field.Desc.Cardinality() == protoreflect.Repeated { - return "nil" - } return `""` default: panic(fmt.Sprintf("Unrecognized type: %s", kind)) From f938a623c701c18ca8ea53d65a3b468ec24f4df9 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 30 May 2024 19:47:34 +0000 Subject: [PATCH 098/155] Protos: Add AlwaysEmit options to Messages to match old protobuf results Regen protos --- models/actions.pb.go | 272 ++++----- models/actions.proto | 33 +- models/actions_bbs.pb.go | 356 ++++++++---- models/actual_lrp.pb.go | 247 ++++---- models/actual_lrp.proto | 46 +- models/actual_lrp_bbs.pb.go | 182 ++++-- models/actual_lrp_requests.pb.go | 299 +++++----- models/actual_lrp_requests.proto | 57 +- models/actual_lrp_requests_bbs.pb.go | 260 ++++++--- models/bbs.pb.go | 92 +-- models/cached_dependency.pb.go | 41 +- models/cached_dependency.proto | 14 +- models/cached_dependency_bbs.pb.go | 44 +- models/cells.pb.go | 96 ++-- models/cells.proto | 17 +- models/cells_bbs.pb.go | 106 +++- models/certificate_properties.pb.go | 2 +- models/certificate_properties_bbs.pb.go | 10 +- models/check_definition.pb.go | 55 +- models/check_definition.proto | 19 +- models/check_definition_bbs.pb.go | 82 ++- models/desired_lrp.pb.go | 733 ++++++++++++------------ models/desired_lrp.proto | 79 ++- models/desired_lrp_bbs.pb.go | 643 ++++++++++++++------- models/desired_lrp_requests.pb.go | 91 +-- models/desired_lrp_requests.proto | 19 +- models/desired_lrp_requests_bbs.pb.go | 122 ++-- models/domain.pb.go | 42 +- models/domain.proto | 5 +- models/domain_bbs.pb.go | 38 +- models/environment_variables.pb.go | 20 +- models/environment_variables.proto | 5 +- models/environment_variables_bbs.pb.go | 14 +- models/error.pb.go | 96 ++-- models/error.proto | 4 +- models/error_bbs.pb.go | 14 +- models/evacuation.pb.go | 136 ++--- models/evacuation.proto | 7 +- models/evacuation_bbs.pb.go | 152 +++-- models/events.pb.go | 248 ++++---- models/events.proto | 40 +- models/events_bbs.pb.go | 252 +++++--- models/image_layer.pb.go | 95 +-- models/image_layer.proto | 8 +- models/image_layer_bbs.pb.go | 44 +- models/log_rate_limit.pb.go | 2 +- models/log_rate_limit_bbs.pb.go | 8 +- models/metric_tags.pb.go | 2 +- models/metric_tags_bbs.pb.go | 14 +- models/modification_tag.pb.go | 19 +- models/modification_tag.proto | 5 +- models/modification_tag_bbs.pb.go | 14 +- models/network.pb.go | 2 +- models/network_bbs.pb.go | 10 +- models/ping.pb.go | 10 +- models/ping.proto | 3 +- models/ping_bbs.pb.go | 8 +- models/security_group.pb.go | 63 +- models/security_group.proto | 23 +- models/security_group_bbs.pb.go | 78 ++- models/sidecar.pb.go | 26 +- models/sidecar.proto | 5 +- models/sidecar_bbs.pb.go | 26 +- models/task.pb.go | 281 ++++----- models/task.proto | 51 +- models/task_bbs.pb.go | 272 ++++++--- models/task_requests.pb.go | 191 +++--- models/task_requests.proto | 61 +- models/task_requests_bbs.pb.go | 202 +++++-- models/volume_mount.pb.go | 54 +- models/volume_mount.proto | 16 +- models/volume_mount_bbs.pb.go | 48 +- 72 files changed, 3997 insertions(+), 2734 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index 00a0bc42..7c6810b7 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: actions.proto package models @@ -151,7 +151,7 @@ type ProtoDownloadAction struct { From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` ChecksumAlgorithm string `protobuf:"bytes,7,opt,name=checksum_algorithm,proto3" json:"checksum_algorithm,omitempty"` ChecksumValue string `protobuf:"bytes,8,opt,name=checksum_value,proto3" json:"checksum_value,omitempty"` @@ -253,7 +253,7 @@ type ProtoUploadAction struct { Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` - LogSource string `protobuf:"bytes,4,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + LogSource string `protobuf:"bytes,4,opt,name=log_source,proto3" json:"log_source,omitempty"` User string `protobuf:"bytes,5,opt,name=user,proto3" json:"user,omitempty"` } @@ -860,148 +860,153 @@ var File_actions_proto protoreflect.FileDescriptor var file_actions_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, - 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, - 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb7, 0x04, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, - 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x64, 0x6f, 0x77, 0x6e, - 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x38, 0x0a, 0x0d, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2f, - 0x0a, 0x0a, 0x72, 0x75, 0x6e, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x72, 0x75, 0x6e, 0x12, - 0x3b, 0x0a, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4c, 0x0a, 0x14, - 0x65, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, - 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x65, 0x6d, 0x69, - 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2f, 0x0a, 0x0a, 0x74, 0x72, - 0x79, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x72, 0x79, 0x12, 0x3e, 0x0a, 0x0f, 0x70, - 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x08, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x12, 0x38, 0x0a, 0x0d, 0x73, - 0x65, 0x72, 0x69, 0x61, 0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x73, - 0x65, 0x72, 0x69, 0x61, 0x6c, 0x12, 0x47, 0x0a, 0x12, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x0b, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x22, 0xfe, - 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, - 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, - 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, - 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0xb7, 0x04, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x3e, 0x0a, 0x0f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x12, + 0x38, 0x0a, 0x0d, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x06, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2f, 0x0a, 0x0a, 0x72, 0x75, 0x6e, + 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x75, 0x6e, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x72, 0x75, 0x6e, 0x12, 0x3b, 0x0a, 0x0e, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4c, 0x0a, 0x14, 0x65, 0x6d, 0x69, 0x74, 0x5f, + 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x65, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x72, 0x6f, + 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2f, 0x0a, 0x0a, 0x74, 0x72, 0x79, 0x5f, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x03, 0x74, 0x72, 0x79, 0x12, 0x3e, 0x0a, 0x0f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, + 0x65, 0x6c, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, + 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x70, 0x61, + 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x12, 0x38, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, + 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x69, + 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, + 0x12, 0x47, 0x0a, 0x12, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x5f, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, + 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x63, 0x6f, + 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x22, 0x93, 0x02, 0x0a, 0x13, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x12, 0x17, 0x0a, + 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x13, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x21, 0x0a, 0x09, 0x63, + 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1e, + 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x17, + 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, - 0x86, 0x01, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, + 0x96, 0x01, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, - 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x53, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xab, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, - 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, - 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x61, - 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x64, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x04, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, - 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x45, 0x0a, 0x0f, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, - 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, - 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, - 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, - 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x22, 0xad, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, - 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, - 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x5f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, - 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, - 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x22, 0xee, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x24, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, - 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, - 0x36, 0x0a, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x74, 0x12, 0x17, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x13, 0x0a, 0x02, 0x74, 0x6f, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x02, 0x74, 0x6f, 0x12, + 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, + 0x17, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xba, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x04, 0x70, + 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, + 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x72, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x03, 0x65, 0x6e, + 0x76, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, + 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x45, + 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x73, 0x52, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, + 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x1e, + 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x35, + 0x0a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, + 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, + 0x75, 0x74, 0x70, 0x75, 0x74, 0x22, 0xb2, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, + 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, 0x70, + 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, + 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x22, 0xfd, 0x01, 0x0a, 0x17, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2d, + 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x73, 0x75, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x3b, 0x0a, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, - 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x5d, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x64, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, - 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, + 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, + 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x5d, 0x0a, 0x0e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, + 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, + 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x64, 0x0a, 0x13, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, + 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, + 0x62, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x22, 0x67, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x62, 0x0a, 0x11, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x22, 0x67, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, - 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, - 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x13, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, - 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, - 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, - 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x18, 0x01, - 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, - 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, - 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, - 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x13, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, + 0x69, 0x74, 0x73, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, + 0x12, 0x1d, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, + 0x02, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, + 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, + 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, + 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, + 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1061,6 +1066,7 @@ func file_actions_proto_init() { if File_actions_proto != nil { return } + file_bbs_proto_init() file_environment_variables_proto_init() if !protoimpl.UnsafeEnabled { file_actions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { diff --git a/models/actions.proto b/models/actions.proto index 02a4a4bb..4ab01a47 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "environment_variables.proto"; message ProtoAction { @@ -29,46 +30,46 @@ message ProtoAction { message ProtoDownloadAction { string artifact = 1; - string from = 2 [json_name = "from"]; - string to = 3 [json_name = "to"]; - string cache_key = 4 [json_name = "cache_key"]; - string log_source = 5; - string user = 6 [json_name = "user"] ; + string from = 2 [json_name = "from", (bbs.bbs_json_always_emit) = true]; + string to = 3 [json_name = "to", (bbs.bbs_json_always_emit) = true]; + string cache_key = 4 [json_name = "cache_key", (bbs.bbs_json_always_emit) = true]; + string log_source = 5 [json_name = "log_source"]; + string user = 6 [json_name = "user", (bbs.bbs_json_always_emit) = true]; string checksum_algorithm = 7 [json_name = "checksum_algorithm"]; string checksum_value = 8 [json_name = "checksum_value"]; } message ProtoUploadAction { string artifact = 1; - string from = 2 [json_name = "from"]; - string to = 3 [json_name = "to"]; - string log_source = 4; - string user = 5 [json_name = "user"]; + string from = 2 [json_name = "from", (bbs.bbs_json_always_emit) = true]; + string to = 3 [json_name = "to", (bbs.bbs_json_always_emit) = true]; + string log_source = 4 [json_name = "log_source"]; + string user = 5 [json_name = "user", (bbs.bbs_json_always_emit) = true]; } message ProtoRunAction { - string path = 1 [json_name = "path"]; + string path = 1 [json_name = "path", (bbs.bbs_json_always_emit) = true]; repeated string args = 2; string dir = 3; repeated ProtoEnvironmentVariable env = 4; ProtoResourceLimits resource_limits = 5 [json_name = "resource_limits"]; - string user = 6 [json_name = "user"]; + string user = 6 [json_name = "user", (bbs.bbs_json_always_emit) = true]; string log_source = 7 [json_name = "log_source"]; - bool suppress_log_output = 8 [json_name = "suppress_log_output"]; + bool suppress_log_output = 8 [json_name = "suppress_log_output", (bbs.bbs_json_always_emit) = true]; } message ProtoTimeoutAction { ProtoAction action = 1; int64 deprecated_timeout_ns = 2 [json_name = "timeout", deprecated=true]; string log_source = 3 [json_name = "log_source"]; - int64 timeout_ms = 4 [json_name = "timeout_ms"]; + int64 timeout_ms = 4 [json_name = "timeout_ms", (bbs.bbs_json_always_emit) = true]; } message ProtoEmitProgressAction { ProtoAction action = 1; - string start_message = 2 [json_name = "start_message"]; - string success_message = 3 [json_name = "success_message"]; - string failure_message_prefix = 4 [json_name = "failure_message_prefix"]; + string start_message = 2 [json_name = "start_message", (bbs.bbs_json_always_emit) = true]; + string success_message = 3 [json_name = "success_message", (bbs.bbs_json_always_emit) = true]; + string failure_message_prefix = 4 [json_name = "failure_message_prefix", (bbs.bbs_json_always_emit) = true]; string log_source = 5 [json_name = "log_source"]; } diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 797c341f..a2285576 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,22 +1,22 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: actions.proto package models // Prevent copylock errors when using ProtoAction directly type Action struct { - DownloadAction *DownloadAction - UploadAction *UploadAction - RunAction *RunAction - TimeoutAction *TimeoutAction - EmitProgressAction *EmitProgressAction - TryAction *TryAction - ParallelAction *ParallelAction - SerialAction *SerialAction - CodependentAction *CodependentAction + DownloadAction *DownloadAction `json:"download,omitempty"` + UploadAction *UploadAction `json:"upload,omitempty"` + RunAction *RunAction `json:"run,omitempty"` + TimeoutAction *TimeoutAction `json:"timeout,omitempty"` + EmitProgressAction *EmitProgressAction `json:"emit_progress,omitempty"` + TryAction *TryAction `json:"try,omitempty"` + ParallelAction *ParallelAction `json:"parallel,omitempty"` + SerialAction *SerialAction `json:"serial,omitempty"` + CodependentAction *CodependentAction `json:"codependent,omitempty"` } func (this *Action) Equal(that interface{}) bool { @@ -41,31 +41,67 @@ func (this *Action) Equal(that interface{}) bool { return false } - if !this.DownloadAction.Equal(*that1.DownloadAction) { + if this.DownloadAction == nil { + if that1.DownloadAction != nil { + return false + } + } else if !this.DownloadAction.Equal(*that1.DownloadAction) { return false } - if !this.UploadAction.Equal(*that1.UploadAction) { + if this.UploadAction == nil { + if that1.UploadAction != nil { + return false + } + } else if !this.UploadAction.Equal(*that1.UploadAction) { return false } - if !this.RunAction.Equal(*that1.RunAction) { + if this.RunAction == nil { + if that1.RunAction != nil { + return false + } + } else if !this.RunAction.Equal(*that1.RunAction) { return false } - if !this.TimeoutAction.Equal(*that1.TimeoutAction) { + if this.TimeoutAction == nil { + if that1.TimeoutAction != nil { + return false + } + } else if !this.TimeoutAction.Equal(*that1.TimeoutAction) { return false } - if !this.EmitProgressAction.Equal(*that1.EmitProgressAction) { + if this.EmitProgressAction == nil { + if that1.EmitProgressAction != nil { + return false + } + } else if !this.EmitProgressAction.Equal(*that1.EmitProgressAction) { return false } - if !this.TryAction.Equal(*that1.TryAction) { + if this.TryAction == nil { + if that1.TryAction != nil { + return false + } + } else if !this.TryAction.Equal(*that1.TryAction) { return false } - if !this.ParallelAction.Equal(*that1.ParallelAction) { + if this.ParallelAction == nil { + if that1.ParallelAction != nil { + return false + } + } else if !this.ParallelAction.Equal(*that1.ParallelAction) { return false } - if !this.SerialAction.Equal(*that1.SerialAction) { + if this.SerialAction == nil { + if that1.SerialAction != nil { + return false + } + } else if !this.SerialAction.Equal(*that1.SerialAction) { return false } - if !this.CodependentAction.Equal(*that1.CodependentAction) { + if this.CodependentAction == nil { + if that1.CodependentAction != nil { + return false + } + } else if !this.CodependentAction.Equal(*that1.CodependentAction) { return false } return true @@ -231,14 +267,14 @@ func ActionFromProtoSlice(values []*ProtoAction) []*Action { // Prevent copylock errors when using ProtoDownloadAction directly type DownloadAction struct { - Artifact string - From string - To string - CacheKey string - LogSource string - User string - ChecksumAlgorithm string - ChecksumValue string + Artifact string `json:"artifact,omitempty"` + From string `json:"from"` + To string `json:"to"` + CacheKey string `json:"cache_key"` + LogSource string `json:"log_source,omitempty"` + User string `json:"user"` + ChecksumAlgorithm string `json:"checksum_algorithm,omitempty"` + ChecksumValue string `json:"checksum_value,omitempty"` } func (this *DownloadAction) Equal(that interface{}) bool { @@ -293,7 +329,9 @@ func (m *DownloadAction) GetArtifact() string { if m != nil { return m.Artifact } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetArtifact(value string) { if m != nil { @@ -304,7 +342,9 @@ func (m *DownloadAction) GetFrom() string { if m != nil { return m.From } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetFrom(value string) { if m != nil { @@ -315,7 +355,9 @@ func (m *DownloadAction) GetTo() string { if m != nil { return m.To } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetTo(value string) { if m != nil { @@ -326,7 +368,9 @@ func (m *DownloadAction) GetCacheKey() string { if m != nil { return m.CacheKey } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetCacheKey(value string) { if m != nil { @@ -337,7 +381,9 @@ func (m *DownloadAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetLogSource(value string) { if m != nil { @@ -348,7 +394,9 @@ func (m *DownloadAction) GetUser() string { if m != nil { return m.User } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetUser(value string) { if m != nil { @@ -359,7 +407,9 @@ func (m *DownloadAction) GetChecksumAlgorithm() string { if m != nil { return m.ChecksumAlgorithm } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetChecksumAlgorithm(value string) { if m != nil { @@ -370,7 +420,9 @@ func (m *DownloadAction) GetChecksumValue() string { if m != nil { return m.ChecksumValue } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DownloadAction) SetChecksumValue(value string) { if m != nil { @@ -437,11 +489,11 @@ func DownloadActionFromProtoSlice(values []*ProtoDownloadAction) []*DownloadActi // Prevent copylock errors when using ProtoUploadAction directly type UploadAction struct { - Artifact string - From string - To string - LogSource string - User string + Artifact string `json:"artifact,omitempty"` + From string `json:"from"` + To string `json:"to"` + LogSource string `json:"log_source,omitempty"` + User string `json:"user"` } func (this *UploadAction) Equal(that interface{}) bool { @@ -487,7 +539,9 @@ func (m *UploadAction) GetArtifact() string { if m != nil { return m.Artifact } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *UploadAction) SetArtifact(value string) { if m != nil { @@ -498,7 +552,9 @@ func (m *UploadAction) GetFrom() string { if m != nil { return m.From } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *UploadAction) SetFrom(value string) { if m != nil { @@ -509,7 +565,9 @@ func (m *UploadAction) GetTo() string { if m != nil { return m.To } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *UploadAction) SetTo(value string) { if m != nil { @@ -520,7 +578,9 @@ func (m *UploadAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *UploadAction) SetLogSource(value string) { if m != nil { @@ -531,7 +591,9 @@ func (m *UploadAction) GetUser() string { if m != nil { return m.User } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *UploadAction) SetUser(value string) { if m != nil { @@ -592,14 +654,14 @@ func UploadActionFromProtoSlice(values []*ProtoUploadAction) []*UploadAction { // Prevent copylock errors when using ProtoRunAction directly type RunAction struct { - Path string - Args []string - Dir string - Env []*EnvironmentVariable - ResourceLimits *ResourceLimits - User string - LogSource string - SuppressLogOutput bool + Path string `json:"path"` + Args []string `json:"args,omitempty"` + Dir string `json:"dir,omitempty"` + Env []*EnvironmentVariable `json:"env,omitempty"` + ResourceLimits *ResourceLimits `json:"resource_limits,omitempty"` + User string `json:"user"` + LogSource string `json:"log_source,omitempty"` + SuppressLogOutput bool `json:"suppress_log_output"` } func (this *RunAction) Equal(that interface{}) bool { @@ -627,7 +689,11 @@ func (this *RunAction) Equal(that interface{}) bool { if this.Path != that1.Path { return false } - if len(this.Args) != len(that1.Args) { + if this.Args == nil { + if that1.Args != nil { + return false + } + } else if len(this.Args) != len(that1.Args) { return false } for i := range this.Args { @@ -638,7 +704,11 @@ func (this *RunAction) Equal(that interface{}) bool { if this.Dir != that1.Dir { return false } - if len(this.Env) != len(that1.Env) { + if this.Env == nil { + if that1.Env != nil { + return false + } + } else if len(this.Env) != len(that1.Env) { return false } for i := range this.Env { @@ -646,7 +716,11 @@ func (this *RunAction) Equal(that interface{}) bool { return false } } - if !this.ResourceLimits.Equal(*that1.ResourceLimits) { + if this.ResourceLimits == nil { + if that1.ResourceLimits != nil { + return false + } + } else if !this.ResourceLimits.Equal(*that1.ResourceLimits) { return false } if this.User != that1.User { @@ -664,7 +738,9 @@ func (m *RunAction) GetPath() string { if m != nil { return m.Path } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RunAction) SetPath(value string) { if m != nil { @@ -686,7 +762,9 @@ func (m *RunAction) GetDir() string { if m != nil { return m.Dir } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RunAction) SetDir(value string) { if m != nil { @@ -719,7 +797,9 @@ func (m *RunAction) GetUser() string { if m != nil { return m.User } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RunAction) SetUser(value string) { if m != nil { @@ -730,7 +810,9 @@ func (m *RunAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RunAction) SetLogSource(value string) { if m != nil { @@ -741,7 +823,9 @@ func (m *RunAction) GetSuppressLogOutput() bool { if m != nil { return m.SuppressLogOutput } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *RunAction) SetSuppressLogOutput(value bool) { if m != nil { @@ -808,10 +892,10 @@ func RunActionFromProtoSlice(values []*ProtoRunAction) []*RunAction { // Prevent copylock errors when using ProtoTimeoutAction directly type TimeoutAction struct { - Action *Action - DeprecatedTimeoutNs int64 - LogSource string - TimeoutMs int64 + Action *Action `json:"action,omitempty"` + DeprecatedTimeoutNs int64 `json:"timeout,omitempty"` + LogSource string `json:"log_source,omitempty"` + TimeoutMs int64 `json:"timeout_ms"` } func (this *TimeoutAction) Equal(that interface{}) bool { @@ -836,7 +920,11 @@ func (this *TimeoutAction) Equal(that interface{}) bool { return false } - if !this.Action.Equal(*that1.Action) { + if this.Action == nil { + if that1.Action != nil { + return false + } + } else if !this.Action.Equal(*that1.Action) { return false } if this.DeprecatedTimeoutNs != that1.DeprecatedTimeoutNs { @@ -852,13 +940,13 @@ func (this *TimeoutAction) Equal(that interface{}) bool { } func (m *TimeoutAction) GetAction() *Action { if m != nil { - return m.Action.GetValue().(*Action) + return m.Action } return nil } func (m *TimeoutAction) SetAction(value *Action) { if m != nil { - m.Action.SetValue(value) + m.Action = value } } @@ -867,7 +955,9 @@ func (m *TimeoutAction) GetDeprecatedTimeoutNs() int64 { if m != nil { return m.DeprecatedTimeoutNs } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *TimeoutAction) SetDeprecatedTimeoutNs(value int64) { if m != nil { @@ -878,7 +968,9 @@ func (m *TimeoutAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TimeoutAction) SetLogSource(value string) { if m != nil { @@ -889,7 +981,9 @@ func (m *TimeoutAction) GetTimeoutMs() int64 { if m != nil { return m.TimeoutMs } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *TimeoutAction) SetTimeoutMs(value int64) { if m != nil { @@ -948,11 +1042,11 @@ func TimeoutActionFromProtoSlice(values []*ProtoTimeoutAction) []*TimeoutAction // Prevent copylock errors when using ProtoEmitProgressAction directly type EmitProgressAction struct { - Action *Action - StartMessage string - SuccessMessage string - FailureMessagePrefix string - LogSource string + Action *Action `json:"action,omitempty"` + StartMessage string `json:"start_message"` + SuccessMessage string `json:"success_message"` + FailureMessagePrefix string `json:"failure_message_prefix"` + LogSource string `json:"log_source,omitempty"` } func (this *EmitProgressAction) Equal(that interface{}) bool { @@ -977,7 +1071,11 @@ func (this *EmitProgressAction) Equal(that interface{}) bool { return false } - if !this.Action.Equal(*that1.Action) { + if this.Action == nil { + if that1.Action != nil { + return false + } + } else if !this.Action.Equal(*that1.Action) { return false } if this.StartMessage != that1.StartMessage { @@ -996,20 +1094,22 @@ func (this *EmitProgressAction) Equal(that interface{}) bool { } func (m *EmitProgressAction) GetAction() *Action { if m != nil { - return m.Action.GetValue().(*Action) + return m.Action } return nil } func (m *EmitProgressAction) SetAction(value *Action) { if m != nil { - m.Action.SetValue(value) + m.Action = value } } func (m *EmitProgressAction) GetStartMessage() string { if m != nil { return m.StartMessage } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EmitProgressAction) SetStartMessage(value string) { if m != nil { @@ -1020,7 +1120,9 @@ func (m *EmitProgressAction) GetSuccessMessage() string { if m != nil { return m.SuccessMessage } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EmitProgressAction) SetSuccessMessage(value string) { if m != nil { @@ -1031,7 +1133,9 @@ func (m *EmitProgressAction) GetFailureMessagePrefix() string { if m != nil { return m.FailureMessagePrefix } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EmitProgressAction) SetFailureMessagePrefix(value string) { if m != nil { @@ -1042,7 +1146,9 @@ func (m *EmitProgressAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EmitProgressAction) SetLogSource(value string) { if m != nil { @@ -1103,8 +1209,8 @@ func EmitProgressActionFromProtoSlice(values []*ProtoEmitProgressAction) []*Emit // Prevent copylock errors when using ProtoTryAction directly type TryAction struct { - Action *Action - LogSource string + Action *Action `json:"action,omitempty"` + LogSource string `json:"log_source,omitempty"` } func (this *TryAction) Equal(that interface{}) bool { @@ -1129,7 +1235,11 @@ func (this *TryAction) Equal(that interface{}) bool { return false } - if !this.Action.Equal(*that1.Action) { + if this.Action == nil { + if that1.Action != nil { + return false + } + } else if !this.Action.Equal(*that1.Action) { return false } if this.LogSource != that1.LogSource { @@ -1139,20 +1249,22 @@ func (this *TryAction) Equal(that interface{}) bool { } func (m *TryAction) GetAction() *Action { if m != nil { - return m.Action.GetValue().(*Action) + return m.Action } return nil } func (m *TryAction) SetAction(value *Action) { if m != nil { - m.Action.SetValue(value) + m.Action = value } } func (m *TryAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TryAction) SetLogSource(value string) { if m != nil { @@ -1207,8 +1319,8 @@ func TryActionFromProtoSlice(values []*ProtoTryAction) []*TryAction { // Prevent copylock errors when using ProtoParallelAction directly type ParallelAction struct { - Actions []*Action - LogSource string + Actions []*Action `json:"actions,omitempty"` + LogSource string `json:"log_source,omitempty"` } func (this *ParallelAction) Equal(that interface{}) bool { @@ -1233,7 +1345,11 @@ func (this *ParallelAction) Equal(that interface{}) bool { return false } - if len(this.Actions) != len(that1.Actions) { + if this.Actions == nil { + if that1.Actions != nil { + return false + } + } else if len(this.Actions) != len(that1.Actions) { return false } for i := range this.Actions { @@ -1261,7 +1377,9 @@ func (m *ParallelAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ParallelAction) SetLogSource(value string) { if m != nil { @@ -1316,8 +1434,8 @@ func ParallelActionFromProtoSlice(values []*ProtoParallelAction) []*ParallelActi // Prevent copylock errors when using ProtoSerialAction directly type SerialAction struct { - Actions []*Action - LogSource string + Actions []*Action `json:"actions,omitempty"` + LogSource string `json:"log_source,omitempty"` } func (this *SerialAction) Equal(that interface{}) bool { @@ -1342,7 +1460,11 @@ func (this *SerialAction) Equal(that interface{}) bool { return false } - if len(this.Actions) != len(that1.Actions) { + if this.Actions == nil { + if that1.Actions != nil { + return false + } + } else if len(this.Actions) != len(that1.Actions) { return false } for i := range this.Actions { @@ -1370,7 +1492,9 @@ func (m *SerialAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *SerialAction) SetLogSource(value string) { if m != nil { @@ -1425,8 +1549,8 @@ func SerialActionFromProtoSlice(values []*ProtoSerialAction) []*SerialAction { // Prevent copylock errors when using ProtoCodependentAction directly type CodependentAction struct { - Actions []*Action - LogSource string + Actions []*Action `json:"actions,omitempty"` + LogSource string `json:"log_source,omitempty"` } func (this *CodependentAction) Equal(that interface{}) bool { @@ -1451,7 +1575,11 @@ func (this *CodependentAction) Equal(that interface{}) bool { return false } - if len(this.Actions) != len(that1.Actions) { + if this.Actions == nil { + if that1.Actions != nil { + return false + } + } else if len(this.Actions) != len(that1.Actions) { return false } for i := range this.Actions { @@ -1479,7 +1607,9 @@ func (m *CodependentAction) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CodependentAction) SetLogSource(value string) { if m != nil { @@ -1534,8 +1664,8 @@ func CodependentActionFromProtoSlice(values []*ProtoCodependentAction) []*Codepe // Prevent copylock errors when using ProtoResourceLimits directly type ResourceLimits struct { - Nofile *uint64 - Nproc *uint64 + Nofile *uint64 `json:"nofile,omitempty"` + Nproc *uint64 `json:"nproc,omitempty"` } func (this *ResourceLimits) Equal(that interface{}) bool { @@ -1560,10 +1690,18 @@ func (this *ResourceLimits) Equal(that interface{}) bool { return false } - if this.Nofile != that1.Nofile { + if this.Nofile == nil { + if that1.Nofile != nil { + return false + } + } else if *this.Nofile != *that1.Nofile { return false } - if this.Nproc != that1.Nproc { + if this.Nproc == nil { + if that1.Nproc != nil { + return false + } + } else if *this.Nproc != *that1.Nproc { return false } return true @@ -1575,7 +1713,9 @@ func (m *ResourceLimits) GetNofile() *uint64 { if m != nil && m.Nofile != nil { return m.Nofile } - return nil + var defaultValue uint64 + defaultValue = 0 + return &defaultValue } func (m *ResourceLimits) SetNofile(value *uint64) { if m != nil { @@ -1591,7 +1731,9 @@ func (m *ResourceLimits) GetNproc() *uint64 { if m != nil && m.Nproc != nil { return m.Nproc } - return nil + var defaultValue uint64 + defaultValue = 0 + return &defaultValue } func (m *ResourceLimits) SetNproc(value *uint64) { if m != nil { diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index ae44aa03..46d78abc 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: actual_lrp.proto package models @@ -636,9 +636,9 @@ var File_actual_lrp_proto protoreflect.FileDescriptor var file_actual_lrp_proto_rawDesc = []byte{ 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85, 0x01, + 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x32, 0x0a, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, @@ -647,123 +647,130 @@ var file_actual_lrp_proto_rawDesc = []byte{ 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x65, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, - 0x67, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xc6, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, - 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, + 0x67, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xda, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x2b, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x70, 0x6f, - 0x72, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, - 0x12, 0x3a, 0x0a, 0x18, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x18, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x30, 0x0a, 0x13, - 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, - 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x68, 0x6f, 0x73, 0x74, 0x5f, - 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x65, - 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, - 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, - 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x5b, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, - 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, - 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, - 0x69, 0x64, 0x22, 0xf7, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2e, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, - 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x5c, 0x0a, 0x11, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, + 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, + 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, + 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x3f, 0x0a, 0x18, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, + 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x18, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, 0x73, + 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x35, 0x0a, 0x13, 0x68, + 0x6f, 0x73, 0x74, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, + 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x13, 0x68, + 0x6f, 0x73, 0x74, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, + 0x72, 0x74, 0x22, 0x74, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x12, 0x19, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1b, 0x0a, 0x06, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x65, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, + 0x86, 0x03, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x07, 0x61, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, + 0x67, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x2a, 0x0a, + 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x61, 0x0a, 0x11, 0x70, 0x72, 0x65, + 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, + 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x70, 0x72, 0x65, 0x66, 0x65, + 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x89, 0x01, 0x0a, + 0x10, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x12, 0x27, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x1a, 0x1a, + 0x82, 0x7d, 0x17, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x29, 0x0a, 0x08, 0x49, 0x4e, + 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x01, 0x1a, 0x1b, 0x82, 0x7d, 0x18, 0x50, 0x72, 0x65, + 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, 0x10, 0x02, 0x1a, + 0x17, 0x82, 0x7d, 0x14, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x48, 0x6f, 0x73, 0x74, 0x22, 0x3e, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, + 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xfb, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x47, 0x0a, 0x0e, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x06, + 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, + 0x70, 0x4b, 0x65, 0x79, 0x12, 0x60, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, + 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x54, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, + 0x66, 0x6f, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x25, 0x0a, 0x0b, + 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, + 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, + 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x05, + 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, + 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x65, + 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x70, 0x72, + 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, + 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x72, 0x65, - 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x11, 0x70, - 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x22, 0x89, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x27, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, - 0x10, 0x00, 0x1a, 0x1a, 0x82, 0x7d, 0x17, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, - 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x29, - 0x0a, 0x08, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x01, 0x1a, 0x1b, 0x82, 0x7d, - 0x18, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x48, 0x4f, 0x53, - 0x54, 0x10, 0x02, 0x1a, 0x17, 0x82, 0x7d, 0x14, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, - 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x6f, 0x73, 0x74, 0x22, 0x39, 0x0a, 0x1b, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, - 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, - 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xd6, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x44, 0x0a, 0x0e, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, - 0x3f, 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4b, 0x65, 0x79, - 0x12, 0x5d, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, - 0x51, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, - 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, - 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, - 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, - 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x28, - 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, - 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, - 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, - 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, - 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, - 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x0b, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x26, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, - 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5d, 0x0a, 0x08, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, - 0x12, 0x19, 0x0a, 0x08, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, - 0x82, 0x7d, 0x08, 0x4f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, - 0x56, 0x41, 0x43, 0x55, 0x41, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, - 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, - 0x53, 0x50, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x0a, 0x82, 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, - 0x65, 0x63, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, - 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x12, 0x24, 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, + 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, + 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5d, 0x0a, 0x08, 0x50, 0x72, + 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, + 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, 0x82, 0x7d, 0x08, 0x4f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x72, + 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, 0x56, 0x41, 0x43, 0x55, 0x41, 0x54, 0x49, 0x4e, 0x47, 0x10, + 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, + 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, 0x53, 0x50, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x0a, 0x82, + 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, 0x65, 0x63, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x6f, + 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, + 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, + 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -817,8 +824,8 @@ func file_actual_lrp_proto_init() { if File_actual_lrp_proto != nil { return } - file_modification_tag_proto_init() file_bbs_proto_init() + file_modification_tag_proto_init() if !protoimpl.UnsafeEnabled { file_actual_lrp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoActualLRPGroup); i { diff --git a/models/actual_lrp.proto b/models/actual_lrp.proto index ba6f5f3b..98618861 100644 --- a/models/actual_lrp.proto +++ b/models/actual_lrp.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; -import "modification_tag.proto"; import "bbs.proto"; +import "modification_tag.proto"; message ProtoActualLRPGroup { option deprecated = true; @@ -13,26 +13,26 @@ message ProtoActualLRPGroup { } message ProtoPortMapping { - uint32 container_port = 1 [json_name = "container_port"]; - uint32 host_port = 2 [json_name = "host_port"]; - uint32 container_tls_proxy_port = 3 [json_name = "container_tls_proxy_port"]; - uint32 host_tls_proxy_port = 4 [json_name = "host_tls_proxy_port"]; + uint32 container_port = 1 [json_name = "container_port", (bbs.bbs_json_always_emit) = true]; + uint32 host_port = 2 [json_name = "host_port", (bbs.bbs_json_always_emit) = true]; + uint32 container_tls_proxy_port = 3 [json_name = "container_tls_proxy_port", (bbs.bbs_json_always_emit) = true]; + uint32 host_tls_proxy_port = 4 [json_name = "host_tls_proxy_port", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPKey { - string process_guid = 1 [json_name = "process_guid"]; - int32 index = 2 [json_name = "index"]; - string domain = 3 [json_name = "domain"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + int32 index = 2 [json_name = "index", (bbs.bbs_json_always_emit) = true]; + string domain = 3 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPInstanceKey { - string instance_guid = 1 [json_name = "instance_guid"]; - string cell_id = 2 [json_name = "cell_id"]; + string instance_guid = 1 [json_name = "instance_guid", (bbs.bbs_json_always_emit) = true]; + string cell_id = 2 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPNetInfo { - string address = 1 [json_name = "address"]; - repeated ProtoPortMapping ports = 2 [json_name = "ports"]; + string address = 1 [json_name = "address", (bbs.bbs_json_always_emit) = true]; + repeated ProtoPortMapping ports = 2 [json_name = "ports", (bbs.bbs_json_always_emit) = true]; string instance_address = 3 [json_name = "instance_address"]; enum PreferredAddress { @@ -41,11 +41,11 @@ message ProtoActualLRPNetInfo { HOST = 2 [(bbs.bbs_enumvalue_customname) = "PreferredAddressHost"]; } - PreferredAddress preferred_address = 4 [json_name = "preferred_address"]; + PreferredAddress preferred_address = 4 [json_name = "preferred_address", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPInternalRoute { - string hostname = 1 [json_name = "hostname"]; + string hostname = 1 [json_name = "hostname", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRP { @@ -55,18 +55,18 @@ message ProtoActualLRP { SUSPECT = 2 [(bbs.bbs_enumvalue_customname) = "Suspect"]; } - ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true]; - ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true]; - int32 crash_count = 4 [json_name = "crash_count"]; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true, (bbs.bbs_json_always_emit) = true]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true, (bbs.bbs_json_always_emit) = true]; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true, (bbs.bbs_json_always_emit) = true]; + int32 crash_count = 4 [json_name = "crash_count", (bbs.bbs_json_always_emit) = true]; string crash_reason = 5 [json_name = "crash_reason"]; - string state = 6 [json_name = "state"]; + string state = 6 [json_name = "state", (bbs.bbs_json_always_emit) = true]; string placement_error = 7 [json_name = "placement_error"]; - int64 since = 8 [json_name = "since"]; - ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true]; + int64 since = 8 [json_name = "since", (bbs.bbs_json_always_emit) = true]; + ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true, (bbs.bbs_json_always_emit) = true]; Presence presence = 10 [json_name = "presence"]; repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 11; map metric_tags = 12 [json_name = "metric_tags"]; - optional bool routable = 13 [json_name = "routable"]; - string availability_zone = 14 [json_name = "availability_zone"]; + optional bool routable = 13 [json_name = "routable", (bbs.bbs_json_always_emit) = true]; + string availability_zone = 14 [json_name = "availability_zone", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index bfa411c3..3ddafb26 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: actual_lrp.proto package models @@ -12,8 +12,8 @@ import ( // Prevent copylock errors when using ProtoActualLRPGroup directly type ActualLRPGroup struct { - Instance *ActualLRP - Evacuating *ActualLRP + Instance *ActualLRP `json:"instance,omitempty"` + Evacuating *ActualLRP `json:"evacuating,omitempty"` } func (this *ActualLRPGroup) Equal(that interface{}) bool { @@ -38,10 +38,18 @@ func (this *ActualLRPGroup) Equal(that interface{}) bool { return false } - if !this.Instance.Equal(*that1.Instance) { + if this.Instance == nil { + if that1.Instance != nil { + return false + } + } else if !this.Instance.Equal(*that1.Instance) { return false } - if !this.Evacuating.Equal(*that1.Evacuating) { + if this.Evacuating == nil { + if that1.Evacuating != nil { + return false + } + } else if !this.Evacuating.Equal(*that1.Evacuating) { return false } return true @@ -116,10 +124,10 @@ func ActualLRPGroupFromProtoSlice(values []*ProtoActualLRPGroup) []*ActualLRPGro // Prevent copylock errors when using ProtoPortMapping directly type PortMapping struct { - ContainerPort uint32 - HostPort uint32 - ContainerTlsProxyPort uint32 - HostTlsProxyPort uint32 + ContainerPort uint32 `json:"container_port"` + HostPort uint32 `json:"host_port"` + ContainerTlsProxyPort uint32 `json:"container_tls_proxy_port"` + HostTlsProxyPort uint32 `json:"host_tls_proxy_port"` } func (this *PortMapping) Equal(that interface{}) bool { @@ -162,7 +170,9 @@ func (m *PortMapping) GetContainerPort() uint32 { if m != nil { return m.ContainerPort } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *PortMapping) SetContainerPort(value uint32) { if m != nil { @@ -173,7 +183,9 @@ func (m *PortMapping) GetHostPort() uint32 { if m != nil { return m.HostPort } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *PortMapping) SetHostPort(value uint32) { if m != nil { @@ -184,7 +196,9 @@ func (m *PortMapping) GetContainerTlsProxyPort() uint32 { if m != nil { return m.ContainerTlsProxyPort } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *PortMapping) SetContainerTlsProxyPort(value uint32) { if m != nil { @@ -195,7 +209,9 @@ func (m *PortMapping) GetHostTlsProxyPort() uint32 { if m != nil { return m.HostTlsProxyPort } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *PortMapping) SetHostTlsProxyPort(value uint32) { if m != nil { @@ -254,9 +270,9 @@ func PortMappingFromProtoSlice(values []*ProtoPortMapping) []*PortMapping { // Prevent copylock errors when using ProtoActualLRPKey directly type ActualLRPKey struct { - ProcessGuid string - Index int32 - Domain string + ProcessGuid string `json:"process_guid"` + Index int32 `json:"index"` + Domain string `json:"domain"` } func (this *ActualLRPKey) Equal(that interface{}) bool { @@ -296,7 +312,9 @@ func (m *ActualLRPKey) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPKey) SetProcessGuid(value string) { if m != nil { @@ -307,7 +325,9 @@ func (m *ActualLRPKey) GetIndex() int32 { if m != nil { return m.Index } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ActualLRPKey) SetIndex(value int32) { if m != nil { @@ -318,7 +338,9 @@ func (m *ActualLRPKey) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPKey) SetDomain(value string) { if m != nil { @@ -375,8 +397,8 @@ func ActualLRPKeyFromProtoSlice(values []*ProtoActualLRPKey) []*ActualLRPKey { // Prevent copylock errors when using ProtoActualLRPInstanceKey directly type ActualLRPInstanceKey struct { - InstanceGuid string - CellId string + InstanceGuid string `json:"instance_guid"` + CellId string `json:"cell_id"` } func (this *ActualLRPInstanceKey) Equal(that interface{}) bool { @@ -413,7 +435,9 @@ func (m *ActualLRPInstanceKey) GetInstanceGuid() string { if m != nil { return m.InstanceGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInstanceKey) SetInstanceGuid(value string) { if m != nil { @@ -424,7 +448,9 @@ func (m *ActualLRPInstanceKey) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInstanceKey) SetCellId(value string) { if m != nil { @@ -509,10 +535,10 @@ func (m ActualLRPNetInfo_PreferredAddress) String() string { // Prevent copylock errors when using ProtoActualLRPNetInfo directly type ActualLRPNetInfo struct { - Address string - Ports []*PortMapping - InstanceAddress string - PreferredAddress ActualLRPNetInfo_PreferredAddress + Address string `json:"address"` + Ports []*PortMapping `json:"ports"` + InstanceAddress string `json:"instance_address,omitempty"` + PreferredAddress ActualLRPNetInfo_PreferredAddress `json:"preferred_address"` } func (this *ActualLRPNetInfo) Equal(that interface{}) bool { @@ -540,7 +566,11 @@ func (this *ActualLRPNetInfo) Equal(that interface{}) bool { if this.Address != that1.Address { return false } - if len(this.Ports) != len(that1.Ports) { + if this.Ports == nil { + if that1.Ports != nil { + return false + } + } else if len(this.Ports) != len(that1.Ports) { return false } for i := range this.Ports { @@ -560,7 +590,9 @@ func (m *ActualLRPNetInfo) GetAddress() string { if m != nil { return m.Address } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPNetInfo) SetAddress(value string) { if m != nil { @@ -582,7 +614,9 @@ func (m *ActualLRPNetInfo) GetInstanceAddress() string { if m != nil { return m.InstanceAddress } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPNetInfo) SetInstanceAddress(value string) { if m != nil { @@ -593,7 +627,9 @@ func (m *ActualLRPNetInfo) GetPreferredAddress() ActualLRPNetInfo_PreferredAddre if m != nil { return m.PreferredAddress } - return 0 + var defaultValue ActualLRPNetInfo_PreferredAddress + defaultValue = 0 + return defaultValue } func (m *ActualLRPNetInfo) SetPreferredAddress(value ActualLRPNetInfo_PreferredAddress) { if m != nil { @@ -652,7 +688,7 @@ func ActualLRPNetInfoFromProtoSlice(values []*ProtoActualLRPNetInfo) []*ActualLR // Prevent copylock errors when using ProtoActualLRPInternalRoute directly type ActualLRPInternalRoute struct { - Hostname string + Hostname string `json:"hostname"` } func (this *ActualLRPInternalRoute) Equal(that interface{}) bool { @@ -686,7 +722,9 @@ func (m *ActualLRPInternalRoute) GetHostname() string { if m != nil { return m.Hostname } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInternalRoute) SetHostname(value string) { if m != nil { @@ -769,20 +807,20 @@ func (m ActualLRP_Presence) String() string { // Prevent copylock errors when using ProtoActualLRP directly type ActualLRP struct { - ActualLrpKey ActualLRPKey - ActualLrpInstanceKey ActualLRPInstanceKey - ActualLrpNetInfo ActualLRPNetInfo - CrashCount int32 - CrashReason string - State string - PlacementError string - Since int64 - ModificationTag ModificationTag - Presence ActualLRP_Presence - ActualLrpInternalRoutes []*ActualLRPInternalRoute - MetricTags map[string]string - Routable *bool - AvailabilityZone string + ActualLrpKey ActualLRPKey `json:"actualLrpKey"` + ActualLrpInstanceKey ActualLRPInstanceKey `json:"actualLrpInstanceKey"` + ActualLrpNetInfo ActualLRPNetInfo `json:"actualLrpNetInfo"` + CrashCount int32 `json:"crash_count"` + CrashReason string `json:"crash_reason,omitempty"` + State string `json:"state"` + PlacementError string `json:"placement_error,omitempty"` + Since int64 `json:"since"` + ModificationTag ModificationTag `json:"modification_tag"` + Presence ActualLRP_Presence `json:"presence,omitempty"` + ActualLrpInternalRoutes []*ActualLRPInternalRoute `json:"actualLrpInternalRoutes,omitempty"` + MetricTags map[string]string `json:"metric_tags,omitempty"` + Routable *bool `json:"routable"` + AvailabilityZone string `json:"availability_zone"` } func (this *ActualLRP) Equal(that interface{}) bool { @@ -837,7 +875,11 @@ func (this *ActualLRP) Equal(that interface{}) bool { if this.Presence != that1.Presence { return false } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + if this.ActualLrpInternalRoutes == nil { + if that1.ActualLrpInternalRoutes != nil { + return false + } + } else if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { return false } for i := range this.ActualLrpInternalRoutes { @@ -845,7 +887,11 @@ func (this *ActualLRP) Equal(that interface{}) bool { return false } } - if len(this.MetricTags) != len(that1.MetricTags) { + if this.MetricTags == nil { + if that1.MetricTags != nil { + return false + } + } else if len(this.MetricTags) != len(that1.MetricTags) { return false } for i := range this.MetricTags { @@ -853,7 +899,11 @@ func (this *ActualLRP) Equal(that interface{}) bool { return false } } - if this.Routable != that1.Routable { + if this.Routable == nil { + if that1.Routable != nil { + return false + } + } else if *this.Routable != *that1.Routable { return false } if this.AvailabilityZone != that1.AvailabilityZone { @@ -880,7 +930,9 @@ func (m *ActualLRP) GetCrashCount() int32 { if m != nil { return m.CrashCount } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ActualLRP) SetCrashCount(value int32) { if m != nil { @@ -891,7 +943,9 @@ func (m *ActualLRP) GetCrashReason() string { if m != nil { return m.CrashReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRP) SetCrashReason(value string) { if m != nil { @@ -902,7 +956,9 @@ func (m *ActualLRP) GetState() string { if m != nil { return m.State } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRP) SetState(value string) { if m != nil { @@ -913,7 +969,9 @@ func (m *ActualLRP) GetPlacementError() string { if m != nil { return m.PlacementError } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRP) SetPlacementError(value string) { if m != nil { @@ -924,7 +982,9 @@ func (m *ActualLRP) GetSince() int64 { if m != nil { return m.Since } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *ActualLRP) SetSince(value int64) { if m != nil { @@ -940,7 +1000,9 @@ func (m *ActualLRP) GetPresence() ActualLRP_Presence { if m != nil { return m.Presence } - return 0 + var defaultValue ActualLRP_Presence + defaultValue = 0 + return defaultValue } func (m *ActualLRP) SetPresence(value ActualLRP_Presence) { if m != nil { @@ -976,7 +1038,9 @@ func (m *ActualLRP) GetRoutable() *bool { if m != nil && m.Routable != nil { return m.Routable } - return nil + var defaultValue bool + defaultValue = false + return &defaultValue } func (m *ActualLRP) SetRoutable(value *bool) { if m != nil { @@ -987,7 +1051,9 @@ func (m *ActualLRP) GetAvailabilityZone() string { if m != nil { return m.AvailabilityZone } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRP) SetAvailabilityZone(value string) { if m != nil { diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index ae882293..8b54d039 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: actual_lrp_requests.proto package models @@ -856,160 +856,166 @@ var File_actual_lrp_requests_proto protoreflect.FileDescriptor var file_actual_lrp_requests_proto_rawDesc = []byte{ 0x0a, 0x19, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x4b, 0x0a, 0x1f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, - 0x97, 0x01, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4b, 0x0a, + 0x1f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4c, + 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, - 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x49, 0x0a, 0x11, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x97, 0x01, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x52, 0x11, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x73, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x1b, 0x50, 0x72, + 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x49, 0x0a, 0x11, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x11, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, + 0x3a, 0x02, 0x18, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x47, + 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x5d, 0x0a, 0x1b, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, + 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x57, 0x0a, 0x28, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x12, 0x47, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, - 0x22, 0x53, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, - 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x52, 0x0a, 0x28, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x42, 0x79, 0x50, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x6f, 0x0a, 0x2f, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x41, 0x6e, 0x64, - 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, - 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xb3, 0x01, 0x0a, 0x1a, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, - 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, - 0x22, 0xe3, 0x04, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, - 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, - 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, - 0x4f, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, - 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, + 0x70, 0x73, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x3a, + 0x02, 0x18, 0x01, 0x22, 0x79, 0x0a, 0x2f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x41, 0x6e, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, + 0x19, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xbd, + 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xe8, + 0x04, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, + 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, + 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x4f, 0x0a, + 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, + 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x63, + 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x12, 0x54, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, + 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, + 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x11, 0x61, 0x76, + 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, + 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, + 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, + 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xe7, 0x01, 0x0a, 0x1a, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x72, 0x61, 0x73, 0x68, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, + 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x13, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, - 0x12, 0x63, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x54, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x52, - 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, - 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x11, - 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, - 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, - 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xe2, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x43, 0x72, 0x61, 0x73, 0x68, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x84, 0x01, 0x0a, 0x19, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, 0x6c, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d, - 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x22, 0x60, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, - 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, + 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x22, 0x89, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, + 0x6c, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xb4, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, - 0x6d, 0x6f, 0x76, 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5b, - 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, - 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0x7d, 0x0a, 0x17, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x12, 0x38, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x16, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, - 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, - 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x05, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, - 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, - 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, + 0x60, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, + 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, + 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, + 0x79, 0x22, 0xbe, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, + 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, + 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, + 0x65, 0x79, 0x22, 0x7d, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, + 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, + 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x38, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, + 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x12, 0x1e, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x48, 0x00, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x88, 0x01, + 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1080,6 +1086,7 @@ func file_actual_lrp_requests_proto_init() { if File_actual_lrp_requests_proto != nil { return } + file_bbs_proto_init() file_actual_lrp_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { diff --git a/models/actual_lrp_requests.proto b/models/actual_lrp_requests.proto index 566ea43e..62955aaf 100644 --- a/models/actual_lrp_requests.proto +++ b/models/actual_lrp_requests.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "actual_lrp.proto"; import "error.proto"; @@ -12,58 +13,58 @@ message ProtoActualLRPLifecycleResponse { message ProtoActualLRPGroupsResponse { option deprecated = true; - ProtoError error = 1; - repeated ProtoActualLRPGroup actual_lrp_groups = 2 [json_name = "actual_lrp_groups"]; + ProtoError error = 1; + repeated ProtoActualLRPGroup actual_lrp_groups = 2 [json_name = "actual_lrp_groups"]; } message ProtoActualLRPGroupResponse { option deprecated = true; - ProtoError error = 1; - ProtoActualLRPGroup actual_lrp_group = 2 [json_name = "actual_lrp_group"]; + ProtoError error = 1; + ProtoActualLRPGroup actual_lrp_group = 2 [json_name = "actual_lrp_group"]; } message ProtoActualLRPGroupsRequest { option deprecated = true; - string domain = 1 [json_name = "domain"]; - string cell_id = 2 [json_name = "cell_id"]; + string domain = 1 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; + string cell_id = 2 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPGroupsByProcessGuidRequest { option deprecated = true; - string process_guid = 1 [json_name = "process_guid"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPGroupByProcessGuidAndIndexRequest { option deprecated = true; - string process_guid = 1 [json_name = "process_guid"]; - int32 index = 2 [json_name = "index"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + int32 index = 2 [json_name = "index", (bbs.bbs_json_always_emit) = true]; } message ProtoClaimActualLRPRequest { - string process_guid = 1 [json_name = "process_guid"]; - int32 index = 2 [json_name = "index"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + int32 index = 2 [json_name = "index", (bbs.bbs_json_always_emit) = true]; ProtoActualLRPInstanceKey actual_lrp_instance_key = 3 [json_name = "actual_lrp_instance_key"]; } message ProtoStartActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; - ProtoActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "actual_lrp_net_info"]; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [json_name = "actual_lrp_net_info"]; repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 4 [json_name = "actual_lrp_internal_routes"]; - map metric_tags = 5 [json_name = "metric_tags"]; - optional bool Routable = 6; - string availability_zone = 7 [json_name= "availability_zone"]; + map metric_tags = 5 [json_name = "metric_tags"]; + optional bool Routable = 6; + string availability_zone = 7 [json_name= "availability_zone", (bbs.bbs_json_always_emit) = true]; } message ProtoCrashActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; - string error_message = 3 [json_name = "error_message"]; + string error_message = 3 [json_name = "error_message", (bbs.bbs_json_always_emit) = true]; } message ProtoFailActualLRPRequest { - ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; - string error_message = 2 [json_name = "error_message"]; + ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; + string error_message = 2 [json_name = "error_message", (bbs.bbs_json_always_emit) = true]; } message ProtoRetireActualLRPRequest { @@ -71,20 +72,20 @@ message ProtoRetireActualLRPRequest { } message ProtoRemoveActualLRPRequest { - string process_guid = 1 [json_name = "process_guid"]; - int32 index = 2 [json_name = "index"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + int32 index = 2 [json_name = "index", (bbs.bbs_json_always_emit) = true]; ProtoActualLRPInstanceKey actual_lrp_instance_key = 3 [json_name = "actual_lrp_instance_key"]; } message ProtoActualLRPsResponse { - ProtoError error = 1; + ProtoError error = 1; repeated ProtoActualLRP actual_lrps = 2 [json_name = "actual_lrps"]; } message ProtoActualLRPsRequest { - string domain = 1 [json_name = "domain"]; - string cell_id = 2 [json_name = "cell_id"]; - string process_guid = 3 [json_name = "process_guid"]; - optional int32 index = 4 [json_name = "index"]; + string domain = 1 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; + string cell_id = 2 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; + string process_guid = 3 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + optional int32 index = 4 [json_name = "index", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index fd5b4fd3..f33e3ae7 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: actual_lrp_requests.proto package models // Prevent copylock errors when using ProtoActualLRPLifecycleResponse directly type ActualLRPLifecycleResponse struct { - Error *Error + Error *Error `json:"error,omitempty"` } func (this *ActualLRPLifecycleResponse) Equal(that interface{}) bool { @@ -33,7 +33,11 @@ func (this *ActualLRPLifecycleResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } return true @@ -95,8 +99,8 @@ func ActualLRPLifecycleResponseFromProtoSlice(values []*ProtoActualLRPLifecycleR // Prevent copylock errors when using ProtoActualLRPGroupsResponse directly type ActualLRPGroupsResponse struct { - Error *Error - ActualLrpGroups []*ActualLRPGroup + Error *Error `json:"error,omitempty"` + ActualLrpGroups []*ActualLRPGroup `json:"actual_lrp_groups,omitempty"` } func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { @@ -121,10 +125,18 @@ func (this *ActualLRPGroupsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if len(this.ActualLrpGroups) != len(that1.ActualLrpGroups) { + if this.ActualLrpGroups == nil { + if that1.ActualLrpGroups != nil { + return false + } + } else if len(this.ActualLrpGroups) != len(that1.ActualLrpGroups) { return false } for i := range this.ActualLrpGroups { @@ -204,8 +216,8 @@ func ActualLRPGroupsResponseFromProtoSlice(values []*ProtoActualLRPGroupsRespons // Prevent copylock errors when using ProtoActualLRPGroupResponse directly type ActualLRPGroupResponse struct { - Error *Error - ActualLrpGroup *ActualLRPGroup + Error *Error `json:"error,omitempty"` + ActualLrpGroup *ActualLRPGroup `json:"actual_lrp_group,omitempty"` } func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { @@ -230,10 +242,18 @@ func (this *ActualLRPGroupResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { + if this.ActualLrpGroup == nil { + if that1.ActualLrpGroup != nil { + return false + } + } else if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { return false } return true @@ -308,8 +328,8 @@ func ActualLRPGroupResponseFromProtoSlice(values []*ProtoActualLRPGroupResponse) // Prevent copylock errors when using ProtoActualLRPGroupsRequest directly type ActualLRPGroupsRequest struct { - Domain string - CellId string + Domain string `json:"domain"` + CellId string `json:"cell_id"` } func (this *ActualLRPGroupsRequest) Equal(that interface{}) bool { @@ -346,7 +366,9 @@ func (m *ActualLRPGroupsRequest) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPGroupsRequest) SetDomain(value string) { if m != nil { @@ -357,7 +379,9 @@ func (m *ActualLRPGroupsRequest) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPGroupsRequest) SetCellId(value string) { if m != nil { @@ -412,7 +436,7 @@ func ActualLRPGroupsRequestFromProtoSlice(values []*ProtoActualLRPGroupsRequest) // Prevent copylock errors when using ProtoActualLRPGroupsByProcessGuidRequest directly type ActualLRPGroupsByProcessGuidRequest struct { - ProcessGuid string + ProcessGuid string `json:"process_guid"` } func (this *ActualLRPGroupsByProcessGuidRequest) Equal(that interface{}) bool { @@ -446,7 +470,9 @@ func (m *ActualLRPGroupsByProcessGuidRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPGroupsByProcessGuidRequest) SetProcessGuid(value string) { if m != nil { @@ -499,8 +525,8 @@ func ActualLRPGroupsByProcessGuidRequestFromProtoSlice(values []*ProtoActualLRPG // Prevent copylock errors when using ProtoActualLRPGroupByProcessGuidAndIndexRequest directly type ActualLRPGroupByProcessGuidAndIndexRequest struct { - ProcessGuid string - Index int32 + ProcessGuid string `json:"process_guid"` + Index int32 `json:"index"` } func (this *ActualLRPGroupByProcessGuidAndIndexRequest) Equal(that interface{}) bool { @@ -537,7 +563,9 @@ func (m *ActualLRPGroupByProcessGuidAndIndexRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPGroupByProcessGuidAndIndexRequest) SetProcessGuid(value string) { if m != nil { @@ -548,7 +576,9 @@ func (m *ActualLRPGroupByProcessGuidAndIndexRequest) GetIndex() int32 { if m != nil { return m.Index } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ActualLRPGroupByProcessGuidAndIndexRequest) SetIndex(value int32) { if m != nil { @@ -603,9 +633,9 @@ func ActualLRPGroupByProcessGuidAndIndexRequestFromProtoSlice(values []*ProtoAct // Prevent copylock errors when using ProtoClaimActualLRPRequest directly type ClaimActualLRPRequest struct { - ProcessGuid string - Index int32 - ActualLrpInstanceKey *ActualLRPInstanceKey + ProcessGuid string `json:"process_guid"` + Index int32 `json:"index"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` } func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { @@ -636,7 +666,11 @@ func (this *ClaimActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -645,7 +679,9 @@ func (m *ClaimActualLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ClaimActualLRPRequest) SetProcessGuid(value string) { if m != nil { @@ -656,7 +692,9 @@ func (m *ClaimActualLRPRequest) GetIndex() int32 { if m != nil { return m.Index } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ClaimActualLRPRequest) SetIndex(value int32) { if m != nil { @@ -724,13 +762,13 @@ func ClaimActualLRPRequestFromProtoSlice(values []*ProtoClaimActualLRPRequest) [ // Prevent copylock errors when using ProtoStartActualLRPRequest directly type StartActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ActualLrpNetInfo *ActualLRPNetInfo - ActualLrpInternalRoutes []*ActualLRPInternalRoute - MetricTags map[string]string - Routable *bool - AvailabilityZone string + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` + ActualLrpNetInfo *ActualLRPNetInfo `json:"actual_lrp_net_info,omitempty"` + ActualLrpInternalRoutes []*ActualLRPInternalRoute `json:"actual_lrp_internal_routes,omitempty"` + MetricTags map[string]string `json:"metric_tags,omitempty"` + Routable *bool `json:"Routable,omitempty"` + AvailabilityZone string `json:"availability_zone"` } func (this *StartActualLRPRequest) Equal(that interface{}) bool { @@ -755,16 +793,32 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { + if this.ActualLrpNetInfo == nil { + if that1.ActualLrpNetInfo != nil { + return false + } + } else if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { return false } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + if this.ActualLrpInternalRoutes == nil { + if that1.ActualLrpInternalRoutes != nil { + return false + } + } else if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { return false } for i := range this.ActualLrpInternalRoutes { @@ -772,7 +826,11 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { return false } } - if len(this.MetricTags) != len(that1.MetricTags) { + if this.MetricTags == nil { + if that1.MetricTags != nil { + return false + } + } else if len(this.MetricTags) != len(that1.MetricTags) { return false } for i := range this.MetricTags { @@ -780,7 +838,11 @@ func (this *StartActualLRPRequest) Equal(that interface{}) bool { return false } } - if this.Routable != that1.Routable { + if this.Routable == nil { + if that1.Routable != nil { + return false + } + } else if *this.Routable != *that1.Routable { return false } if this.AvailabilityZone != that1.AvailabilityZone { @@ -850,7 +912,9 @@ func (m *StartActualLRPRequest) GetRoutable() *bool { if m != nil && m.Routable != nil { return m.Routable } - return nil + var defaultValue bool + defaultValue = false + return &defaultValue } func (m *StartActualLRPRequest) SetRoutable(value *bool) { if m != nil { @@ -861,7 +925,9 @@ func (m *StartActualLRPRequest) GetAvailabilityZone() string { if m != nil { return m.AvailabilityZone } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *StartActualLRPRequest) SetAvailabilityZone(value string) { if m != nil { @@ -926,9 +992,9 @@ func StartActualLRPRequestFromProtoSlice(values []*ProtoStartActualLRPRequest) [ // Prevent copylock errors when using ProtoCrashActualLRPRequest directly type CrashActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ErrorMessage string + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` + ErrorMessage string `json:"error_message"` } func (this *CrashActualLRPRequest) Equal(that interface{}) bool { @@ -953,10 +1019,18 @@ func (this *CrashActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -990,7 +1064,9 @@ func (m *CrashActualLRPRequest) GetErrorMessage() string { if m != nil { return m.ErrorMessage } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CrashActualLRPRequest) SetErrorMessage(value string) { if m != nil { @@ -1047,8 +1123,8 @@ func CrashActualLRPRequestFromProtoSlice(values []*ProtoCrashActualLRPRequest) [ // Prevent copylock errors when using ProtoFailActualLRPRequest directly type FailActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ErrorMessage string + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ErrorMessage string `json:"error_message"` } func (this *FailActualLRPRequest) Equal(that interface{}) bool { @@ -1073,7 +1149,11 @@ func (this *FailActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -1096,7 +1176,9 @@ func (m *FailActualLRPRequest) GetErrorMessage() string { if m != nil { return m.ErrorMessage } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *FailActualLRPRequest) SetErrorMessage(value string) { if m != nil { @@ -1151,7 +1233,7 @@ func FailActualLRPRequestFromProtoSlice(values []*ProtoFailActualLRPRequest) []* // Prevent copylock errors when using ProtoRetireActualLRPRequest directly type RetireActualLRPRequest struct { - ActualLrpKey *ActualLRPKey + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` } func (this *RetireActualLRPRequest) Equal(that interface{}) bool { @@ -1176,7 +1258,11 @@ func (this *RetireActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } return true @@ -1238,9 +1324,9 @@ func RetireActualLRPRequestFromProtoSlice(values []*ProtoRetireActualLRPRequest) // Prevent copylock errors when using ProtoRemoveActualLRPRequest directly type RemoveActualLRPRequest struct { - ProcessGuid string - Index int32 - ActualLrpInstanceKey *ActualLRPInstanceKey + ProcessGuid string `json:"process_guid"` + Index int32 `json:"index"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` } func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { @@ -1271,7 +1357,11 @@ func (this *RemoveActualLRPRequest) Equal(that interface{}) bool { if this.Index != that1.Index { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -1280,7 +1370,9 @@ func (m *RemoveActualLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RemoveActualLRPRequest) SetProcessGuid(value string) { if m != nil { @@ -1291,7 +1383,9 @@ func (m *RemoveActualLRPRequest) GetIndex() int32 { if m != nil { return m.Index } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *RemoveActualLRPRequest) SetIndex(value int32) { if m != nil { @@ -1359,8 +1453,8 @@ func RemoveActualLRPRequestFromProtoSlice(values []*ProtoRemoveActualLRPRequest) // Prevent copylock errors when using ProtoActualLRPsResponse directly type ActualLRPsResponse struct { - Error *Error - ActualLrps []*ActualLRP + Error *Error `json:"error,omitempty"` + ActualLrps []*ActualLRP `json:"actual_lrps,omitempty"` } func (this *ActualLRPsResponse) Equal(that interface{}) bool { @@ -1385,10 +1479,18 @@ func (this *ActualLRPsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if len(this.ActualLrps) != len(that1.ActualLrps) { + if this.ActualLrps == nil { + if that1.ActualLrps != nil { + return false + } + } else if len(this.ActualLrps) != len(that1.ActualLrps) { return false } for i := range this.ActualLrps { @@ -1468,10 +1570,10 @@ func ActualLRPsResponseFromProtoSlice(values []*ProtoActualLRPsResponse) []*Actu // Prevent copylock errors when using ProtoActualLRPsRequest directly type ActualLRPsRequest struct { - Domain string - CellId string - ProcessGuid string - Index *int32 + Domain string `json:"domain"` + CellId string `json:"cell_id"` + ProcessGuid string `json:"process_guid"` + Index *int32 `json:"index"` } func (this *ActualLRPsRequest) Equal(that interface{}) bool { @@ -1505,7 +1607,11 @@ func (this *ActualLRPsRequest) Equal(that interface{}) bool { if this.ProcessGuid != that1.ProcessGuid { return false } - if this.Index != that1.Index { + if this.Index == nil { + if that1.Index != nil { + return false + } + } else if *this.Index != *that1.Index { return false } return true @@ -1514,7 +1620,9 @@ func (m *ActualLRPsRequest) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPsRequest) SetDomain(value string) { if m != nil { @@ -1525,7 +1633,9 @@ func (m *ActualLRPsRequest) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPsRequest) SetCellId(value string) { if m != nil { @@ -1536,7 +1646,9 @@ func (m *ActualLRPsRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPsRequest) SetProcessGuid(value string) { if m != nil { @@ -1550,7 +1662,9 @@ func (m *ActualLRPsRequest) GetIndex() *int32 { if m != nil && m.Index != nil { return m.Index } - return nil + var defaultValue int32 + defaultValue = 0 + return &defaultValue } func (m *ActualLRPsRequest) SetIndex(value *int32) { if m != nil { diff --git a/models/bbs.pb.go b/models/bbs.pb.go index b21985b9..977b0aaf 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: bbs.proto package models @@ -23,10 +23,10 @@ const ( var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ { ExtendedType: (*descriptorpb.FieldOptions)(nil), - ExtensionType: (*string)(nil), + ExtensionType: (*bool)(nil), Field: 1000, - Name: "bbs.bbs_json_name", - Tag: "bytes,1000,opt,name=bbs_json_name", + Name: "bbs.bbs_json_always_emit", + Tag: "varint,1000,opt,name=bbs_json_always_emit", Filename: "bbs.proto", }, { @@ -45,6 +45,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "varint,1020,opt,name=bbs_exclude_from_equal", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1030, + Name: "bbs.bbs_custom_type", + Tag: "bytes,1030,opt,name=bbs_custom_type", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -57,18 +65,20 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ // Extension fields to descriptorpb.FieldOptions. var ( - // optional string bbs_json_name = 1000; - E_BbsJsonName = &file_bbs_proto_extTypes[0] + // optional bool bbs_json_always_emit = 1000; + E_BbsJsonAlwaysEmit = &file_bbs_proto_extTypes[0] // optional bool bbs_by_value = 1010; E_BbsByValue = &file_bbs_proto_extTypes[1] // optional bool bbs_exclude_from_equal = 1020; E_BbsExcludeFromEqual = &file_bbs_proto_extTypes[2] + // optional string bbs_custom_type = 1030; + E_BbsCustomType = &file_bbs_proto_extTypes[3] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[3] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[4] ) var File_bbs_proto protoreflect.FileDescriptor @@ -77,30 +87,35 @@ var file_bbs_proto_rawDesc = []byte{ 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x3a, 0x45, 0x0a, 0x0d, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x62, 0x73, 0x4a, 0x73, - 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, - 0x5f, 0x62, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, - 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0a, 0x62, 0x62, 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, - 0x0a, 0x16, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, - 0x6f, 0x6d, 0x5f, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, - 0x62, 0x62, 0x73, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, - 0x75, 0x61, 0x6c, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, - 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, - 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x3a, 0x52, 0x0a, 0x14, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x61, + 0x6c, 0x77, 0x61, 0x79, 0x73, 0x5f, 0x65, 0x6d, 0x69, 0x74, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, + 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x11, 0x62, 0x62, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x45, + 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, 0x5f, 0x62, 0x79, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x62, 0x62, + 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, 0x0a, 0x16, 0x62, + 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, + 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x62, 0x62, 0x73, + 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, 0x75, 0x61, 0x6c, + 0x88, 0x01, 0x01, 0x3a, 0x49, 0x0a, 0x0f, 0x62, 0x62, 0x73, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x62, + 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, + 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, + 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, + 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, + 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, + 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_bbs_proto_goTypes = []interface{}{ @@ -108,14 +123,15 @@ var file_bbs_proto_goTypes = []interface{}{ (*descriptorpb.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions } var file_bbs_proto_depIdxs = []int32{ - 0, // 0: bbs.bbs_json_name:extendee -> google.protobuf.FieldOptions + 0, // 0: bbs.bbs_json_always_emit:extendee -> google.protobuf.FieldOptions 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions 0, // 2: bbs.bbs_exclude_from_equal:extendee -> google.protobuf.FieldOptions - 1, // 3: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 0, // [0:4] is the sub-list for extension extendee + 0, // 3: bbs.bbs_custom_type:extendee -> google.protobuf.FieldOptions + 1, // 4: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 0, // [0:5] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -131,7 +147,7 @@ func file_bbs_proto_init() { RawDescriptor: file_bbs_proto_rawDesc, NumEnums: 0, NumMessages: 0, - NumExtensions: 4, + NumExtensions: 5, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 260771f8..1c91c32f 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: cached_dependency.proto package models @@ -120,24 +120,26 @@ var File_cached_dependency_proto protoreflect.FileDescriptor var file_cached_dependency_proto_rawDesc = []byte{ 0x0a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x22, 0xe5, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, - 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, - 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x74, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, - 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, - 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, - 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, - 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, - 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, + 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, + 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x17, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x13, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x21, 0x0a, + 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, + 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, + 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, + 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, + 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, + 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, + 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -169,6 +171,7 @@ func file_cached_dependency_proto_init() { if File_cached_dependency_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_cached_dependency_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoCachedDependency); i { diff --git a/models/cached_dependency.proto b/models/cached_dependency.proto index a2ff4204..57c50848 100644 --- a/models/cached_dependency.proto +++ b/models/cached_dependency.proto @@ -3,12 +3,14 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; + message ProtoCachedDependency { - string name = 1 [json_name = "name"]; - string from = 2 [json_name = "from"]; - string to = 3 [json_name = "to"]; - string cache_key = 4 [json_name = "cache_key"]; - string log_source = 5 [json_name = "log_source"]; + string name = 1 [json_name = "name", (bbs.bbs_json_always_emit) = true]; + string from = 2 [json_name = "from", (bbs.bbs_json_always_emit) = true]; + string to = 3 [json_name = "to", (bbs.bbs_json_always_emit) = true]; + string cache_key = 4 [json_name = "cache_key", (bbs.bbs_json_always_emit) = true]; + string log_source = 5 [json_name = "log_source", (bbs.bbs_json_always_emit) = true]; string checksum_algorithm = 6 [json_name = "checksum_algorithm"]; - string checksum_value = 7 [json_name = "checksum_value"]; + string checksum_value = 7 [json_name = "checksum_value"]; } diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 8450d213..7a275cd4 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,20 +1,20 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: cached_dependency.proto package models // Prevent copylock errors when using ProtoCachedDependency directly type CachedDependency struct { - Name string - From string - To string - CacheKey string - LogSource string - ChecksumAlgorithm string - ChecksumValue string + Name string `json:"name"` + From string `json:"from"` + To string `json:"to"` + CacheKey string `json:"cache_key"` + LogSource string `json:"log_source"` + ChecksumAlgorithm string `json:"checksum_algorithm,omitempty"` + ChecksumValue string `json:"checksum_value,omitempty"` } func (this *CachedDependency) Equal(that interface{}) bool { @@ -66,7 +66,9 @@ func (m *CachedDependency) GetName() string { if m != nil { return m.Name } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CachedDependency) SetName(value string) { if m != nil { @@ -77,7 +79,9 @@ func (m *CachedDependency) GetFrom() string { if m != nil { return m.From } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CachedDependency) SetFrom(value string) { if m != nil { @@ -88,7 +92,9 @@ func (m *CachedDependency) GetTo() string { if m != nil { return m.To } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CachedDependency) SetTo(value string) { if m != nil { @@ -99,7 +105,9 @@ func (m *CachedDependency) GetCacheKey() string { if m != nil { return m.CacheKey } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CachedDependency) SetCacheKey(value string) { if m != nil { @@ -110,7 +118,9 @@ func (m *CachedDependency) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CachedDependency) SetLogSource(value string) { if m != nil { @@ -121,7 +131,9 @@ func (m *CachedDependency) GetChecksumAlgorithm() string { if m != nil { return m.ChecksumAlgorithm } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CachedDependency) SetChecksumAlgorithm(value string) { if m != nil { @@ -132,7 +144,9 @@ func (m *CachedDependency) GetChecksumValue() string { if m != nil { return m.ChecksumValue } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CachedDependency) SetChecksumValue(value string) { if m != nil { diff --git a/models/cells.pb.go b/models/cells.pb.go index 21a754d7..cefcf470 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: cells.proto package models @@ -300,51 +300,54 @@ var File_cells_proto protoreflect.FileDescriptor var file_cells_proto_rawDesc = []byte{ 0x0a, 0x0b, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x6b, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x43, - 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, - 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, - 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, - 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x22, - 0xdd, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, - 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, - 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x12, 0x0a, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, - 0x74, 0x79, 0x52, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x45, 0x0a, 0x10, - 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, - 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x14, 0x72, - 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x6c, - 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x38, 0x0a, 0x17, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x22, - 0x43, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, - 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2f, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x05, - 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, - 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7a, 0x0a, + 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, + 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, + 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, + 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, + 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x22, 0xf1, 0x02, 0x0a, 0x11, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, + 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x25, + 0x0a, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x35, + 0x0a, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x65, 0x6c, 0x6c, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x52, 0x08, 0x63, 0x61, 0x70, + 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x45, 0x0a, 0x10, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, + 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, + 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x14, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, 0x70, + 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0e, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x74, 0x61, 0x67, 0x73, 0x12, 0x38, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, + 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, + 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1d, + 0x0a, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x22, 0x48, 0x0a, + 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x17, + 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, + 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, + 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2f, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, + 0x65, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, + 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -384,6 +387,7 @@ func file_cells_proto_init() { if File_cells_proto != nil { return } + file_bbs_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { file_cells_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { diff --git a/models/cells.proto b/models/cells.proto index c043e3cd..6d8d6a52 100644 --- a/models/cells.proto +++ b/models/cells.proto @@ -3,27 +3,28 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "error.proto"; message ProtoCellCapacity { - int32 memory_mb = 1 [json_name = "memory_mb"]; - int32 disk_mb = 2 [json_name = "disk_mb"]; - int32 containers = 3 [json_name = "containers"]; + int32 memory_mb = 1 [json_name = "memory_mb", (bbs.bbs_json_always_emit) = true]; + int32 disk_mb = 2 [json_name = "disk_mb", (bbs.bbs_json_always_emit) = true]; + int32 containers = 3 [json_name = "containers", (bbs.bbs_json_always_emit) = true]; } message ProtoCellPresence { - string cell_id = 1 [json_name = "cell_id"]; - string rep_address = 2 [json_name = "rep_address"]; - string zone = 3 [json_name = "zone"]; + string cell_id = 1 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; + string rep_address = 2 [json_name = "rep_address", (bbs.bbs_json_always_emit) = true]; + string zone = 3 [json_name = "zone", (bbs.bbs_json_always_emit) = true]; ProtoCellCapacity capacity = 4; repeated ProtoProvider rootfs_providers = 5 [json_name = "rootfs_provider_list"]; repeated string placement_tags = 6 [json_name = "placement_tags"]; repeated string optional_placement_tags = 7 [json_name = "optional_placement_tags"]; - string rep_url = 8 [json_name = "rep_url"]; + string rep_url = 8 [json_name = "rep_url", (bbs.bbs_json_always_emit) = true]; } message ProtoProvider { - string name = 1 [json_name = "name"]; + string name = 1 [json_name = "name", (bbs.bbs_json_always_emit) = true]; repeated string properties = 2; } diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index e25e779c..a73d9e4d 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: cells.proto package models // Prevent copylock errors when using ProtoCellCapacity directly type CellCapacity struct { - MemoryMb int32 - DiskMb int32 - Containers int32 + MemoryMb int32 `json:"memory_mb"` + DiskMb int32 `json:"disk_mb"` + Containers int32 `json:"containers"` } func (this *CellCapacity) Equal(that interface{}) bool { @@ -50,7 +50,9 @@ func (m *CellCapacity) GetMemoryMb() int32 { if m != nil { return m.MemoryMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *CellCapacity) SetMemoryMb(value int32) { if m != nil { @@ -61,7 +63,9 @@ func (m *CellCapacity) GetDiskMb() int32 { if m != nil { return m.DiskMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *CellCapacity) SetDiskMb(value int32) { if m != nil { @@ -72,7 +76,9 @@ func (m *CellCapacity) GetContainers() int32 { if m != nil { return m.Containers } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *CellCapacity) SetContainers(value int32) { if m != nil { @@ -129,14 +135,14 @@ func CellCapacityFromProtoSlice(values []*ProtoCellCapacity) []*CellCapacity { // Prevent copylock errors when using ProtoCellPresence directly type CellPresence struct { - CellId string - RepAddress string - Zone string - Capacity *CellCapacity - RootfsProviders []*Provider - PlacementTags []string - OptionalPlacementTags []string - RepUrl string + CellId string `json:"cell_id"` + RepAddress string `json:"rep_address"` + Zone string `json:"zone"` + Capacity *CellCapacity `json:"capacity,omitempty"` + RootfsProviders []*Provider `json:"rootfs_provider_list,omitempty"` + PlacementTags []string `json:"placement_tags,omitempty"` + OptionalPlacementTags []string `json:"optional_placement_tags,omitempty"` + RepUrl string `json:"rep_url"` } func (this *CellPresence) Equal(that interface{}) bool { @@ -170,10 +176,18 @@ func (this *CellPresence) Equal(that interface{}) bool { if this.Zone != that1.Zone { return false } - if !this.Capacity.Equal(*that1.Capacity) { + if this.Capacity == nil { + if that1.Capacity != nil { + return false + } + } else if !this.Capacity.Equal(*that1.Capacity) { return false } - if len(this.RootfsProviders) != len(that1.RootfsProviders) { + if this.RootfsProviders == nil { + if that1.RootfsProviders != nil { + return false + } + } else if len(this.RootfsProviders) != len(that1.RootfsProviders) { return false } for i := range this.RootfsProviders { @@ -181,7 +195,11 @@ func (this *CellPresence) Equal(that interface{}) bool { return false } } - if len(this.PlacementTags) != len(that1.PlacementTags) { + if this.PlacementTags == nil { + if that1.PlacementTags != nil { + return false + } + } else if len(this.PlacementTags) != len(that1.PlacementTags) { return false } for i := range this.PlacementTags { @@ -189,7 +207,11 @@ func (this *CellPresence) Equal(that interface{}) bool { return false } } - if len(this.OptionalPlacementTags) != len(that1.OptionalPlacementTags) { + if this.OptionalPlacementTags == nil { + if that1.OptionalPlacementTags != nil { + return false + } + } else if len(this.OptionalPlacementTags) != len(that1.OptionalPlacementTags) { return false } for i := range this.OptionalPlacementTags { @@ -206,7 +228,9 @@ func (m *CellPresence) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CellPresence) SetCellId(value string) { if m != nil { @@ -217,7 +241,9 @@ func (m *CellPresence) GetRepAddress() string { if m != nil { return m.RepAddress } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CellPresence) SetRepAddress(value string) { if m != nil { @@ -228,7 +254,9 @@ func (m *CellPresence) GetZone() string { if m != nil { return m.Zone } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CellPresence) SetZone(value string) { if m != nil { @@ -283,7 +311,9 @@ func (m *CellPresence) GetRepUrl() string { if m != nil { return m.RepUrl } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CellPresence) SetRepUrl(value string) { if m != nil { @@ -350,8 +380,8 @@ func CellPresenceFromProtoSlice(values []*ProtoCellPresence) []*CellPresence { // Prevent copylock errors when using ProtoProvider directly type Provider struct { - Name string - Properties []string + Name string `json:"name"` + Properties []string `json:"properties,omitempty"` } func (this *Provider) Equal(that interface{}) bool { @@ -379,7 +409,11 @@ func (this *Provider) Equal(that interface{}) bool { if this.Name != that1.Name { return false } - if len(this.Properties) != len(that1.Properties) { + if this.Properties == nil { + if that1.Properties != nil { + return false + } + } else if len(this.Properties) != len(that1.Properties) { return false } for i := range this.Properties { @@ -393,7 +427,9 @@ func (m *Provider) GetName() string { if m != nil { return m.Name } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Provider) SetName(value string) { if m != nil { @@ -459,8 +495,8 @@ func ProviderFromProtoSlice(values []*ProtoProvider) []*Provider { // Prevent copylock errors when using ProtoCellsResponse directly type CellsResponse struct { - Error *Error - Cells []*CellPresence + Error *Error `json:"error,omitempty"` + Cells []*CellPresence `json:"cells,omitempty"` } func (this *CellsResponse) Equal(that interface{}) bool { @@ -485,10 +521,18 @@ func (this *CellsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if len(this.Cells) != len(that1.Cells) { + if this.Cells == nil { + if that1.Cells != nil { + return false + } + } else if len(this.Cells) != len(that1.Cells) { return false } for i := range this.Cells { diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 2493c1f8..1eb08966 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: certificate_properties.proto package models diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 78eb7fff..74f3febb 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: certificate_properties.proto package models // Prevent copylock errors when using ProtoCertificateProperties directly type CertificateProperties struct { - OrganizationalUnit []string + OrganizationalUnit []string `json:"organizational_unit,omitempty"` } func (this *CertificateProperties) Equal(that interface{}) bool { @@ -33,7 +33,11 @@ func (this *CertificateProperties) Equal(that interface{}) bool { return false } - if len(this.OrganizationalUnit) != len(that1.OrganizationalUnit) { + if this.OrganizationalUnit == nil { + if that1.OrganizationalUnit != nil { + return false + } + } else if len(this.OrganizationalUnit) != len(that1.OrganizationalUnit) { return false } for i := range this.OrganizationalUnit { diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 6faf7ec2..40d15ce2 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: check_definition.proto package models @@ -279,12 +279,13 @@ var File_check_definition_proto protoreflect.FileDescriptor var file_check_definition_proto_rawDesc = []byte{ 0x0a, 0x16, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x22, 0xa2, 0x01, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x63, 0x68, 0x65, - 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x06, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7, 0x01, 0x0a, 0x14, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x06, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, + 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x10, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, @@ -297,25 +298,26 @@ var file_check_definition_proto_rawDesc = []byte{ 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x22, 0x75, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, - 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, - 0x6c, 0x5f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x22, 0x8a, 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, - 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, - 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, - 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x12, - 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, - 0x74, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, - 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, - 0x6c, 0x5f, 0x6d, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, - 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, - 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x7a, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, + 0x6b, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x6f, + 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, + 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x22, 0x94, 0x01, 0x0a, + 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, + 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, + 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, + 0x5f, 0x6d, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, + 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, + 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -354,6 +356,7 @@ func file_check_definition_proto_init() { if File_check_definition_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_check_definition_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoCheckDefinition); i { diff --git a/models/check_definition.proto b/models/check_definition.proto index c50908a9..56aebf07 100644 --- a/models/check_definition.proto +++ b/models/check_definition.proto @@ -4,30 +4,31 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; message ProtoCheckDefinition { - repeated ProtoCheck checks = 1; - string log_source = 2 [json_name = "log_source"]; - repeated ProtoCheck readiness_checks = 3 [json_name = "readiness_checks"]; + repeated ProtoCheck checks = 1; + string log_source = 2 [json_name = "log_source", (bbs.bbs_json_always_emit) = true]; + repeated ProtoCheck readiness_checks = 3 [json_name = "readiness_checks"]; } message ProtoCheck { // oneof is hard to use right now, instead we can do this check in validation // oneof check { - ProtoTCPCheck tcp_check = 1 [json_name = "tcp_check"]; + ProtoTCPCheck tcp_check = 1 [json_name = "tcp_check"]; ProtoHTTPCheck http_check = 2 [json_name = "http_check"]; // } } message ProtoTCPCheck { - uint32 port = 1 [json_name = "port"]; + uint32 port = 1 [json_name = "port", (bbs.bbs_json_always_emit) = true]; uint64 connect_timeout_ms = 2 [json_name = "connect_timeout_ms"]; - uint64 interval_ms = 3 [json_name = "interval_ms"]; + uint64 interval_ms = 3 [json_name = "interval_ms"]; } message ProtoHTTPCheck { - uint32 port = 1 [json_name = "port"]; + uint32 port = 1 [json_name = "port", (bbs.bbs_json_always_emit) = true]; uint64 request_timeout_ms = 2 [json_name = "request_timeout_ms"]; - string path = 3 [json_name = "path"]; - uint64 interval_ms = 4 [json_name = "interval_ms"]; + string path = 3 [json_name = "path", (bbs.bbs_json_always_emit) = true]; + uint64 interval_ms = 4 [json_name = "interval_ms"]; } diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index c237db84..f3db3646 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: check_definition.proto package models // Prevent copylock errors when using ProtoCheckDefinition directly type CheckDefinition struct { - Checks []*Check - LogSource string - ReadinessChecks []*Check + Checks []*Check `json:"checks,omitempty"` + LogSource string `json:"log_source"` + ReadinessChecks []*Check `json:"readiness_checks,omitempty"` } func (this *CheckDefinition) Equal(that interface{}) bool { @@ -35,7 +35,11 @@ func (this *CheckDefinition) Equal(that interface{}) bool { return false } - if len(this.Checks) != len(that1.Checks) { + if this.Checks == nil { + if that1.Checks != nil { + return false + } + } else if len(this.Checks) != len(that1.Checks) { return false } for i := range this.Checks { @@ -46,7 +50,11 @@ func (this *CheckDefinition) Equal(that interface{}) bool { if this.LogSource != that1.LogSource { return false } - if len(this.ReadinessChecks) != len(that1.ReadinessChecks) { + if this.ReadinessChecks == nil { + if that1.ReadinessChecks != nil { + return false + } + } else if len(this.ReadinessChecks) != len(that1.ReadinessChecks) { return false } for i := range this.ReadinessChecks { @@ -71,7 +79,9 @@ func (m *CheckDefinition) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CheckDefinition) SetLogSource(value string) { if m != nil { @@ -139,8 +149,8 @@ func CheckDefinitionFromProtoSlice(values []*ProtoCheckDefinition) []*CheckDefin // Prevent copylock errors when using ProtoCheck directly type Check struct { - TcpCheck *TCPCheck - HttpCheck *HTTPCheck + TcpCheck *TCPCheck `json:"tcp_check,omitempty"` + HttpCheck *HTTPCheck `json:"http_check,omitempty"` } func (this *Check) Equal(that interface{}) bool { @@ -165,10 +175,18 @@ func (this *Check) Equal(that interface{}) bool { return false } - if !this.TcpCheck.Equal(*that1.TcpCheck) { + if this.TcpCheck == nil { + if that1.TcpCheck != nil { + return false + } + } else if !this.TcpCheck.Equal(*that1.TcpCheck) { return false } - if !this.HttpCheck.Equal(*that1.HttpCheck) { + if this.HttpCheck == nil { + if that1.HttpCheck != nil { + return false + } + } else if !this.HttpCheck.Equal(*that1.HttpCheck) { return false } return true @@ -243,9 +261,9 @@ func CheckFromProtoSlice(values []*ProtoCheck) []*Check { // Prevent copylock errors when using ProtoTCPCheck directly type TCPCheck struct { - Port uint32 - ConnectTimeoutMs uint64 - IntervalMs uint64 + Port uint32 `json:"port"` + ConnectTimeoutMs uint64 `json:"connect_timeout_ms,omitempty"` + IntervalMs uint64 `json:"interval_ms,omitempty"` } func (this *TCPCheck) Equal(that interface{}) bool { @@ -285,7 +303,9 @@ func (m *TCPCheck) GetPort() uint32 { if m != nil { return m.Port } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *TCPCheck) SetPort(value uint32) { if m != nil { @@ -296,7 +316,9 @@ func (m *TCPCheck) GetConnectTimeoutMs() uint64 { if m != nil { return m.ConnectTimeoutMs } - return 0 + var defaultValue uint64 + defaultValue = 0 + return defaultValue } func (m *TCPCheck) SetConnectTimeoutMs(value uint64) { if m != nil { @@ -307,7 +329,9 @@ func (m *TCPCheck) GetIntervalMs() uint64 { if m != nil { return m.IntervalMs } - return 0 + var defaultValue uint64 + defaultValue = 0 + return defaultValue } func (m *TCPCheck) SetIntervalMs(value uint64) { if m != nil { @@ -364,10 +388,10 @@ func TCPCheckFromProtoSlice(values []*ProtoTCPCheck) []*TCPCheck { // Prevent copylock errors when using ProtoHTTPCheck directly type HTTPCheck struct { - Port uint32 - RequestTimeoutMs uint64 - Path string - IntervalMs uint64 + Port uint32 `json:"port"` + RequestTimeoutMs uint64 `json:"request_timeout_ms,omitempty"` + Path string `json:"path"` + IntervalMs uint64 `json:"interval_ms,omitempty"` } func (this *HTTPCheck) Equal(that interface{}) bool { @@ -410,7 +434,9 @@ func (m *HTTPCheck) GetPort() uint32 { if m != nil { return m.Port } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *HTTPCheck) SetPort(value uint32) { if m != nil { @@ -421,7 +447,9 @@ func (m *HTTPCheck) GetRequestTimeoutMs() uint64 { if m != nil { return m.RequestTimeoutMs } - return 0 + var defaultValue uint64 + defaultValue = 0 + return defaultValue } func (m *HTTPCheck) SetRequestTimeoutMs(value uint64) { if m != nil { @@ -432,7 +460,9 @@ func (m *HTTPCheck) GetPath() string { if m != nil { return m.Path } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *HTTPCheck) SetPath(value string) { if m != nil { @@ -443,7 +473,9 @@ func (m *HTTPCheck) GetIntervalMs() uint64 { if m != nil { return m.IntervalMs } - return 0 + var defaultValue uint64 + defaultValue = 0 + return defaultValue } func (m *HTTPCheck) SetIntervalMs(value uint64) { if m != nil { diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index b5753444..f19d9078 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: desired_lrp.proto package models @@ -29,11 +29,10 @@ type ProtoDesiredLRPSchedulingInfo struct { Annotation string `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation,omitempty"` Instances int32 `protobuf:"varint,3,opt,name=instances,proto3" json:"instances,omitempty"` DesiredLrpResource *ProtoDesiredLRPResource `protobuf:"bytes,4,opt,name=desired_lrp_resource,proto3" json:"desired_lrp_resource,omitempty"` - // ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; - Routes map[string][]byte `protobuf:"bytes,5,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` - VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,proto3" json:"volume_placement,omitempty"` - PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` + Routes *ProtoRoutes `protobuf:"bytes,5,opt,name=routes,proto3" json:"routes,omitempty"` + ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` + VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,proto3" json:"volume_placement,omitempty"` + PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` } func (x *ProtoDesiredLRPSchedulingInfo) Reset() { @@ -96,7 +95,7 @@ func (x *ProtoDesiredLRPSchedulingInfo) GetDesiredLrpResource() *ProtoDesiredLRP return nil } -func (x *ProtoDesiredLRPSchedulingInfo) GetRoutes() map[string][]byte { +func (x *ProtoDesiredLRPSchedulingInfo) GetRoutes() *ProtoRoutes { if x != nil { return x.Routes } @@ -438,9 +437,8 @@ type ProtoDesiredLRPUpdate struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` - // optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; - Routes map[string][]byte `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` + Routes *ProtoRoutes `protobuf:"bytes,2,opt,name=routes,proto3,oneof" json:"routes,omitempty"` Annotation *string `protobuf:"bytes,3,opt,name=annotation,proto3,oneof" json:"annotation,omitempty"` MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } @@ -484,7 +482,7 @@ func (x *ProtoDesiredLRPUpdate) GetInstances() int32 { return 0 } -func (x *ProtoDesiredLRPUpdate) GetRoutes() map[string][]byte { +func (x *ProtoDesiredLRPUpdate) GetRoutes() *ProtoRoutes { if x != nil { return x.Routes } @@ -660,10 +658,9 @@ type ProtoDesiredLRP struct { CpuWeight uint32 `protobuf:"varint,12,opt,name=cpu_weight,proto3" json:"cpu_weight,omitempty"` Privileged bool `protobuf:"varint,13,opt,name=privileged,proto3" json:"privileged,omitempty"` Ports []uint32 `protobuf:"varint,14,rep,name=ports,proto3" json:"ports,omitempty"` - // optional ProtoRoutes routes = 15 [(bbs.bbs_by_value) = false]; - Routes map[string][]byte `protobuf:"bytes,15,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - LogSource string `protobuf:"bytes,16,opt,name=log_source,proto3" json:"log_source,omitempty"` - LogGuid string `protobuf:"bytes,17,opt,name=log_guid,proto3" json:"log_guid,omitempty"` + Routes *ProtoRoutes `protobuf:"bytes,15,opt,name=routes,proto3,oneof" json:"routes,omitempty"` + LogSource string `protobuf:"bytes,16,opt,name=log_source,proto3" json:"log_source,omitempty"` + LogGuid string `protobuf:"bytes,17,opt,name=log_guid,proto3" json:"log_guid,omitempty"` // Deprecated: Marked as deprecated in desired_lrp.proto. MetricsGuid string `protobuf:"bytes,18,opt,name=metrics_guid,proto3" json:"metrics_guid,omitempty"` Annotation string `protobuf:"bytes,19,opt,name=annotation,proto3" json:"annotation,omitempty"` @@ -825,7 +822,7 @@ func (x *ProtoDesiredLRP) GetPorts() []uint32 { return nil } -func (x *ProtoDesiredLRP) GetRoutes() map[string][]byte { +func (x *ProtoDesiredLRP) GetRoutes() *ProtoRoutes { if x != nil { return x.Routes } @@ -1003,55 +1000,51 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcd, 0x04, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x87, 0x04, 0x0a, 0x1d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x49, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x4c, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, - 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x64, 0x65, + 0x50, 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, + 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x5b, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, - 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x12, 0x4d, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, - 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, - 0x67, 0x12, 0x48, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, - 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, - 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, - 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xdd, 0x0c, - 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x49, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, - 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x6b, 0x65, 0x79, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, - 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, - 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, + 0x63, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x06, 0xc0, 0x3e, + 0x01, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x48, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, + 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x10, + 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, + 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x22, 0xff, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, + 0x66, 0x6f, 0x12, 0x4c, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, + 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x12, 0x4c, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, + 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, + 0x65, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x00, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, @@ -1063,265 +1056,266 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, + 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, - 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, - 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x47, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, - 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, - 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, - 0x00, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, - 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, - 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, - 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, - 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, - 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, - 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, - 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, - 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, - 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, - 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, - 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, - 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2a, 0x0a, 0x10, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, - 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, + 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, + 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, + 0x09, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, + 0x12, 0x47, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, + 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x0c, 0x65, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, + 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x29, + 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, + 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, + 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, + 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, + 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, + 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, + 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, + 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, + 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, + 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x12, 0x2f, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x6d, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, - 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, - 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, - 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, - 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, - 0x50, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, - 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, - 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, - 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, - 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, - 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, - 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, - 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, + 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, + 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, + 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x0b, 0x6d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, + 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, + 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, + 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, + 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, + 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, + 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0xac, 0x03, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, - 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x46, - 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x06, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0a, 0x61, 0x6e, - 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x39, 0x0a, 0x0b, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, + 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xeb, 0x02, + 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, + 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, + 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x6c, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x86, - 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, - 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, - 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, - 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, - 0x6d, 0x62, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0xd4, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x22, 0x0a, 0x0c, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, - 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x44, - 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, - 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, - 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, - 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, - 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x10, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, - 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, - 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, - 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, - 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, - 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, - 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, - 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, - 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, + 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7b, 0x0a, 0x12, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, + 0x79, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, + 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, + 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, + 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, + 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, + 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, + 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, + 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, + 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, + 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0xe2, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, + 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, + 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x21, 0x0a, + 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, + 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, + 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, + 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, + 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, + 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, + 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, + 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, + 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, + 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, + 0x62, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, + 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, + 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, + 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, + 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, - 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x03, 0x90, - 0x3f, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, - 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, - 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, - 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1e, - 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, - 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, - 0x65, 0x73, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, - 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, - 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, - 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, - 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, - 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, - 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, - 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, - 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, - 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, - 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, - 0x70, 0x69, 0x64, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, - 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, - 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, - 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, - 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, - 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, - 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, - 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x39, 0x0a, 0x0b, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, - 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, - 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, + 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, + 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x05, 0xc0, 0x3e, 0x01, + 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, + 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, + 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, + 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, + 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, + 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, + 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, + 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, + 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, + 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, + 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, + 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, + 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, + 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, + 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, + 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, + 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, + 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, + 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, + 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, + 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, + 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, + 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, + 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, + 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1336,7 +1330,7 @@ func file_desired_lrp_proto_rawDescGZIP() []byte { return file_desired_lrp_proto_rawDescData } -var file_desired_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_desired_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_desired_lrp_proto_goTypes = []interface{}{ (*ProtoDesiredLRPSchedulingInfo)(nil), // 0: models.ProtoDesiredLRPSchedulingInfo (*ProtoDesiredLRPRunInfo)(nil), // 1: models.ProtoDesiredLRPRunInfo @@ -1345,71 +1339,68 @@ var file_desired_lrp_proto_goTypes = []interface{}{ (*ProtoDesiredLRPKey)(nil), // 4: models.ProtoDesiredLRPKey (*ProtoDesiredLRPResource)(nil), // 5: models.ProtoDesiredLRPResource (*ProtoDesiredLRP)(nil), // 6: models.ProtoDesiredLRP - nil, // 7: models.ProtoDesiredLRPSchedulingInfo.RoutesEntry - nil, // 8: models.ProtoDesiredLRPRunInfo.MetricTagsEntry - nil, // 9: models.ProtoRoutes.RoutesEntry - nil, // 10: models.ProtoDesiredLRPUpdate.RoutesEntry - nil, // 11: models.ProtoDesiredLRPUpdate.MetricTagsEntry - nil, // 12: models.ProtoDesiredLRP.RoutesEntry - nil, // 13: models.ProtoDesiredLRP.MetricTagsEntry - (*ProtoModificationTag)(nil), // 14: models.ProtoModificationTag - (*ProtoVolumePlacement)(nil), // 15: models.ProtoVolumePlacement - (*ProtoEnvironmentVariable)(nil), // 16: models.ProtoEnvironmentVariable - (*ProtoAction)(nil), // 17: models.ProtoAction - (*ProtoSecurityGroupRule)(nil), // 18: models.ProtoSecurityGroupRule - (*ProtoCachedDependency)(nil), // 19: models.ProtoCachedDependency - (*ProtoVolumeMount)(nil), // 20: models.ProtoVolumeMount - (*ProtoNetwork)(nil), // 21: models.ProtoNetwork - (*ProtoCertificateProperties)(nil), // 22: models.ProtoCertificateProperties - (*ProtoCheckDefinition)(nil), // 23: models.ProtoCheckDefinition - (*ProtoImageLayer)(nil), // 24: models.ProtoImageLayer - (*ProtoSidecar)(nil), // 25: models.ProtoSidecar - (*ProtoLogRateLimit)(nil), // 26: models.ProtoLogRateLimit - (*ProtoMetricTagValue)(nil), // 27: models.ProtoMetricTagValue + nil, // 7: models.ProtoDesiredLRPRunInfo.MetricTagsEntry + nil, // 8: models.ProtoRoutes.RoutesEntry + nil, // 9: models.ProtoDesiredLRPUpdate.MetricTagsEntry + nil, // 10: models.ProtoDesiredLRP.MetricTagsEntry + (*ProtoModificationTag)(nil), // 11: models.ProtoModificationTag + (*ProtoVolumePlacement)(nil), // 12: models.ProtoVolumePlacement + (*ProtoEnvironmentVariable)(nil), // 13: models.ProtoEnvironmentVariable + (*ProtoAction)(nil), // 14: models.ProtoAction + (*ProtoSecurityGroupRule)(nil), // 15: models.ProtoSecurityGroupRule + (*ProtoCachedDependency)(nil), // 16: models.ProtoCachedDependency + (*ProtoVolumeMount)(nil), // 17: models.ProtoVolumeMount + (*ProtoNetwork)(nil), // 18: models.ProtoNetwork + (*ProtoCertificateProperties)(nil), // 19: models.ProtoCertificateProperties + (*ProtoCheckDefinition)(nil), // 20: models.ProtoCheckDefinition + (*ProtoImageLayer)(nil), // 21: models.ProtoImageLayer + (*ProtoSidecar)(nil), // 22: models.ProtoSidecar + (*ProtoLogRateLimit)(nil), // 23: models.ProtoLogRateLimit + (*ProtoMetricTagValue)(nil), // 24: models.ProtoMetricTagValue } var file_desired_lrp_proto_depIdxs = []int32{ 4, // 0: models.ProtoDesiredLRPSchedulingInfo.desired_lrp_key:type_name -> models.ProtoDesiredLRPKey 5, // 1: models.ProtoDesiredLRPSchedulingInfo.desired_lrp_resource:type_name -> models.ProtoDesiredLRPResource - 7, // 2: models.ProtoDesiredLRPSchedulingInfo.routes:type_name -> models.ProtoDesiredLRPSchedulingInfo.RoutesEntry - 14, // 3: models.ProtoDesiredLRPSchedulingInfo.modification_tag:type_name -> models.ProtoModificationTag - 15, // 4: models.ProtoDesiredLRPSchedulingInfo.volume_placement:type_name -> models.ProtoVolumePlacement + 2, // 2: models.ProtoDesiredLRPSchedulingInfo.routes:type_name -> models.ProtoRoutes + 11, // 3: models.ProtoDesiredLRPSchedulingInfo.modification_tag:type_name -> models.ProtoModificationTag + 12, // 4: models.ProtoDesiredLRPSchedulingInfo.volume_placement:type_name -> models.ProtoVolumePlacement 4, // 5: models.ProtoDesiredLRPRunInfo.desired_lrp_key:type_name -> models.ProtoDesiredLRPKey - 16, // 6: models.ProtoDesiredLRPRunInfo.environment_variables:type_name -> models.ProtoEnvironmentVariable - 17, // 7: models.ProtoDesiredLRPRunInfo.setup:type_name -> models.ProtoAction - 17, // 8: models.ProtoDesiredLRPRunInfo.action:type_name -> models.ProtoAction - 17, // 9: models.ProtoDesiredLRPRunInfo.monitor:type_name -> models.ProtoAction - 18, // 10: models.ProtoDesiredLRPRunInfo.egress_rules:type_name -> models.ProtoSecurityGroupRule - 19, // 11: models.ProtoDesiredLRPRunInfo.cached_dependencies:type_name -> models.ProtoCachedDependency - 20, // 12: models.ProtoDesiredLRPRunInfo.volume_mounts:type_name -> models.ProtoVolumeMount - 21, // 13: models.ProtoDesiredLRPRunInfo.network:type_name -> models.ProtoNetwork - 22, // 14: models.ProtoDesiredLRPRunInfo.certificate_properties:type_name -> models.ProtoCertificateProperties - 23, // 15: models.ProtoDesiredLRPRunInfo.check_definition:type_name -> models.ProtoCheckDefinition - 24, // 16: models.ProtoDesiredLRPRunInfo.image_layers:type_name -> models.ProtoImageLayer - 8, // 17: models.ProtoDesiredLRPRunInfo.metric_tags:type_name -> models.ProtoDesiredLRPRunInfo.MetricTagsEntry - 25, // 18: models.ProtoDesiredLRPRunInfo.sidecars:type_name -> models.ProtoSidecar - 26, // 19: models.ProtoDesiredLRPRunInfo.log_rate_limit:type_name -> models.ProtoLogRateLimit - 9, // 20: models.ProtoRoutes.routes:type_name -> models.ProtoRoutes.RoutesEntry - 10, // 21: models.ProtoDesiredLRPUpdate.routes:type_name -> models.ProtoDesiredLRPUpdate.RoutesEntry - 11, // 22: models.ProtoDesiredLRPUpdate.metric_tags:type_name -> models.ProtoDesiredLRPUpdate.MetricTagsEntry - 16, // 23: models.ProtoDesiredLRP.environment_variables:type_name -> models.ProtoEnvironmentVariable - 17, // 24: models.ProtoDesiredLRP.setup:type_name -> models.ProtoAction - 17, // 25: models.ProtoDesiredLRP.action:type_name -> models.ProtoAction - 17, // 26: models.ProtoDesiredLRP.monitor:type_name -> models.ProtoAction - 12, // 27: models.ProtoDesiredLRP.routes:type_name -> models.ProtoDesiredLRP.RoutesEntry - 18, // 28: models.ProtoDesiredLRP.egress_rules:type_name -> models.ProtoSecurityGroupRule - 14, // 29: models.ProtoDesiredLRP.modification_tag:type_name -> models.ProtoModificationTag - 19, // 30: models.ProtoDesiredLRP.cached_dependencies:type_name -> models.ProtoCachedDependency - 20, // 31: models.ProtoDesiredLRP.volume_mounts:type_name -> models.ProtoVolumeMount - 21, // 32: models.ProtoDesiredLRP.network:type_name -> models.ProtoNetwork - 22, // 33: models.ProtoDesiredLRP.certificate_properties:type_name -> models.ProtoCertificateProperties - 23, // 34: models.ProtoDesiredLRP.check_definition:type_name -> models.ProtoCheckDefinition - 24, // 35: models.ProtoDesiredLRP.image_layers:type_name -> models.ProtoImageLayer - 13, // 36: models.ProtoDesiredLRP.metric_tags:type_name -> models.ProtoDesiredLRP.MetricTagsEntry - 25, // 37: models.ProtoDesiredLRP.sidecars:type_name -> models.ProtoSidecar - 26, // 38: models.ProtoDesiredLRP.log_rate_limit:type_name -> models.ProtoLogRateLimit - 27, // 39: models.ProtoDesiredLRPRunInfo.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue - 27, // 40: models.ProtoDesiredLRPUpdate.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue - 27, // 41: models.ProtoDesiredLRP.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 13, // 6: models.ProtoDesiredLRPRunInfo.environment_variables:type_name -> models.ProtoEnvironmentVariable + 14, // 7: models.ProtoDesiredLRPRunInfo.setup:type_name -> models.ProtoAction + 14, // 8: models.ProtoDesiredLRPRunInfo.action:type_name -> models.ProtoAction + 14, // 9: models.ProtoDesiredLRPRunInfo.monitor:type_name -> models.ProtoAction + 15, // 10: models.ProtoDesiredLRPRunInfo.egress_rules:type_name -> models.ProtoSecurityGroupRule + 16, // 11: models.ProtoDesiredLRPRunInfo.cached_dependencies:type_name -> models.ProtoCachedDependency + 17, // 12: models.ProtoDesiredLRPRunInfo.volume_mounts:type_name -> models.ProtoVolumeMount + 18, // 13: models.ProtoDesiredLRPRunInfo.network:type_name -> models.ProtoNetwork + 19, // 14: models.ProtoDesiredLRPRunInfo.certificate_properties:type_name -> models.ProtoCertificateProperties + 20, // 15: models.ProtoDesiredLRPRunInfo.check_definition:type_name -> models.ProtoCheckDefinition + 21, // 16: models.ProtoDesiredLRPRunInfo.image_layers:type_name -> models.ProtoImageLayer + 7, // 17: models.ProtoDesiredLRPRunInfo.metric_tags:type_name -> models.ProtoDesiredLRPRunInfo.MetricTagsEntry + 22, // 18: models.ProtoDesiredLRPRunInfo.sidecars:type_name -> models.ProtoSidecar + 23, // 19: models.ProtoDesiredLRPRunInfo.log_rate_limit:type_name -> models.ProtoLogRateLimit + 8, // 20: models.ProtoRoutes.routes:type_name -> models.ProtoRoutes.RoutesEntry + 2, // 21: models.ProtoDesiredLRPUpdate.routes:type_name -> models.ProtoRoutes + 9, // 22: models.ProtoDesiredLRPUpdate.metric_tags:type_name -> models.ProtoDesiredLRPUpdate.MetricTagsEntry + 13, // 23: models.ProtoDesiredLRP.environment_variables:type_name -> models.ProtoEnvironmentVariable + 14, // 24: models.ProtoDesiredLRP.setup:type_name -> models.ProtoAction + 14, // 25: models.ProtoDesiredLRP.action:type_name -> models.ProtoAction + 14, // 26: models.ProtoDesiredLRP.monitor:type_name -> models.ProtoAction + 2, // 27: models.ProtoDesiredLRP.routes:type_name -> models.ProtoRoutes + 15, // 28: models.ProtoDesiredLRP.egress_rules:type_name -> models.ProtoSecurityGroupRule + 11, // 29: models.ProtoDesiredLRP.modification_tag:type_name -> models.ProtoModificationTag + 16, // 30: models.ProtoDesiredLRP.cached_dependencies:type_name -> models.ProtoCachedDependency + 17, // 31: models.ProtoDesiredLRP.volume_mounts:type_name -> models.ProtoVolumeMount + 18, // 32: models.ProtoDesiredLRP.network:type_name -> models.ProtoNetwork + 19, // 33: models.ProtoDesiredLRP.certificate_properties:type_name -> models.ProtoCertificateProperties + 20, // 34: models.ProtoDesiredLRP.check_definition:type_name -> models.ProtoCheckDefinition + 21, // 35: models.ProtoDesiredLRP.image_layers:type_name -> models.ProtoImageLayer + 10, // 36: models.ProtoDesiredLRP.metric_tags:type_name -> models.ProtoDesiredLRP.MetricTagsEntry + 22, // 37: models.ProtoDesiredLRP.sidecars:type_name -> models.ProtoSidecar + 23, // 38: models.ProtoDesiredLRP.log_rate_limit:type_name -> models.ProtoLogRateLimit + 24, // 39: models.ProtoDesiredLRPRunInfo.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 24, // 40: models.ProtoDesiredLRPUpdate.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue + 24, // 41: models.ProtoDesiredLRP.MetricTagsEntry.value:type_name -> models.ProtoMetricTagValue 42, // [42:42] is the sub-list for method output_type 42, // [42:42] is the sub-list for method input_type 42, // [42:42] is the sub-list for extension type_name @@ -1531,7 +1522,7 @@ func file_desired_lrp_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_desired_lrp_proto_rawDesc, NumEnums: 0, - NumMessages: 14, + NumMessages: 11, NumExtensions: 0, NumServices: 0, }, diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index fc78eefc..7eb52f4c 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -19,45 +19,44 @@ import "sidecar.proto"; import "log_rate_limit.proto"; message ProtoDesiredLRPSchedulingInfo { - ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_key"]; + ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_key", (bbs.bbs_json_always_emit) = true]; - string annotation = 2 [json_name = "annotation"]; - int32 instances = 3 [json_name = "instances"]; + string annotation = 2 [json_name = "annotation", (bbs.bbs_json_always_emit) = true]; + int32 instances = 3 [json_name = "instances", (bbs.bbs_json_always_emit) = true]; - ProtoDesiredLRPResource desired_lrp_resource = 4 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_resource"]; + ProtoDesiredLRPResource desired_lrp_resource = 4 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_resource", (bbs.bbs_json_always_emit) = true]; - /* ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; */ - map routes = 5 [(bbs.bbs_by_value) = true]; - ProtoModificationTag modification_tag = 6 [(bbs.bbs_by_value) = true, json_name = "modification_tag"]; + ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; + ProtoModificationTag modification_tag = 6 [(bbs.bbs_by_value) = true, json_name = "modification_tag", (bbs.bbs_json_always_emit) = true]; ProtoVolumePlacement volume_placement = 7 [json_name = "volume_placement"]; repeated string PlacementTags = 8 [json_name ="placement_tags"]; } message ProtoDesiredLRPRunInfo { - ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_key"]; + ProtoDesiredLRPKey desired_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_key", (bbs.bbs_json_always_emit) = true]; - repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env", (bbs.bbs_by_value) = false]; + repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env", (bbs.bbs_by_value) = false, (bbs.bbs_json_always_emit) = true]; ProtoAction setup = 3; ProtoAction action = 4; ProtoAction monitor = 5; uint32 deprecated_start_timeout_s = 6 [json_name = "start_timeout", deprecated=true]; - bool privileged = 7 [json_name = "privileged"]; + bool privileged = 7 [json_name = "privileged", (bbs.bbs_json_always_emit) = true]; - uint32 cpu_weight = 8 [json_name = "cpu_weight"]; + uint32 cpu_weight = 8 [json_name = "cpu_weight", (bbs.bbs_json_always_emit) = true]; repeated uint32 ports = 9 [packed = false]; repeated ProtoSecurityGroupRule egress_rules = 10 [(bbs.bbs_by_value) = false, json_name = "egress_rules"]; - string log_source = 11 [json_name = "log_source"]; - string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid"]; - int64 created_at = 13 [json_name = "created_at"]; + string log_source = 11 [json_name = "log_source", (bbs.bbs_json_always_emit) = true]; + string metrics_guid = 12 [deprecated=true, json_name = "metrics_guid", (bbs.bbs_json_always_emit) = true]; + int64 created_at = 13 [json_name = "created_at", (bbs.bbs_json_always_emit) = true]; repeated ProtoCachedDependency cached_dependencies = 14; string legacy_download_user = 15 [deprecated=true, json_name = "legacy_download_user"]; string trusted_system_certificates_path = 16 [json_name = "trusted_system_certificates_path"]; repeated ProtoVolumeMount volume_mounts = 17 [json_name = "volume_mounts"]; ProtoNetwork network = 18; - int64 start_timeout_ms = 19 [json_name = "start_timeout_ms"]; + int64 start_timeout_ms = 19 [json_name = "start_timeout_ms", (bbs.bbs_json_always_emit) = true]; optional ProtoCertificateProperties certificate_properties = 20 [json_name = "certificate_properties"]; @@ -81,49 +80,47 @@ message ProtoRoutes { message ProtoDesiredLRPUpdate { optional int32 instances = 1; - /* optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; */ - map routes = 2 [(bbs.bbs_by_value) = false]; + optional ProtoRoutes routes = 2 [(bbs.bbs_by_value) = false]; optional string annotation = 3; map metric_tags = 4 [json_name = "metric_tags"]; } message ProtoDesiredLRPKey { - string process_guid = 1 [json_name = "process_guid"]; - string domain = 2 [json_name = "domain"]; - string log_guid = 3 [json_name = "log_guid"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + string domain = 2 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; + string log_guid = 3 [json_name = "log_guid", (bbs.bbs_json_always_emit) = true]; } message ProtoDesiredLRPResource { - int32 memory_mb = 1 [json_name = "memory_mb"]; - int32 disk_mb = 2 [json_name = "disk_mb"]; - string root_fs = 3 [json_name = "rootfs"]; - int32 max_pids = 4 [json_name = "max_pids"]; + int32 memory_mb = 1 [json_name = "memory_mb", (bbs.bbs_json_always_emit) = true]; + int32 disk_mb = 2 [json_name = "disk_mb", (bbs.bbs_json_always_emit) = true]; + string root_fs = 3 [json_name = "rootfs", (bbs.bbs_json_always_emit) = true]; + int32 max_pids = 4 [json_name = "max_pids", (bbs.bbs_json_always_emit) = true]; } message ProtoDesiredLRP { - string process_guid = 1 [json_name = "process_guid"]; - string domain = 2 [json_name = "domain"]; - string root_fs = 3 [json_name = "rootfs"]; - int32 instances = 4 [json_name = "instances"]; - repeated ProtoEnvironmentVariable environment_variables = 5 [json_name = "env"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + string domain = 2 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; + string root_fs = 3 [json_name = "rootfs", (bbs.bbs_json_always_emit) = true]; + int32 instances = 4 [json_name = "instances", (bbs.bbs_json_always_emit) = true]; + repeated ProtoEnvironmentVariable environment_variables = 5 [json_name = "env", (bbs.bbs_json_always_emit) = true]; ProtoAction setup = 6; ProtoAction action = 7; - int64 start_timeout_ms = 27 [json_name = "start_timeout_ms"]; + int64 start_timeout_ms = 27 [json_name = "start_timeout_ms", (bbs.bbs_json_always_emit) = true]; uint32 deprecated_start_timeout_s = 8 [json_name = "deprecated_timeout_ns", deprecated=true]; ProtoAction monitor = 9; - int32 disk_mb = 10 [json_name = "disk_mb"]; - int32 memory_mb = 11 [json_name = "memory_mb"]; - uint32 cpu_weight = 12 [json_name = "cpu_weight"]; - bool privileged = 13 [json_name = "privileged"]; + int32 disk_mb = 10 [json_name = "disk_mb", (bbs.bbs_json_always_emit) = true]; + int32 memory_mb = 11 [json_name = "memory_mb", (bbs.bbs_json_always_emit) = true]; + uint32 cpu_weight = 12 [json_name = "cpu_weight", (bbs.bbs_json_always_emit) = true]; + bool privileged = 13 [json_name = "privileged", (bbs.bbs_json_always_emit) = true]; repeated uint32 ports = 14 [packed = false]; - /* optional ProtoRoutes routes = 15 [(bbs.bbs_by_value) = false]; */ - map routes = 15 [(bbs.bbs_by_value) = false]; - string log_source = 16 [json_name = "log_source"]; - string log_guid = 17 [json_name = "log_guid"]; - string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid"]; - string annotation = 19 [json_name = "annotation"]; + optional ProtoRoutes routes = 15 [(bbs.bbs_by_value) = false]; + string log_source = 16 [json_name = "log_source", (bbs.bbs_json_always_emit) = true]; + string log_guid = 17 [json_name = "log_guid", (bbs.bbs_json_always_emit) = true]; + string metrics_guid = 18 [deprecated=true, json_name = "metrics_guid", (bbs.bbs_json_always_emit) = true]; + string annotation = 19 [json_name = "annotation", (bbs.bbs_json_always_emit) = true]; repeated ProtoSecurityGroupRule egress_rules = 20 [json_name = "egress_rules"]; ProtoModificationTag modification_tag = 21 [json_name = "modification_tag"]; repeated ProtoCachedDependency cached_dependencies = 22 [json_name = "cached_dependencies"]; @@ -132,7 +129,7 @@ message ProtoDesiredLRP { repeated ProtoVolumeMount volume_mounts = 25 [json_name = "volume_mounts"]; ProtoNetwork network = 26; repeated string PlacementTags = 28 [json_name ="placement_tags"]; - int32 max_pids = 29 [json_name = "max_pids"]; + int32 max_pids = 29 [json_name = "max_pids", (bbs.bbs_json_always_emit) = true]; optional ProtoCertificateProperties certificate_properties = 30 [json_name = "certificate_properties"]; diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 74a26714..168f04d8 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,25 +1,21 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: desired_lrp.proto package models -import ( - bytes "bytes" -) - // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfo directly type DesiredLRPSchedulingInfo struct { - DesiredLrpKey DesiredLRPKey - Annotation string - Instances int32 - DesiredLrpResource DesiredLRPResource - Routes map[string][]byte - ModificationTag ModificationTag - VolumePlacement *VolumePlacement - PlacementTags []string + DesiredLrpKey DesiredLRPKey `json:"desired_lrp_key"` + Annotation string `json:"annotation"` + Instances int32 `json:"instances"` + DesiredLrpResource DesiredLRPResource `json:"desired_lrp_resource"` + Routes Routes `json:"routes,omitempty"` + ModificationTag ModificationTag `json:"modification_tag"` + VolumePlacement *VolumePlacement `json:"volume_placement,omitempty"` + PlacementTags []string `json:"placement_tags,omitempty"` } func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { @@ -56,21 +52,24 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { return false } - if len(this.Routes) != len(that1.Routes) { + if !this.Routes.Equal(that1.Routes) { return false } - for i := range this.Routes { - if !bytes.Equal(this.Routes[i], that1.Routes[i]) { - return false - } - } if !this.ModificationTag.Equal(that1.ModificationTag) { return false } - if !this.VolumePlacement.Equal(*that1.VolumePlacement) { + if this.VolumePlacement == nil { + if that1.VolumePlacement != nil { + return false + } + } else if !this.VolumePlacement.Equal(*that1.VolumePlacement) { return false } - if len(this.PlacementTags) != len(that1.PlacementTags) { + if this.PlacementTags == nil { + if that1.PlacementTags != nil { + return false + } + } else if len(this.PlacementTags) != len(that1.PlacementTags) { return false } for i := range this.PlacementTags { @@ -89,7 +88,9 @@ func (m *DesiredLRPSchedulingInfo) GetAnnotation() string { if m != nil { return m.Annotation } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPSchedulingInfo) SetAnnotation(value string) { if m != nil { @@ -100,7 +101,9 @@ func (m *DesiredLRPSchedulingInfo) GetInstances() int32 { if m != nil { return m.Instances } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPSchedulingInfo) SetInstances(value int32) { if m != nil { @@ -112,7 +115,7 @@ func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value DesiredLRPResourc m.DesiredLrpResource = value } } -func (m *DesiredLRPSchedulingInfo) SetRoutes(value map[string][]byte) { +func (m *DesiredLRPSchedulingInfo) SetRoutes(value Routes) { if m != nil { m.Routes = value } @@ -154,7 +157,7 @@ func (x *DesiredLRPSchedulingInfo) ToProto() *ProtoDesiredLRPSchedulingInfo { Annotation: x.Annotation, Instances: x.Instances, DesiredLrpResource: x.DesiredLrpResource.ToProto(), - Routes: x.Routes, + Routes: x.Routes.ToProto(), ModificationTag: x.ModificationTag.ToProto(), VolumePlacement: x.VolumePlacement.ToProto(), PlacementTags: x.PlacementTags, @@ -172,7 +175,7 @@ func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { Annotation: x.Annotation, Instances: x.Instances, DesiredLrpResource: *x.DesiredLrpResource.FromProto(), - Routes: x.Routes, + Routes: *x.Routes.FromProto(), ModificationTag: *x.ModificationTag.FromProto(), VolumePlacement: x.VolumePlacement.FromProto(), PlacementTags: x.PlacementTags, @@ -204,33 +207,33 @@ func DesiredLRPSchedulingInfoFromProtoSlice(values []*ProtoDesiredLRPSchedulingI // Prevent copylock errors when using ProtoDesiredLRPRunInfo directly type DesiredLRPRunInfo struct { - DesiredLrpKey DesiredLRPKey - EnvironmentVariables []*EnvironmentVariable - Setup *Action - Action *Action - Monitor *Action - DeprecatedStartTimeoutS uint32 - Privileged bool - CpuWeight uint32 - Ports []uint32 - EgressRules []*SecurityGroupRule - LogSource string - MetricsGuid string - CreatedAt int64 - CachedDependencies []*CachedDependency - LegacyDownloadUser string - TrustedSystemCertificatesPath string - VolumeMounts []*VolumeMount - Network *Network - StartTimeoutMs int64 - CertificateProperties *CertificateProperties - ImageUsername string - ImagePassword string - CheckDefinition *CheckDefinition - ImageLayers []*ImageLayer - MetricTags map[string]*MetricTagValue - Sidecars []*Sidecar - LogRateLimit *LogRateLimit + DesiredLrpKey DesiredLRPKey `json:"desired_lrp_key"` + EnvironmentVariables []*EnvironmentVariable `json:"env"` + Setup *Action `json:"setup,omitempty"` + Action *Action `json:"action,omitempty"` + Monitor *Action `json:"monitor,omitempty"` + DeprecatedStartTimeoutS uint32 `json:"start_timeout,omitempty"` + Privileged bool `json:"privileged"` + CpuWeight uint32 `json:"cpu_weight"` + Ports []uint32 `json:"ports,omitempty"` + EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` + LogSource string `json:"log_source"` + MetricsGuid string `json:"metrics_guid"` + CreatedAt int64 `json:"created_at"` + CachedDependencies []*CachedDependency `json:"cachedDependencies,omitempty"` + LegacyDownloadUser string `json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` + Network *Network `json:"network,omitempty"` + StartTimeoutMs int64 `json:"start_timeout_ms"` + CertificateProperties *CertificateProperties `json:"certificate_properties,omitempty"` + ImageUsername string `json:"image_username,omitempty"` + ImagePassword string `json:"image_password,omitempty"` + CheckDefinition *CheckDefinition `json:"check_definition,omitempty"` + ImageLayers []*ImageLayer `json:"image_layers,omitempty"` + MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` + Sidecars []*Sidecar `json:"sidecars,omitempty"` + LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` } func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { @@ -258,7 +261,11 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { if !this.DesiredLrpKey.Equal(that1.DesiredLrpKey) { return false } - if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { + if this.EnvironmentVariables == nil { + if that1.EnvironmentVariables != nil { + return false + } + } else if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { return false } for i := range this.EnvironmentVariables { @@ -266,13 +273,25 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if !this.Setup.Equal(*that1.Setup) { + if this.Setup == nil { + if that1.Setup != nil { + return false + } + } else if !this.Setup.Equal(*that1.Setup) { return false } - if !this.Action.Equal(*that1.Action) { + if this.Action == nil { + if that1.Action != nil { + return false + } + } else if !this.Action.Equal(*that1.Action) { return false } - if !this.Monitor.Equal(*that1.Monitor) { + if this.Monitor == nil { + if that1.Monitor != nil { + return false + } + } else if !this.Monitor.Equal(*that1.Monitor) { return false } if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { @@ -284,7 +303,11 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { if this.CpuWeight != that1.CpuWeight { return false } - if len(this.Ports) != len(that1.Ports) { + if this.Ports == nil { + if that1.Ports != nil { + return false + } + } else if len(this.Ports) != len(that1.Ports) { return false } for i := range this.Ports { @@ -292,7 +315,11 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if len(this.EgressRules) != len(that1.EgressRules) { + if this.EgressRules == nil { + if that1.EgressRules != nil { + return false + } + } else if len(this.EgressRules) != len(that1.EgressRules) { return false } for i := range this.EgressRules { @@ -309,7 +336,11 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { if this.CreatedAt != that1.CreatedAt { return false } - if len(this.CachedDependencies) != len(that1.CachedDependencies) { + if this.CachedDependencies == nil { + if that1.CachedDependencies != nil { + return false + } + } else if len(this.CachedDependencies) != len(that1.CachedDependencies) { return false } for i := range this.CachedDependencies { @@ -323,7 +354,11 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { return false } - if len(this.VolumeMounts) != len(that1.VolumeMounts) { + if this.VolumeMounts == nil { + if that1.VolumeMounts != nil { + return false + } + } else if len(this.VolumeMounts) != len(that1.VolumeMounts) { return false } for i := range this.VolumeMounts { @@ -331,13 +366,21 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if !this.Network.Equal(*that1.Network) { + if this.Network == nil { + if that1.Network != nil { + return false + } + } else if !this.Network.Equal(*that1.Network) { return false } if this.StartTimeoutMs != that1.StartTimeoutMs { return false } - if !this.CertificateProperties.Equal(*that1.CertificateProperties) { + if this.CertificateProperties == nil { + if that1.CertificateProperties != nil { + return false + } + } else if !this.CertificateProperties.Equal(*that1.CertificateProperties) { return false } if this.ImageUsername != that1.ImageUsername { @@ -346,10 +389,18 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { if this.ImagePassword != that1.ImagePassword { return false } - if !this.CheckDefinition.Equal(*that1.CheckDefinition) { + if this.CheckDefinition == nil { + if that1.CheckDefinition != nil { + return false + } + } else if !this.CheckDefinition.Equal(*that1.CheckDefinition) { return false } - if len(this.ImageLayers) != len(that1.ImageLayers) { + if this.ImageLayers == nil { + if that1.ImageLayers != nil { + return false + } + } else if len(this.ImageLayers) != len(that1.ImageLayers) { return false } for i := range this.ImageLayers { @@ -357,15 +408,23 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if len(this.MetricTags) != len(that1.MetricTags) { + if this.MetricTags == nil { + if that1.MetricTags != nil { + return false + } + } else if len(this.MetricTags) != len(that1.MetricTags) { return false } for i := range this.MetricTags { - if this.MetricTags[i] != that1.MetricTags[i] { + if !this.MetricTags[i].Equal(that1.MetricTags[i]) { return false } } - if len(this.Sidecars) != len(that1.Sidecars) { + if this.Sidecars == nil { + if that1.Sidecars != nil { + return false + } + } else if len(this.Sidecars) != len(that1.Sidecars) { return false } for i := range this.Sidecars { @@ -373,7 +432,11 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { return false } } - if !this.LogRateLimit.Equal(*that1.LogRateLimit) { + if this.LogRateLimit == nil { + if that1.LogRateLimit != nil { + return false + } + } else if !this.LogRateLimit.Equal(*that1.LogRateLimit) { return false } return true @@ -396,35 +459,35 @@ func (m *DesiredLRPRunInfo) SetEnvironmentVariables(value []*EnvironmentVariable } func (m *DesiredLRPRunInfo) GetSetup() *Action { if m != nil { - return m.Setup.GetValue().(*Action) + return m.Setup } return nil } func (m *DesiredLRPRunInfo) SetSetup(value *Action) { if m != nil { - m.Setup.SetValue(value) + m.Setup = value } } func (m *DesiredLRPRunInfo) GetAction() *Action { if m != nil { - return m.Action.GetValue().(*Action) + return m.Action } return nil } func (m *DesiredLRPRunInfo) SetAction(value *Action) { if m != nil { - m.Action.SetValue(value) + m.Action = value } } func (m *DesiredLRPRunInfo) GetMonitor() *Action { if m != nil { - return m.Monitor.GetValue().(*Action) + return m.Monitor } return nil } func (m *DesiredLRPRunInfo) SetMonitor(value *Action) { if m != nil { - m.Monitor.SetValue(value) + m.Monitor = value } } @@ -433,7 +496,9 @@ func (m *DesiredLRPRunInfo) GetDeprecatedStartTimeoutS() uint32 { if m != nil { return m.DeprecatedStartTimeoutS } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPRunInfo) SetDeprecatedStartTimeoutS(value uint32) { if m != nil { @@ -444,7 +509,9 @@ func (m *DesiredLRPRunInfo) GetPrivileged() bool { if m != nil { return m.Privileged } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *DesiredLRPRunInfo) SetPrivileged(value bool) { if m != nil { @@ -455,7 +522,9 @@ func (m *DesiredLRPRunInfo) GetCpuWeight() uint32 { if m != nil { return m.CpuWeight } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPRunInfo) SetCpuWeight(value uint32) { if m != nil { @@ -488,7 +557,9 @@ func (m *DesiredLRPRunInfo) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPRunInfo) SetLogSource(value string) { if m != nil { @@ -501,7 +572,9 @@ func (m *DesiredLRPRunInfo) GetMetricsGuid() string { if m != nil { return m.MetricsGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPRunInfo) SetMetricsGuid(value string) { if m != nil { @@ -512,7 +585,9 @@ func (m *DesiredLRPRunInfo) GetCreatedAt() int64 { if m != nil { return m.CreatedAt } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPRunInfo) SetCreatedAt(value int64) { if m != nil { @@ -536,7 +611,9 @@ func (m *DesiredLRPRunInfo) GetLegacyDownloadUser() string { if m != nil { return m.LegacyDownloadUser } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPRunInfo) SetLegacyDownloadUser(value string) { if m != nil { @@ -547,7 +624,9 @@ func (m *DesiredLRPRunInfo) GetTrustedSystemCertificatesPath() string { if m != nil { return m.TrustedSystemCertificatesPath } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPRunInfo) SetTrustedSystemCertificatesPath(value string) { if m != nil { @@ -580,7 +659,9 @@ func (m *DesiredLRPRunInfo) GetStartTimeoutMs() int64 { if m != nil { return m.StartTimeoutMs } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPRunInfo) SetStartTimeoutMs(value int64) { if m != nil { @@ -605,7 +686,9 @@ func (m *DesiredLRPRunInfo) GetImageUsername() string { if m != nil { return m.ImageUsername } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPRunInfo) SetImageUsername(value string) { if m != nil { @@ -616,7 +699,9 @@ func (m *DesiredLRPRunInfo) GetImagePassword() string { if m != nil { return m.ImagePassword } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPRunInfo) SetImagePassword(value string) { if m != nil { @@ -798,10 +883,10 @@ func DesiredLRPRunInfoMetricTagsFromProtoMap(values map[string]*ProtoMetricTagVa // Prevent copylock errors when using ProtoDesiredLRPUpdate directly type DesiredLRPUpdate struct { - Instances *int32 - Routes map[string][]byte - Annotation *string - MetricTags map[string]*MetricTagValue + Instances *int32 `json:"instances,omitempty"` + Routes *Routes `json:"routes,omitempty"` + Annotation *string `json:"annotation,omitempty"` + MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` } func (this *DesiredLRPUpdate) Equal(that interface{}) bool { @@ -826,25 +911,36 @@ func (this *DesiredLRPUpdate) Equal(that interface{}) bool { return false } - if this.Instances != that1.Instances { + if this.Instances == nil { + if that1.Instances != nil { + return false + } + } else if *this.Instances != *that1.Instances { return false } - if len(this.Routes) != len(that1.Routes) { + if this.Routes == nil { + if that1.Routes != nil { + return false + } + } else if !this.Routes.Equal(*that1.Routes) { return false } - for i := range this.Routes { - if !bytes.Equal(this.Routes[i], that1.Routes[i]) { + if this.Annotation == nil { + if that1.Annotation != nil { return false } - } - if this.Annotation != that1.Annotation { + } else if *this.Annotation != *that1.Annotation { return false } - if len(this.MetricTags) != len(that1.MetricTags) { + if this.MetricTags == nil { + if that1.MetricTags != nil { + return false + } + } else if len(this.MetricTags) != len(that1.MetricTags) { return false } for i := range this.MetricTags { - if this.MetricTags[i] != that1.MetricTags[i] { + if !this.MetricTags[i].Equal(that1.MetricTags[i]) { return false } } @@ -857,20 +953,25 @@ func (m *DesiredLRPUpdate) GetInstances() *int32 { if m != nil && m.Instances != nil { return m.Instances } - return nil + var defaultValue int32 + defaultValue = 0 + return &defaultValue } func (m *DesiredLRPUpdate) SetInstances(value *int32) { if m != nil { m.Instances = value } } -func (m *DesiredLRPUpdate) GetRoutes() map[string][]byte { - if m != nil { +func (m *DesiredLRPUpdate) RoutesExists() bool { + return m != nil && m.Routes != nil +} +func (m *DesiredLRPUpdate) GetRoutes() *Routes { + if m != nil && m.Routes != nil { return m.Routes } return nil } -func (m *DesiredLRPUpdate) SetRoutes(value map[string][]byte) { +func (m *DesiredLRPUpdate) SetRoutes(value *Routes) { if m != nil { m.Routes = value } @@ -882,7 +983,9 @@ func (m *DesiredLRPUpdate) GetAnnotation() *string { if m != nil && m.Annotation != nil { return m.Annotation } - return nil + var defaultValue string + defaultValue = "" + return &defaultValue } func (m *DesiredLRPUpdate) SetAnnotation(value *string) { if m != nil { @@ -907,7 +1010,7 @@ func (x *DesiredLRPUpdate) ToProto() *ProtoDesiredLRPUpdate { proto := &ProtoDesiredLRPUpdate{ Instances: x.Instances, - Routes: x.Routes, + Routes: x.Routes.ToProto(), Annotation: x.Annotation, MetricTags: DesiredLRPUpdateMetricTagsToProtoMap(x.MetricTags), } @@ -921,7 +1024,7 @@ func (x *ProtoDesiredLRPUpdate) FromProto() *DesiredLRPUpdate { copysafe := &DesiredLRPUpdate{ Instances: x.Instances, - Routes: x.Routes, + Routes: x.Routes.FromProto(), Annotation: x.Annotation, MetricTags: DesiredLRPUpdateMetricTagsFromProtoMap(x.MetricTags), } @@ -974,9 +1077,9 @@ func DesiredLRPUpdateMetricTagsFromProtoMap(values map[string]*ProtoMetricTagVal // Prevent copylock errors when using ProtoDesiredLRPKey directly type DesiredLRPKey struct { - ProcessGuid string - Domain string - LogGuid string + ProcessGuid string `json:"process_guid"` + Domain string `json:"domain"` + LogGuid string `json:"log_guid"` } func (this *DesiredLRPKey) Equal(that interface{}) bool { @@ -1016,7 +1119,9 @@ func (m *DesiredLRPKey) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPKey) SetProcessGuid(value string) { if m != nil { @@ -1027,7 +1132,9 @@ func (m *DesiredLRPKey) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPKey) SetDomain(value string) { if m != nil { @@ -1038,7 +1145,9 @@ func (m *DesiredLRPKey) GetLogGuid() string { if m != nil { return m.LogGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPKey) SetLogGuid(value string) { if m != nil { @@ -1095,10 +1204,10 @@ func DesiredLRPKeyFromProtoSlice(values []*ProtoDesiredLRPKey) []*DesiredLRPKey // Prevent copylock errors when using ProtoDesiredLRPResource directly type DesiredLRPResource struct { - MemoryMb int32 - DiskMb int32 - RootFs string - MaxPids int32 + MemoryMb int32 `json:"memory_mb"` + DiskMb int32 `json:"disk_mb"` + RootFs string `json:"rootfs"` + MaxPids int32 `json:"max_pids"` } func (this *DesiredLRPResource) Equal(that interface{}) bool { @@ -1141,7 +1250,9 @@ func (m *DesiredLRPResource) GetMemoryMb() int32 { if m != nil { return m.MemoryMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPResource) SetMemoryMb(value int32) { if m != nil { @@ -1152,7 +1263,9 @@ func (m *DesiredLRPResource) GetDiskMb() int32 { if m != nil { return m.DiskMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPResource) SetDiskMb(value int32) { if m != nil { @@ -1163,7 +1276,9 @@ func (m *DesiredLRPResource) GetRootFs() string { if m != nil { return m.RootFs } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPResource) SetRootFs(value string) { if m != nil { @@ -1174,7 +1289,9 @@ func (m *DesiredLRPResource) GetMaxPids() int32 { if m != nil { return m.MaxPids } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRPResource) SetMaxPids(value int32) { if m != nil { @@ -1233,43 +1350,43 @@ func DesiredLRPResourceFromProtoSlice(values []*ProtoDesiredLRPResource) []*Desi // Prevent copylock errors when using ProtoDesiredLRP directly type DesiredLRP struct { - ProcessGuid string - Domain string - RootFs string - Instances int32 - EnvironmentVariables []*EnvironmentVariable - Setup *Action - Action *Action - StartTimeoutMs int64 - DeprecatedStartTimeoutS uint32 - Monitor *Action - DiskMb int32 - MemoryMb int32 - CpuWeight uint32 - Privileged bool - Ports []uint32 - Routes map[string][]byte - LogSource string - LogGuid string - MetricsGuid string - Annotation string - EgressRules []*SecurityGroupRule - ModificationTag *ModificationTag - CachedDependencies []*CachedDependency - LegacyDownloadUser string - TrustedSystemCertificatesPath string - VolumeMounts []*VolumeMount - Network *Network - PlacementTags []string - MaxPids int32 - CertificateProperties *CertificateProperties - ImageUsername string - ImagePassword string - CheckDefinition *CheckDefinition - ImageLayers []*ImageLayer - MetricTags map[string]*MetricTagValue - Sidecars []*Sidecar - LogRateLimit *LogRateLimit + ProcessGuid string `json:"process_guid"` + Domain string `json:"domain"` + RootFs string `json:"rootfs"` + Instances int32 `json:"instances"` + EnvironmentVariables []*EnvironmentVariable `json:"env"` + Setup *Action `json:"setup,omitempty"` + Action *Action `json:"action,omitempty"` + StartTimeoutMs int64 `json:"start_timeout_ms"` + DeprecatedStartTimeoutS uint32 `json:"deprecated_timeout_ns,omitempty"` + Monitor *Action `json:"monitor,omitempty"` + DiskMb int32 `json:"disk_mb"` + MemoryMb int32 `json:"memory_mb"` + CpuWeight uint32 `json:"cpu_weight"` + Privileged bool `json:"privileged"` + Ports []uint32 `json:"ports,omitempty"` + Routes *Routes `json:"routes,omitempty"` + LogSource string `json:"log_source"` + LogGuid string `json:"log_guid"` + MetricsGuid string `json:"metrics_guid"` + Annotation string `json:"annotation"` + EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` + ModificationTag *ModificationTag `json:"modification_tag,omitempty"` + CachedDependencies []*CachedDependency `json:"cached_dependencies,omitempty"` + LegacyDownloadUser string `json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` + Network *Network `json:"network,omitempty"` + PlacementTags []string `json:"placement_tags,omitempty"` + MaxPids int32 `json:"max_pids"` + CertificateProperties *CertificateProperties `json:"certificate_properties,omitempty"` + ImageUsername string `json:"image_username,omitempty"` + ImagePassword string `json:"image_password,omitempty"` + CheckDefinition *CheckDefinition `json:"check_definition,omitempty"` + ImageLayers []*ImageLayer `json:"image_layers,omitempty"` + MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` + Sidecars []*Sidecar `json:"sidecars,omitempty"` + LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` } func (this *DesiredLRP) Equal(that interface{}) bool { @@ -1306,7 +1423,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.Instances != that1.Instances { return false } - if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { + if this.EnvironmentVariables == nil { + if that1.EnvironmentVariables != nil { + return false + } + } else if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { return false } for i := range this.EnvironmentVariables { @@ -1314,10 +1435,18 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.Setup.Equal(*that1.Setup) { + if this.Setup == nil { + if that1.Setup != nil { + return false + } + } else if !this.Setup.Equal(*that1.Setup) { return false } - if !this.Action.Equal(*that1.Action) { + if this.Action == nil { + if that1.Action != nil { + return false + } + } else if !this.Action.Equal(*that1.Action) { return false } if this.StartTimeoutMs != that1.StartTimeoutMs { @@ -1326,7 +1455,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { return false } - if !this.Monitor.Equal(*that1.Monitor) { + if this.Monitor == nil { + if that1.Monitor != nil { + return false + } + } else if !this.Monitor.Equal(*that1.Monitor) { return false } if this.DiskMb != that1.DiskMb { @@ -1341,7 +1474,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.Privileged != that1.Privileged { return false } - if len(this.Ports) != len(that1.Ports) { + if this.Ports == nil { + if that1.Ports != nil { + return false + } + } else if len(this.Ports) != len(that1.Ports) { return false } for i := range this.Ports { @@ -1349,13 +1486,12 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if len(this.Routes) != len(that1.Routes) { - return false - } - for i := range this.Routes { - if !bytes.Equal(this.Routes[i], that1.Routes[i]) { + if this.Routes == nil { + if that1.Routes != nil { return false } + } else if !this.Routes.Equal(*that1.Routes) { + return false } if this.LogSource != that1.LogSource { return false @@ -1369,7 +1505,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.Annotation != that1.Annotation { return false } - if len(this.EgressRules) != len(that1.EgressRules) { + if this.EgressRules == nil { + if that1.EgressRules != nil { + return false + } + } else if len(this.EgressRules) != len(that1.EgressRules) { return false } for i := range this.EgressRules { @@ -1377,10 +1517,18 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.ModificationTag.Equal(*that1.ModificationTag) { + if this.ModificationTag == nil { + if that1.ModificationTag != nil { + return false + } + } else if !this.ModificationTag.Equal(*that1.ModificationTag) { return false } - if len(this.CachedDependencies) != len(that1.CachedDependencies) { + if this.CachedDependencies == nil { + if that1.CachedDependencies != nil { + return false + } + } else if len(this.CachedDependencies) != len(that1.CachedDependencies) { return false } for i := range this.CachedDependencies { @@ -1394,7 +1542,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { return false } - if len(this.VolumeMounts) != len(that1.VolumeMounts) { + if this.VolumeMounts == nil { + if that1.VolumeMounts != nil { + return false + } + } else if len(this.VolumeMounts) != len(that1.VolumeMounts) { return false } for i := range this.VolumeMounts { @@ -1402,10 +1554,18 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.Network.Equal(*that1.Network) { + if this.Network == nil { + if that1.Network != nil { + return false + } + } else if !this.Network.Equal(*that1.Network) { return false } - if len(this.PlacementTags) != len(that1.PlacementTags) { + if this.PlacementTags == nil { + if that1.PlacementTags != nil { + return false + } + } else if len(this.PlacementTags) != len(that1.PlacementTags) { return false } for i := range this.PlacementTags { @@ -1416,7 +1576,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.MaxPids != that1.MaxPids { return false } - if !this.CertificateProperties.Equal(*that1.CertificateProperties) { + if this.CertificateProperties == nil { + if that1.CertificateProperties != nil { + return false + } + } else if !this.CertificateProperties.Equal(*that1.CertificateProperties) { return false } if this.ImageUsername != that1.ImageUsername { @@ -1425,10 +1589,18 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if this.ImagePassword != that1.ImagePassword { return false } - if !this.CheckDefinition.Equal(*that1.CheckDefinition) { + if this.CheckDefinition == nil { + if that1.CheckDefinition != nil { + return false + } + } else if !this.CheckDefinition.Equal(*that1.CheckDefinition) { return false } - if len(this.ImageLayers) != len(that1.ImageLayers) { + if this.ImageLayers == nil { + if that1.ImageLayers != nil { + return false + } + } else if len(this.ImageLayers) != len(that1.ImageLayers) { return false } for i := range this.ImageLayers { @@ -1436,15 +1608,23 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if len(this.MetricTags) != len(that1.MetricTags) { + if this.MetricTags == nil { + if that1.MetricTags != nil { + return false + } + } else if len(this.MetricTags) != len(that1.MetricTags) { return false } for i := range this.MetricTags { - if this.MetricTags[i] != that1.MetricTags[i] { + if !this.MetricTags[i].Equal(that1.MetricTags[i]) { return false } } - if len(this.Sidecars) != len(that1.Sidecars) { + if this.Sidecars == nil { + if that1.Sidecars != nil { + return false + } + } else if len(this.Sidecars) != len(that1.Sidecars) { return false } for i := range this.Sidecars { @@ -1452,7 +1632,11 @@ func (this *DesiredLRP) Equal(that interface{}) bool { return false } } - if !this.LogRateLimit.Equal(*that1.LogRateLimit) { + if this.LogRateLimit == nil { + if that1.LogRateLimit != nil { + return false + } + } else if !this.LogRateLimit.Equal(*that1.LogRateLimit) { return false } return true @@ -1461,7 +1645,9 @@ func (m *DesiredLRP) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetProcessGuid(value string) { if m != nil { @@ -1472,7 +1658,9 @@ func (m *DesiredLRP) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetDomain(value string) { if m != nil { @@ -1483,7 +1671,9 @@ func (m *DesiredLRP) GetRootFs() string { if m != nil { return m.RootFs } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetRootFs(value string) { if m != nil { @@ -1494,7 +1684,9 @@ func (m *DesiredLRP) GetInstances() int32 { if m != nil { return m.Instances } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRP) SetInstances(value int32) { if m != nil { @@ -1514,31 +1706,33 @@ func (m *DesiredLRP) SetEnvironmentVariables(value []*EnvironmentVariable) { } func (m *DesiredLRP) GetSetup() *Action { if m != nil { - return m.Setup.GetValue().(*Action) + return m.Setup } return nil } func (m *DesiredLRP) SetSetup(value *Action) { if m != nil { - m.Setup.SetValue(value) + m.Setup = value } } func (m *DesiredLRP) GetAction() *Action { if m != nil { - return m.Action.GetValue().(*Action) + return m.Action } return nil } func (m *DesiredLRP) SetAction(value *Action) { if m != nil { - m.Action.SetValue(value) + m.Action = value } } func (m *DesiredLRP) GetStartTimeoutMs() int64 { if m != nil { return m.StartTimeoutMs } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *DesiredLRP) SetStartTimeoutMs(value int64) { if m != nil { @@ -1551,7 +1745,9 @@ func (m *DesiredLRP) GetDeprecatedStartTimeoutS() uint32 { if m != nil { return m.DeprecatedStartTimeoutS } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRP) SetDeprecatedStartTimeoutS(value uint32) { if m != nil { @@ -1560,20 +1756,22 @@ func (m *DesiredLRP) SetDeprecatedStartTimeoutS(value uint32) { } func (m *DesiredLRP) GetMonitor() *Action { if m != nil { - return m.Monitor.GetValue().(*Action) + return m.Monitor } return nil } func (m *DesiredLRP) SetMonitor(value *Action) { if m != nil { - m.Monitor.SetValue(value) + m.Monitor = value } } func (m *DesiredLRP) GetDiskMb() int32 { if m != nil { return m.DiskMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRP) SetDiskMb(value int32) { if m != nil { @@ -1584,7 +1782,9 @@ func (m *DesiredLRP) GetMemoryMb() int32 { if m != nil { return m.MemoryMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRP) SetMemoryMb(value int32) { if m != nil { @@ -1595,7 +1795,9 @@ func (m *DesiredLRP) GetCpuWeight() uint32 { if m != nil { return m.CpuWeight } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRP) SetCpuWeight(value uint32) { if m != nil { @@ -1606,7 +1808,9 @@ func (m *DesiredLRP) GetPrivileged() bool { if m != nil { return m.Privileged } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *DesiredLRP) SetPrivileged(value bool) { if m != nil { @@ -1624,13 +1828,16 @@ func (m *DesiredLRP) SetPorts(value []uint32) { m.Ports = value } } -func (m *DesiredLRP) GetRoutes() map[string][]byte { - if m != nil { +func (m *DesiredLRP) RoutesExists() bool { + return m != nil && m.Routes != nil +} +func (m *DesiredLRP) GetRoutes() *Routes { + if m != nil && m.Routes != nil { return m.Routes } return nil } -func (m *DesiredLRP) SetRoutes(value map[string][]byte) { +func (m *DesiredLRP) SetRoutes(value *Routes) { if m != nil { m.Routes = value } @@ -1639,7 +1846,9 @@ func (m *DesiredLRP) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetLogSource(value string) { if m != nil { @@ -1650,7 +1859,9 @@ func (m *DesiredLRP) GetLogGuid() string { if m != nil { return m.LogGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetLogGuid(value string) { if m != nil { @@ -1663,7 +1874,9 @@ func (m *DesiredLRP) GetMetricsGuid() string { if m != nil { return m.MetricsGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetMetricsGuid(value string) { if m != nil { @@ -1674,7 +1887,9 @@ func (m *DesiredLRP) GetAnnotation() string { if m != nil { return m.Annotation } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetAnnotation(value string) { if m != nil { @@ -1720,7 +1935,9 @@ func (m *DesiredLRP) GetLegacyDownloadUser() string { if m != nil { return m.LegacyDownloadUser } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetLegacyDownloadUser(value string) { if m != nil { @@ -1731,7 +1948,9 @@ func (m *DesiredLRP) GetTrustedSystemCertificatesPath() string { if m != nil { return m.TrustedSystemCertificatesPath } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetTrustedSystemCertificatesPath(value string) { if m != nil { @@ -1775,7 +1994,9 @@ func (m *DesiredLRP) GetMaxPids() int32 { if m != nil { return m.MaxPids } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *DesiredLRP) SetMaxPids(value int32) { if m != nil { @@ -1800,7 +2021,9 @@ func (m *DesiredLRP) GetImageUsername() string { if m != nil { return m.ImageUsername } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetImageUsername(value string) { if m != nil { @@ -1811,7 +2034,9 @@ func (m *DesiredLRP) GetImagePassword() string { if m != nil { return m.ImagePassword } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRP) SetImagePassword(value string) { if m != nil { @@ -1894,7 +2119,7 @@ func (x *DesiredLRP) ToProto() *ProtoDesiredLRP { CpuWeight: x.CpuWeight, Privileged: x.Privileged, Ports: x.Ports, - Routes: x.Routes, + Routes: x.Routes.ToProto(), LogSource: x.LogSource, LogGuid: x.LogGuid, MetricsGuid: x.MetricsGuid, @@ -1941,7 +2166,7 @@ func (x *ProtoDesiredLRP) FromProto() *DesiredLRP { CpuWeight: x.CpuWeight, Privileged: x.Privileged, Ports: x.Ports, - Routes: x.Routes, + Routes: x.Routes.FromProto(), LogSource: x.LogSource, LogGuid: x.LogGuid, MetricsGuid: x.MetricsGuid, diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index f8fd03ba..18d8c75d 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: desired_lrp_requests.proto package models @@ -543,25 +543,26 @@ var File_desired_lrp_requests_proto protoreflect.FileDescriptor var file_desired_lrp_requests_proto_rawDesc = []byte{ 0x0a, 0x1a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, - 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4c, 0x0a, 0x20, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x22, 0x81, 0x01, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, - 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x3b, 0x0a, 0x0c, 0x64, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x72, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x4c, 0x0a, 0x20, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x81, 0x01, + 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, + 0x50, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x12, 0x3b, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, + 0x6c, 0x72, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, + 0x73, 0x22, 0x5c, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, + 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x22, 0x7e, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, @@ -596,32 +597,33 @@ var file_desired_lrp_requests_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x1b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, - 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x49, 0x0a, 0x23, 0x50, 0x72, 0x6f, + 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4e, 0x0a, 0x23, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x39, 0x0a, - 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x22, 0x79, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, - 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x06, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x22, 0x42, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, - 0x76, 0x65, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, - 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x15, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x22, 0x7e, 0x0a, + 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x47, 0x0a, + 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x73, 0x69, + 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, + 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, + 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -677,6 +679,7 @@ func file_desired_lrp_requests_proto_init() { if File_desired_lrp_requests_proto != nil { return } + file_bbs_proto_init() file_desired_lrp_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { diff --git a/models/desired_lrp_requests.proto b/models/desired_lrp_requests.proto index dea13c88..ccae18b4 100644 --- a/models/desired_lrp_requests.proto +++ b/models/desired_lrp_requests.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "desired_lrp.proto"; import "error.proto"; @@ -11,32 +12,32 @@ message ProtoDesiredLRPLifecycleResponse { } message ProtoDesiredLRPsResponse { - ProtoError error = 1; + ProtoError error = 1; repeated ProtoDesiredLRP desired_lrps = 2 [json_name = "desired_lrps"]; } message ProtoDesiredLRPsRequest { - string domain = 1 [json_name = "domain"]; + string domain = 1 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; repeated string process_guids = 2 [json_name = "process_guids"]; } message ProtoDesiredLRPResponse { - ProtoError error = 1; + ProtoError error = 1; ProtoDesiredLRP desired_lrp = 2 [json_name = "desired_lrp"]; } message ProtoDesiredLRPSchedulingInfosResponse { - ProtoError error = 1; + ProtoError error = 1; repeated ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_infos = 2 [json_name = "desired_lrp_scheduling_infos"]; } message ProtoDesiredLRPSchedulingInfoByProcessGuidResponse { - ProtoError error = 1; + ProtoError error = 1; ProtoDesiredLRPSchedulingInfo desired_lrp_scheduling_info = 2 [json_name = "desired_lrp_scheduling_info"]; } message ProtoDesiredLRPByProcessGuidRequest { - string process_guid = 1 [json_name = "process_guid"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; } message ProtoDesireLRPRequest { @@ -44,10 +45,10 @@ message ProtoDesireLRPRequest { } message ProtoUpdateDesiredLRPRequest { - string process_guid = 1 [json_name = "process_guid"]; - ProtoDesiredLRPUpdate update = 2; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; + ProtoDesiredLRPUpdate update = 2; } message ProtoRemoveDesiredLRPRequest { - string process_guid = 1 [json_name = "process_guid"]; + string process_guid = 1 [json_name = "process_guid", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index 3031017a..a95ea035 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: desired_lrp_requests.proto package models // Prevent copylock errors when using ProtoDesiredLRPLifecycleResponse directly type DesiredLRPLifecycleResponse struct { - Error *Error + Error *Error `json:"error,omitempty"` } func (this *DesiredLRPLifecycleResponse) Equal(that interface{}) bool { @@ -33,7 +33,11 @@ func (this *DesiredLRPLifecycleResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } return true @@ -95,8 +99,8 @@ func DesiredLRPLifecycleResponseFromProtoSlice(values []*ProtoDesiredLRPLifecycl // Prevent copylock errors when using ProtoDesiredLRPsResponse directly type DesiredLRPsResponse struct { - Error *Error - DesiredLrps []*DesiredLRP + Error *Error `json:"error,omitempty"` + DesiredLrps []*DesiredLRP `json:"desired_lrps,omitempty"` } func (this *DesiredLRPsResponse) Equal(that interface{}) bool { @@ -121,10 +125,18 @@ func (this *DesiredLRPsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if len(this.DesiredLrps) != len(that1.DesiredLrps) { + if this.DesiredLrps == nil { + if that1.DesiredLrps != nil { + return false + } + } else if len(this.DesiredLrps) != len(that1.DesiredLrps) { return false } for i := range this.DesiredLrps { @@ -204,8 +216,8 @@ func DesiredLRPsResponseFromProtoSlice(values []*ProtoDesiredLRPsResponse) []*De // Prevent copylock errors when using ProtoDesiredLRPsRequest directly type DesiredLRPsRequest struct { - Domain string - ProcessGuids []string + Domain string `json:"domain"` + ProcessGuids []string `json:"process_guids,omitempty"` } func (this *DesiredLRPsRequest) Equal(that interface{}) bool { @@ -233,7 +245,11 @@ func (this *DesiredLRPsRequest) Equal(that interface{}) bool { if this.Domain != that1.Domain { return false } - if len(this.ProcessGuids) != len(that1.ProcessGuids) { + if this.ProcessGuids == nil { + if that1.ProcessGuids != nil { + return false + } + } else if len(this.ProcessGuids) != len(that1.ProcessGuids) { return false } for i := range this.ProcessGuids { @@ -247,7 +263,9 @@ func (m *DesiredLRPsRequest) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPsRequest) SetDomain(value string) { if m != nil { @@ -313,8 +331,8 @@ func DesiredLRPsRequestFromProtoSlice(values []*ProtoDesiredLRPsRequest) []*Desi // Prevent copylock errors when using ProtoDesiredLRPResponse directly type DesiredLRPResponse struct { - Error *Error - DesiredLrp *DesiredLRP + Error *Error `json:"error,omitempty"` + DesiredLrp *DesiredLRP `json:"desired_lrp,omitempty"` } func (this *DesiredLRPResponse) Equal(that interface{}) bool { @@ -339,10 +357,18 @@ func (this *DesiredLRPResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if !this.DesiredLrp.Equal(*that1.DesiredLrp) { + if this.DesiredLrp == nil { + if that1.DesiredLrp != nil { + return false + } + } else if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } return true @@ -417,8 +443,8 @@ func DesiredLRPResponseFromProtoSlice(values []*ProtoDesiredLRPResponse) []*Desi // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfosResponse directly type DesiredLRPSchedulingInfosResponse struct { - Error *Error - DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo + Error *Error `json:"error,omitempty"` + DesiredLrpSchedulingInfos []*DesiredLRPSchedulingInfo `json:"desired_lrp_scheduling_infos,omitempty"` } func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { @@ -443,10 +469,18 @@ func (this *DesiredLRPSchedulingInfosResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if len(this.DesiredLrpSchedulingInfos) != len(that1.DesiredLrpSchedulingInfos) { + if this.DesiredLrpSchedulingInfos == nil { + if that1.DesiredLrpSchedulingInfos != nil { + return false + } + } else if len(this.DesiredLrpSchedulingInfos) != len(that1.DesiredLrpSchedulingInfos) { return false } for i := range this.DesiredLrpSchedulingInfos { @@ -526,8 +560,8 @@ func DesiredLRPSchedulingInfosResponseFromProtoSlice(values []*ProtoDesiredLRPSc // Prevent copylock errors when using ProtoDesiredLRPSchedulingInfoByProcessGuidResponse directly type DesiredLRPSchedulingInfoByProcessGuidResponse struct { - Error *Error - DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo + Error *Error `json:"error,omitempty"` + DesiredLrpSchedulingInfo *DesiredLRPSchedulingInfo `json:"desired_lrp_scheduling_info,omitempty"` } func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{}) bool { @@ -552,10 +586,18 @@ func (this *DesiredLRPSchedulingInfoByProcessGuidResponse) Equal(that interface{ return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if !this.DesiredLrpSchedulingInfo.Equal(*that1.DesiredLrpSchedulingInfo) { + if this.DesiredLrpSchedulingInfo == nil { + if that1.DesiredLrpSchedulingInfo != nil { + return false + } + } else if !this.DesiredLrpSchedulingInfo.Equal(*that1.DesiredLrpSchedulingInfo) { return false } return true @@ -630,7 +672,7 @@ func DesiredLRPSchedulingInfoByProcessGuidResponseFromProtoSlice(values []*Proto // Prevent copylock errors when using ProtoDesiredLRPByProcessGuidRequest directly type DesiredLRPByProcessGuidRequest struct { - ProcessGuid string + ProcessGuid string `json:"process_guid"` } func (this *DesiredLRPByProcessGuidRequest) Equal(that interface{}) bool { @@ -664,7 +706,9 @@ func (m *DesiredLRPByProcessGuidRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPByProcessGuidRequest) SetProcessGuid(value string) { if m != nil { @@ -717,7 +761,7 @@ func DesiredLRPByProcessGuidRequestFromProtoSlice(values []*ProtoDesiredLRPByPro // Prevent copylock errors when using ProtoDesireLRPRequest directly type DesireLRPRequest struct { - DesiredLrp *DesiredLRP + DesiredLrp *DesiredLRP `json:"desired_lrp,omitempty"` } func (this *DesireLRPRequest) Equal(that interface{}) bool { @@ -742,7 +786,11 @@ func (this *DesireLRPRequest) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(*that1.DesiredLrp) { + if this.DesiredLrp == nil { + if that1.DesiredLrp != nil { + return false + } + } else if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } return true @@ -804,8 +852,8 @@ func DesireLRPRequestFromProtoSlice(values []*ProtoDesireLRPRequest) []*DesireLR // Prevent copylock errors when using ProtoUpdateDesiredLRPRequest directly type UpdateDesiredLRPRequest struct { - ProcessGuid string - Update *DesiredLRPUpdate + ProcessGuid string `json:"process_guid"` + Update *DesiredLRPUpdate `json:"update,omitempty"` } func (this *UpdateDesiredLRPRequest) Equal(that interface{}) bool { @@ -833,7 +881,11 @@ func (this *UpdateDesiredLRPRequest) Equal(that interface{}) bool { if this.ProcessGuid != that1.ProcessGuid { return false } - if !this.Update.Equal(*that1.Update) { + if this.Update == nil { + if that1.Update != nil { + return false + } + } else if !this.Update.Equal(*that1.Update) { return false } return true @@ -842,7 +894,9 @@ func (m *UpdateDesiredLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *UpdateDesiredLRPRequest) SetProcessGuid(value string) { if m != nil { @@ -908,7 +962,7 @@ func UpdateDesiredLRPRequestFromProtoSlice(values []*ProtoUpdateDesiredLRPReques // Prevent copylock errors when using ProtoRemoveDesiredLRPRequest directly type RemoveDesiredLRPRequest struct { - ProcessGuid string + ProcessGuid string `json:"process_guid"` } func (this *RemoveDesiredLRPRequest) Equal(that interface{}) bool { @@ -942,7 +996,9 @@ func (m *RemoveDesiredLRPRequest) GetProcessGuid() string { if m != nil { return m.ProcessGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RemoveDesiredLRPRequest) SetProcessGuid(value string) { if m != nil { diff --git a/models/domain.pb.go b/models/domain.pb.go index ed1ca4b6..ea9ae10d 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: domain.proto package models @@ -181,25 +181,26 @@ var File_domain_proto protoreflect.FileDescriptor var file_domain_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0x5a, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, - 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x22, - 0x45, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x44, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, - 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, - 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x44, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, - 0x70, 0x73, 0x65, 0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, - 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x42, 0x22, 0x5a, 0x20, - 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, - 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5a, + 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x12, 0x18, 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x22, 0x45, 0x0a, 0x19, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x22, 0x4e, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, + 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, + 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x15, 0x0a, 0x03, 0x74, 0x74, + 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x74, 0x74, + 0x6c, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, + 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -236,6 +237,7 @@ func file_domain_proto_init() { if File_domain_proto != nil { return } + file_bbs_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { file_domain_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { diff --git a/models/domain.proto b/models/domain.proto index 80b364e5..d21a0dc9 100644 --- a/models/domain.proto +++ b/models/domain.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "error.proto"; message ProtoDomainsResponse { @@ -15,6 +16,6 @@ message ProtoUpsertDomainResponse { } message ProtoUpsertDomainRequest { - string domain = 1 [json_name = "domain"]; - uint32 ttl = 2 [json_name = "ttl"]; + string domain = 1 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; + uint32 ttl = 2 [json_name = "ttl", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 4aecbc51..3db27200 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: domain.proto package models // Prevent copylock errors when using ProtoDomainsResponse directly type DomainsResponse struct { - Error *Error - Domains []string + Error *Error `json:"error,omitempty"` + Domains []string `json:"domains,omitempty"` } func (this *DomainsResponse) Equal(that interface{}) bool { @@ -34,10 +34,18 @@ func (this *DomainsResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if len(this.Domains) != len(that1.Domains) { + if this.Domains == nil { + if that1.Domains != nil { + return false + } + } else if len(this.Domains) != len(that1.Domains) { return false } for i := range this.Domains { @@ -117,7 +125,7 @@ func DomainsResponseFromProtoSlice(values []*ProtoDomainsResponse) []*DomainsRes // Prevent copylock errors when using ProtoUpsertDomainResponse directly type UpsertDomainResponse struct { - Error *Error + Error *Error `json:"error,omitempty"` } func (this *UpsertDomainResponse) Equal(that interface{}) bool { @@ -142,7 +150,11 @@ func (this *UpsertDomainResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } return true @@ -204,8 +216,8 @@ func UpsertDomainResponseFromProtoSlice(values []*ProtoUpsertDomainResponse) []* // Prevent copylock errors when using ProtoUpsertDomainRequest directly type UpsertDomainRequest struct { - Domain string - Ttl uint32 + Domain string `json:"domain"` + Ttl uint32 `json:"ttl"` } func (this *UpsertDomainRequest) Equal(that interface{}) bool { @@ -242,7 +254,9 @@ func (m *UpsertDomainRequest) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *UpsertDomainRequest) SetDomain(value string) { if m != nil { @@ -253,7 +267,9 @@ func (m *UpsertDomainRequest) GetTtl() uint32 { if m != nil { return m.Ttl } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *UpsertDomainRequest) SetTtl(value uint32) { if m != nil { diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 83de2436..3c8856be 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: environment_variables.proto package models @@ -80,14 +80,15 @@ var File_environment_variables_proto protoreflect.FileDescriptor var file_environment_variables_proto_rawDesc = []byte{ 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x44, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, - 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, - 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x4e, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, + 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x17, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, + 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -119,6 +120,7 @@ func file_environment_variables_proto_init() { if File_environment_variables_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_environment_variables_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoEnvironmentVariable); i { diff --git a/models/environment_variables.proto b/models/environment_variables.proto index 942b00dc..36464506 100644 --- a/models/environment_variables.proto +++ b/models/environment_variables.proto @@ -3,8 +3,9 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; message ProtoEnvironmentVariable { - string name = 1 [json_name = "name"]; - string value = 2 [json_name = "value"]; + string name = 1 [json_name = "name", (bbs.bbs_json_always_emit) = true]; + string value = 2 [json_name = "value", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 8d6597d1..97918714 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: environment_variables.proto package models // Prevent copylock errors when using ProtoEnvironmentVariable directly type EnvironmentVariable struct { - Name string - Value string + Name string `json:"name"` + Value string `json:"value"` } func (this *EnvironmentVariable) Equal(that interface{}) bool { @@ -46,7 +46,9 @@ func (m *EnvironmentVariable) GetName() string { if m != nil { return m.Name } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EnvironmentVariable) SetName(value string) { if m != nil { @@ -57,7 +59,9 @@ func (m *EnvironmentVariable) GetValue() string { if m != nil { return m.Value } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EnvironmentVariable) SetValue(value string) { if m != nil { diff --git a/models/error.pb.go b/models/error.pb.go index 69d6a00f..e9950b55 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: error.proto package models @@ -195,54 +195,54 @@ var File_error_proto protoreflect.FileDescriptor var file_error_proto_rawDesc = []byte{ 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0xc4, 0x05, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, - 0x2b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, + 0x22, 0xcc, 0x05, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, + 0x30, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x07, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, - 0x3f, 0x01, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xe9, 0x04, 0x0a, 0x04, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, - 0x72, 0x72, 0x6f, 0x72, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, - 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, - 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x04, 0x12, 0x13, 0x0a, - 0x0f, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x10, 0x05, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x10, 0x06, 0x12, 0x0f, - 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x07, 0x12, - 0x18, 0x0a, 0x14, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x54, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x45, - 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x10, 0x08, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, 0x76, - 0x61, 0x6c, 0x69, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x10, 0x09, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x10, 0x0b, 0x12, 0x12, 0x0a, 0x0e, 0x52, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x10, 0x0c, 0x12, - 0x14, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, - 0x75, 0x6e, 0x64, 0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x45, - 0x72, 0x72, 0x6f, 0x72, 0x10, 0x0e, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, - 0x65, 0x64, 0x10, 0x0f, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, - 0x10, 0x10, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x10, 0x11, - 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, - 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x12, 0x12, 0x1c, 0x0a, - 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x42, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x10, 0x13, 0x12, 0x1e, 0x0a, 0x1a, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, - 0x55, 0x6e, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x10, 0x15, 0x12, 0x1a, 0x0a, 0x16, 0x52, - 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x4f, 0x6e, 0x44, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, - 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x10, 0x18, 0x12, 0x12, 0x0a, 0x0e, 0x47, 0x55, 0x49, 0x44, 0x47, - 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x1a, 0x12, 0x0f, 0x0a, 0x0b, 0x44, - 0x65, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x10, 0x1b, 0x12, 0x0c, 0x0a, 0x08, - 0x44, 0x65, 0x61, 0x64, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0x1c, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x6e, - 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x10, 0x1d, 0x12, 0x11, 0x0a, - 0x0d, 0x4c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x1e, - 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x10, 0x1f, 0x22, 0x04, 0x08, - 0x01, 0x10, 0x01, 0x22, 0x04, 0x08, 0x02, 0x10, 0x02, 0x22, 0x04, 0x08, 0x0a, 0x10, 0x0a, 0x22, - 0x04, 0x08, 0x14, 0x10, 0x14, 0x22, 0x04, 0x08, 0x16, 0x10, 0x16, 0x22, 0x04, 0x08, 0x17, 0x10, - 0x17, 0x22, 0x04, 0x08, 0x19, 0x10, 0x19, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x12, 0x20, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0xe0, 0x3f, 0x01, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x22, 0xe9, 0x04, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, + 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x00, 0x12, 0x11, + 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, + 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x10, 0x04, 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x10, 0x05, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x10, 0x06, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, + 0x64, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x07, 0x12, 0x18, 0x0a, 0x14, 0x46, 0x61, 0x69, 0x6c, 0x65, + 0x64, 0x54, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x10, + 0x08, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x09, 0x12, 0x14, 0x0a, + 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, + 0x74, 0x10, 0x0b, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, + 0x78, 0x69, 0x73, 0x74, 0x73, 0x10, 0x0c, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0d, 0x12, 0x0f, 0x0a, + 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x0e, 0x12, 0x1c, + 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, + 0x74, 0x42, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x1c, 0x0a, 0x18, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, + 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x10, 0x10, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x43, + 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x10, 0x11, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x63, 0x74, 0x75, + 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x46, 0x61, 0x69, + 0x6c, 0x65, 0x64, 0x10, 0x12, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x64, 0x10, 0x13, 0x12, 0x1e, 0x0a, 0x1a, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, + 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x55, 0x6e, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x65, + 0x64, 0x10, 0x15, 0x12, 0x1a, 0x0a, 0x16, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x4f, 0x6e, + 0x44, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x10, 0x18, 0x12, + 0x12, 0x0a, 0x0e, 0x47, 0x55, 0x49, 0x44, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x10, 0x1a, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, + 0x7a, 0x65, 0x10, 0x1b, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x65, 0x61, 0x64, 0x6c, 0x6f, 0x63, 0x6b, + 0x10, 0x1c, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x6e, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, + 0x62, 0x6c, 0x65, 0x10, 0x1d, 0x12, 0x11, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x6c, + 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x1e, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x10, 0x1f, 0x22, 0x04, 0x08, 0x01, 0x10, 0x01, 0x22, 0x04, 0x08, 0x02, 0x10, + 0x02, 0x22, 0x04, 0x08, 0x0a, 0x10, 0x0a, 0x22, 0x04, 0x08, 0x14, 0x10, 0x14, 0x22, 0x04, 0x08, + 0x16, 0x10, 0x16, 0x22, 0x04, 0x08, 0x17, 0x10, 0x17, 0x22, 0x04, 0x08, 0x19, 0x10, 0x19, 0x42, + 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, + 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/error.proto b/models/error.proto index b84686ae..0f3c9742 100644 --- a/models/error.proto +++ b/models/error.proto @@ -45,6 +45,6 @@ message ProtoError { Timeout = 31; } - Type type = 1 [json_name = "type"]; - string message = 2 [json_name = "message", (bbs.bbs_exclude_from_equal) = true]; + Type type = 1 [json_name = "type", (bbs.bbs_json_always_emit) = true]; + string message = 2 [json_name = "message", (bbs.bbs_json_always_emit) = true, (bbs.bbs_exclude_from_equal) = true]; } diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 6c6a0232..5976c62b 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: error.proto package models @@ -108,8 +108,8 @@ func (m Error_Type) String() string { // Prevent copylock errors when using ProtoError directly type Error struct { - Type Error_Type - Message string + Type Error_Type `json:"type"` + Message string `json:"message"` } func (this *Error) Equal(that interface{}) bool { @@ -143,7 +143,9 @@ func (m *Error) GetType() Error_Type { if m != nil { return m.Type } - return 0 + var defaultValue Error_Type + defaultValue = 0 + return defaultValue } func (m *Error) SetType(value Error_Type) { if m != nil { @@ -154,7 +156,9 @@ func (m *Error) GetMessage() string { if m != nil { return m.Message } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Error) SetMessage(value string) { if m != nil { diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 6328658a..a54355ea 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: evacuation.proto package models @@ -449,15 +449,16 @@ var File_evacuation_proto protoreflect.FileDescriptor var file_evacuation_proto_rawDesc = []byte{ 0x0a, 0x10, 0x65, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6b, 0x0a, 0x17, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x26, - 0x0a, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, + 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x70, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, + 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2b, 0x0a, 0x0e, 0x6b, 0x65, 0x65, + 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x22, 0xc6, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, @@ -471,7 +472,7 @@ var file_evacuation_proto_rawDesc = []byte{ 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, - 0xfd, 0x04, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, + 0x82, 0x05, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, @@ -503,63 +504,63 @@ var file_evacuation_proto_rawDesc = []byte{ 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, - 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, - 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, - 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, - 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, - 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, - 0xc6, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, - 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, + 0x31, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, + 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, + 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, + 0x08, 0x04, 0x10, 0x05, 0x22, 0xc6, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, + 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, + 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, + 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, + 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xf1, 0x01, + 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, + 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, + 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, - 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xec, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, - 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, - 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xc7, 0x01, 0x0a, 0x25, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, - 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, - 0x79, 0x22, 0x52, 0x0a, 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, - 0x65, 0x72, 0x72, 0x6f, 0x72, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, - 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x22, 0xc7, 0x01, 0x0a, 0x25, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, + 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, + 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, + 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0x52, 0x0a, 0x26, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, + 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x42, + 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, + 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -618,6 +619,7 @@ func file_evacuation_proto_init() { if File_evacuation_proto != nil { return } + file_bbs_proto_init() file_actual_lrp_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { diff --git a/models/evacuation.proto b/models/evacuation.proto index 88477cbc..631975e3 100644 --- a/models/evacuation.proto +++ b/models/evacuation.proto @@ -3,12 +3,13 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "actual_lrp.proto"; import "error.proto"; message ProtoEvacuationResponse { ProtoError error = 1; - bool keep_container = 2 [json_name = "keep_container"]; + bool keep_container = 2 [json_name = "keep_container", (bbs.bbs_json_always_emit) = true]; } message ProtoEvacuateClaimedActualLRPRequest { @@ -25,7 +26,7 @@ message ProtoEvacuateRunningActualLRPRequest { repeated ProtoActualLRPInternalRoute actual_lrp_internal_routes = 5 [json_name = "actual_lrp_internal_routes"]; map metric_tags = 6 [json_name = "metric_tags"]; optional bool Routable = 7; - string availability_zone = 8 [json_name = "availability_zone"]; + string availability_zone = 8 [json_name = "availability_zone", (bbs.bbs_json_always_emit) = true]; } message ProtoEvacuateStoppedActualLRPRequest { @@ -36,7 +37,7 @@ message ProtoEvacuateStoppedActualLRPRequest { message ProtoEvacuateCrashedActualLRPRequest { ProtoActualLRPKey actual_lrp_key = 1 [json_name = "actual_lrp_key"]; ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [json_name = "actual_lrp_instance_key"]; - string error_message = 3 [json_name = "error_message"]; + string error_message = 3 [json_name = "error_message", (bbs.bbs_json_always_emit) = true]; } message ProtoRemoveEvacuatingActualLRPRequest { diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index d7180681..bd21fa74 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: evacuation.proto package models // Prevent copylock errors when using ProtoEvacuationResponse directly type EvacuationResponse struct { - Error *Error - KeepContainer bool + Error *Error `json:"error,omitempty"` + KeepContainer bool `json:"keep_container"` } func (this *EvacuationResponse) Equal(that interface{}) bool { @@ -34,7 +34,11 @@ func (this *EvacuationResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } if this.KeepContainer != that1.KeepContainer { @@ -57,7 +61,9 @@ func (m *EvacuationResponse) GetKeepContainer() bool { if m != nil { return m.KeepContainer } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *EvacuationResponse) SetKeepContainer(value bool) { if m != nil { @@ -112,8 +118,8 @@ func EvacuationResponseFromProtoSlice(values []*ProtoEvacuationResponse) []*Evac // Prevent copylock errors when using ProtoEvacuateClaimedActualLRPRequest directly type EvacuateClaimedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` } func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { @@ -138,10 +144,18 @@ func (this *EvacuateClaimedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -216,13 +230,13 @@ func EvacuateClaimedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateClaime // Prevent copylock errors when using ProtoEvacuateRunningActualLRPRequest directly type EvacuateRunningActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ActualLrpNetInfo *ActualLRPNetInfo - ActualLrpInternalRoutes []*ActualLRPInternalRoute - MetricTags map[string]string - Routable *bool - AvailabilityZone string + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` + ActualLrpNetInfo *ActualLRPNetInfo `json:"actual_lrp_net_info,omitempty"` + ActualLrpInternalRoutes []*ActualLRPInternalRoute `json:"actual_lrp_internal_routes,omitempty"` + MetricTags map[string]string `json:"metric_tags,omitempty"` + Routable *bool `json:"Routable,omitempty"` + AvailabilityZone string `json:"availability_zone"` } func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { @@ -247,16 +261,32 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } - if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { + if this.ActualLrpNetInfo == nil { + if that1.ActualLrpNetInfo != nil { + return false + } + } else if !this.ActualLrpNetInfo.Equal(*that1.ActualLrpNetInfo) { return false } - if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { + if this.ActualLrpInternalRoutes == nil { + if that1.ActualLrpInternalRoutes != nil { + return false + } + } else if len(this.ActualLrpInternalRoutes) != len(that1.ActualLrpInternalRoutes) { return false } for i := range this.ActualLrpInternalRoutes { @@ -264,7 +294,11 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { return false } } - if len(this.MetricTags) != len(that1.MetricTags) { + if this.MetricTags == nil { + if that1.MetricTags != nil { + return false + } + } else if len(this.MetricTags) != len(that1.MetricTags) { return false } for i := range this.MetricTags { @@ -272,7 +306,11 @@ func (this *EvacuateRunningActualLRPRequest) Equal(that interface{}) bool { return false } } - if this.Routable != that1.Routable { + if this.Routable == nil { + if that1.Routable != nil { + return false + } + } else if *this.Routable != *that1.Routable { return false } if this.AvailabilityZone != that1.AvailabilityZone { @@ -342,7 +380,9 @@ func (m *EvacuateRunningActualLRPRequest) GetRoutable() *bool { if m != nil && m.Routable != nil { return m.Routable } - return nil + var defaultValue bool + defaultValue = false + return &defaultValue } func (m *EvacuateRunningActualLRPRequest) SetRoutable(value *bool) { if m != nil { @@ -353,7 +393,9 @@ func (m *EvacuateRunningActualLRPRequest) GetAvailabilityZone() string { if m != nil { return m.AvailabilityZone } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EvacuateRunningActualLRPRequest) SetAvailabilityZone(value string) { if m != nil { @@ -418,8 +460,8 @@ func EvacuateRunningActualLRPRequestFromProtoSlice(values []*ProtoEvacuateRunnin // Prevent copylock errors when using ProtoEvacuateStoppedActualLRPRequest directly type EvacuateStoppedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` } func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { @@ -444,10 +486,18 @@ func (this *EvacuateStoppedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -522,9 +572,9 @@ func EvacuateStoppedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateStoppe // Prevent copylock errors when using ProtoEvacuateCrashedActualLRPRequest directly type EvacuateCrashedActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey - ErrorMessage string + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` + ErrorMessage string `json:"error_message"` } func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { @@ -549,10 +599,18 @@ func (this *EvacuateCrashedActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } if this.ErrorMessage != that1.ErrorMessage { @@ -586,7 +644,9 @@ func (m *EvacuateCrashedActualLRPRequest) GetErrorMessage() string { if m != nil { return m.ErrorMessage } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EvacuateCrashedActualLRPRequest) SetErrorMessage(value string) { if m != nil { @@ -643,8 +703,8 @@ func EvacuateCrashedActualLRPRequestFromProtoSlice(values []*ProtoEvacuateCrashe // Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPRequest directly type RemoveEvacuatingActualLRPRequest struct { - ActualLrpKey *ActualLRPKey - ActualLrpInstanceKey *ActualLRPInstanceKey + ActualLrpKey *ActualLRPKey `json:"actual_lrp_key,omitempty"` + ActualLrpInstanceKey *ActualLRPInstanceKey `json:"actual_lrp_instance_key,omitempty"` } func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { @@ -669,10 +729,18 @@ func (this *RemoveEvacuatingActualLRPRequest) Equal(that interface{}) bool { return false } - if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { + if this.ActualLrpKey == nil { + if that1.ActualLrpKey != nil { + return false + } + } else if !this.ActualLrpKey.Equal(*that1.ActualLrpKey) { return false } - if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { + if this.ActualLrpInstanceKey == nil { + if that1.ActualLrpInstanceKey != nil { + return false + } + } else if !this.ActualLrpInstanceKey.Equal(*that1.ActualLrpInstanceKey) { return false } return true @@ -747,7 +815,7 @@ func RemoveEvacuatingActualLRPRequestFromProtoSlice(values []*ProtoRemoveEvacuat // Prevent copylock errors when using ProtoRemoveEvacuatingActualLRPResponse directly type RemoveEvacuatingActualLRPResponse struct { - Error *Error + Error *Error `json:"error,omitempty"` } func (this *RemoveEvacuatingActualLRPResponse) Equal(that interface{}) bool { @@ -772,7 +840,11 @@ func (this *RemoveEvacuatingActualLRPResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } return true diff --git a/models/events.pb.go b/models/events.pb.go index 84eaf104..a5674427 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: events.proto package models @@ -959,138 +959,144 @@ var file_events_proto_rawDesc = []byte{ 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x78, 0x0a, 0x22, 0x50, + 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x7d, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0xf3, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x54, 0x0a, 0x13, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, - 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x90, 0x04, 0x0a, 0x12, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x57, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, + 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0xc0, + 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, + 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x25, 0x0a, 0x0b, 0x63, 0x72, + 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, + 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x69, + 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, + 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, + 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x06, 0xc0, + 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x43, 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, + 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x13, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, - 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, - 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, - 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x28, - 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, - 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x4d, - 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, - 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x40, 0x0a, - 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, - 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, - 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, - 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x76, 0x61, - 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0x0b, - 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xd0, 0x02, 0x0a, 0x22, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x12, 0x46, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x60, 0x0a, 0x17, 0x61, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, - 0x90, 0x3f, 0x01, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, - 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, - 0x12, 0x30, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, - 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x78, + 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, + 0x3f, 0x01, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, + 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, + 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, + 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, + 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x61, + 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, + 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xdb, 0x02, 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x52, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, - 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x74, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, - 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x99, - 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, - 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, - 0x2d, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, - 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x74, 0x0a, 0x1b, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, + 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x12, 0x49, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, + 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, + 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, + 0x63, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x17, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, + 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x30, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, + 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, + 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x7d, 0x0a, 0x22, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x79, 0x0a, 0x1b, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, - 0x22, 0xa2, 0x02, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, - 0x46, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, - 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x60, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, - 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x74, 0x72, 0x61, + 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x9e, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x06, + 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x05, + 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x74, 0x72, + 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x79, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, + 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, + 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, + 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, + 0x64, 0x22, 0xb2, 0x02, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, + 0x12, 0x49, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x03, 0x90, 0x3f, 0x01, - 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x72, 0x61, - 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, - 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, - 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, - 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, - 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x2f, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, - 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, - 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, - 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, - 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, - 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x6b, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, - 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, - 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x0e, 0x61, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x63, 0x0a, 0x17, 0x61, + 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, + 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, + 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, + 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, + 0x12, 0x25, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, + 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, + 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, + 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x73, + 0x69, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x34, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x1d, 0x0a, + 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x15, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x6b, 0x0a, 0x15, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, + 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, - 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, - 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, - 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, - 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, - 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, - 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, - 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, - 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, + 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, + 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, + 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/events.proto b/models/events.proto index 36937b31..f3baf3e3 100644 --- a/models/events.proto +++ b/models/events.proto @@ -27,61 +27,61 @@ message ProtoActualLRPRemovedEvent { message ProtoActualLRPInstanceCreatedEvent { ProtoActualLRP actual_lrp = 1 [json_name = "actual_lrp"]; - string trace_id = 2 [json_name = "trace_id"]; + string trace_id = 2 [json_name = "trace_id", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPInfo { - ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_net_info"]; - int32 crash_count = 4 [json_name = "crash_count"]; + ProtoActualLRPNetInfo actual_lrp_net_info = 3 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_net_info", (bbs.bbs_json_always_emit) = true]; + int32 crash_count = 4 [json_name = "crash_count", (bbs.bbs_json_always_emit) = true]; string crash_reason = 5 [json_name = "crash_reason"]; - string state = 6 [json_name = "state"]; + string state = 6 [json_name = "state", (bbs.bbs_json_always_emit) = true]; string placement_error = 7 [json_name = "placement_error"]; - int64 since = 8 [json_name = "since"]; - ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true]; - ProtoActualLRP.Presence presence = 10 [json_name = "presence", (bbs.bbs_by_value) = true]; + int64 since = 8 [json_name = "since", (bbs.bbs_json_always_emit) = true]; + ProtoModificationTag modification_tag = 9 [json_name = "modification_tag", (bbs.bbs_by_value) = true, (bbs.bbs_json_always_emit) = true]; + ProtoActualLRP.Presence presence = 10 [json_name = "presence", (bbs.bbs_by_value) = true, (bbs.bbs_json_always_emit) = true]; optional bool Routable = 11; - string availability_zone = 12 [json_name = "availability_zone"]; + string availability_zone = 12 [json_name = "availability_zone", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPInstanceChangedEvent { - ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_key"]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_instance_key"]; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_key", (bbs.bbs_json_always_emit) = true]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_instance_key", (bbs.bbs_json_always_emit) = true]; ProtoActualLRPInfo before = 3; ProtoActualLRPInfo after = 4; - string trace_id = 5 [json_name = "trace_id"]; + string trace_id = 5 [json_name = "trace_id", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPInstanceRemovedEvent { ProtoActualLRP actual_lrp = 1 [json_name = "actual_lrp"]; - string trace_id = 2 [json_name = "trace_id"]; + string trace_id = 2 [json_name = "trace_id", (bbs.bbs_json_always_emit) = true]; } message ProtoDesiredLRPCreatedEvent { ProtoDesiredLRP desired_lrp = 1 [json_name = "desired_lrp"]; - string trace_id = 2 [json_name = "trace_id"]; + string trace_id = 2 [json_name = "trace_id", (bbs.bbs_json_always_emit) = true]; } message ProtoDesiredLRPChangedEvent { ProtoDesiredLRP before = 1; ProtoDesiredLRP after = 2; - string trace_id = 3 [json_name = "trace_id"]; + string trace_id = 3 [json_name = "trace_id", (bbs.bbs_json_always_emit) = true]; } message ProtoDesiredLRPRemovedEvent { ProtoDesiredLRP desired_lrp = 1 [json_name = "desired_lrp"]; - string trace_id = 2 [json_name = "trace_id"]; + string trace_id = 2 [json_name = "trace_id", (bbs.bbs_json_always_emit) = true]; } message ProtoActualLRPCrashedEvent { - ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_key"]; - ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_instance_key"]; - int32 crash_count = 3 [json_name = "crash_count"]; + ProtoActualLRPKey actual_lrp_key = 1 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_key", (bbs.bbs_json_always_emit) = true]; + ProtoActualLRPInstanceKey actual_lrp_instance_key = 2 [(bbs.bbs_by_value) = true, json_name = "actual_lrp_instance_key", (bbs.bbs_json_always_emit) = true]; + int32 crash_count = 3 [json_name = "crash_count", (bbs.bbs_json_always_emit) = true]; string crash_reason = 4 [json_name = "crash_reason"]; - int64 since = 5 [json_name = "since"]; + int64 since = 5 [json_name = "since", (bbs.bbs_json_always_emit) = true]; } message ProtoEventsByCellId { - string cell_id = 1 [json_name = "cell_id"]; + string cell_id = 1 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; } message ProtoTaskCreatedEvent { diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 380cb380..64b4f0a8 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: events.proto package models // Prevent copylock errors when using ProtoActualLRPCreatedEvent directly type ActualLRPCreatedEvent struct { - ActualLrpGroup *ActualLRPGroup + ActualLrpGroup *ActualLRPGroup `json:"actual_lrp_group,omitempty"` } func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { @@ -33,7 +33,11 @@ func (this *ActualLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { + if this.ActualLrpGroup == nil { + if that1.ActualLrpGroup != nil { + return false + } + } else if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { return false } return true @@ -95,8 +99,8 @@ func ActualLRPCreatedEventFromProtoSlice(values []*ProtoActualLRPCreatedEvent) [ // Prevent copylock errors when using ProtoActualLRPChangedEvent directly type ActualLRPChangedEvent struct { - Before *ActualLRPGroup - After *ActualLRPGroup + Before *ActualLRPGroup `json:"before,omitempty"` + After *ActualLRPGroup `json:"after,omitempty"` } func (this *ActualLRPChangedEvent) Equal(that interface{}) bool { @@ -121,10 +125,18 @@ func (this *ActualLRPChangedEvent) Equal(that interface{}) bool { return false } - if !this.Before.Equal(*that1.Before) { + if this.Before == nil { + if that1.Before != nil { + return false + } + } else if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(*that1.After) { + if this.After == nil { + if that1.After != nil { + return false + } + } else if !this.After.Equal(*that1.After) { return false } return true @@ -199,7 +211,7 @@ func ActualLRPChangedEventFromProtoSlice(values []*ProtoActualLRPChangedEvent) [ // Prevent copylock errors when using ProtoActualLRPRemovedEvent directly type ActualLRPRemovedEvent struct { - ActualLrpGroup *ActualLRPGroup + ActualLrpGroup *ActualLRPGroup `json:"actual_lrp_group,omitempty"` } func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { @@ -224,7 +236,11 @@ func (this *ActualLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { + if this.ActualLrpGroup == nil { + if that1.ActualLrpGroup != nil { + return false + } + } else if !this.ActualLrpGroup.Equal(*that1.ActualLrpGroup) { return false } return true @@ -286,8 +302,8 @@ func ActualLRPRemovedEventFromProtoSlice(values []*ProtoActualLRPRemovedEvent) [ // Prevent copylock errors when using ProtoActualLRPInstanceCreatedEvent directly type ActualLRPInstanceCreatedEvent struct { - ActualLrp *ActualLRP - TraceId string + ActualLrp *ActualLRP `json:"actual_lrp,omitempty"` + TraceId string `json:"trace_id"` } func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { @@ -312,7 +328,11 @@ func (this *ActualLRPInstanceCreatedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrp.Equal(*that1.ActualLrp) { + if this.ActualLrp == nil { + if that1.ActualLrp != nil { + return false + } + } else if !this.ActualLrp.Equal(*that1.ActualLrp) { return false } if this.TraceId != that1.TraceId { @@ -335,7 +355,9 @@ func (m *ActualLRPInstanceCreatedEvent) GetTraceId() string { if m != nil { return m.TraceId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInstanceCreatedEvent) SetTraceId(value string) { if m != nil { @@ -390,16 +412,16 @@ func ActualLRPInstanceCreatedEventFromProtoSlice(values []*ProtoActualLRPInstanc // Prevent copylock errors when using ProtoActualLRPInfo directly type ActualLRPInfo struct { - ActualLrpNetInfo ActualLRPNetInfo - CrashCount int32 - CrashReason string - State string - PlacementError string - Since int64 - ModificationTag ModificationTag - Presence ActualLRP_Presence - Routable *bool - AvailabilityZone string + ActualLrpNetInfo ActualLRPNetInfo `json:"actual_lrp_net_info"` + CrashCount int32 `json:"crash_count"` + CrashReason string `json:"crash_reason,omitempty"` + State string `json:"state"` + PlacementError string `json:"placement_error,omitempty"` + Since int64 `json:"since"` + ModificationTag ModificationTag `json:"modification_tag"` + Presence ActualLRP_Presence `json:"presence"` + Routable *bool `json:"Routable,omitempty"` + AvailabilityZone string `json:"availability_zone"` } func (this *ActualLRPInfo) Equal(that interface{}) bool { @@ -448,7 +470,11 @@ func (this *ActualLRPInfo) Equal(that interface{}) bool { if this.Presence != that1.Presence { return false } - if this.Routable != that1.Routable { + if this.Routable == nil { + if that1.Routable != nil { + return false + } + } else if *this.Routable != *that1.Routable { return false } if this.AvailabilityZone != that1.AvailabilityZone { @@ -465,7 +491,9 @@ func (m *ActualLRPInfo) GetCrashCount() int32 { if m != nil { return m.CrashCount } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ActualLRPInfo) SetCrashCount(value int32) { if m != nil { @@ -476,7 +504,9 @@ func (m *ActualLRPInfo) GetCrashReason() string { if m != nil { return m.CrashReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInfo) SetCrashReason(value string) { if m != nil { @@ -487,7 +517,9 @@ func (m *ActualLRPInfo) GetState() string { if m != nil { return m.State } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInfo) SetState(value string) { if m != nil { @@ -498,7 +530,9 @@ func (m *ActualLRPInfo) GetPlacementError() string { if m != nil { return m.PlacementError } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInfo) SetPlacementError(value string) { if m != nil { @@ -509,7 +543,9 @@ func (m *ActualLRPInfo) GetSince() int64 { if m != nil { return m.Since } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *ActualLRPInfo) SetSince(value int64) { if m != nil { @@ -533,7 +569,9 @@ func (m *ActualLRPInfo) GetRoutable() *bool { if m != nil && m.Routable != nil { return m.Routable } - return nil + var defaultValue bool + defaultValue = false + return &defaultValue } func (m *ActualLRPInfo) SetRoutable(value *bool) { if m != nil { @@ -544,7 +582,9 @@ func (m *ActualLRPInfo) GetAvailabilityZone() string { if m != nil { return m.AvailabilityZone } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInfo) SetAvailabilityZone(value string) { if m != nil { @@ -615,11 +655,11 @@ func ActualLRPInfoFromProtoSlice(values []*ProtoActualLRPInfo) []*ActualLRPInfo // Prevent copylock errors when using ProtoActualLRPInstanceChangedEvent directly type ActualLRPInstanceChangedEvent struct { - ActualLrpKey ActualLRPKey - ActualLrpInstanceKey ActualLRPInstanceKey - Before *ActualLRPInfo - After *ActualLRPInfo - TraceId string + ActualLrpKey ActualLRPKey `json:"actual_lrp_key"` + ActualLrpInstanceKey ActualLRPInstanceKey `json:"actual_lrp_instance_key"` + Before *ActualLRPInfo `json:"before,omitempty"` + After *ActualLRPInfo `json:"after,omitempty"` + TraceId string `json:"trace_id"` } func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { @@ -650,10 +690,18 @@ func (this *ActualLRPInstanceChangedEvent) Equal(that interface{}) bool { if !this.ActualLrpInstanceKey.Equal(that1.ActualLrpInstanceKey) { return false } - if !this.Before.Equal(*that1.Before) { + if this.Before == nil { + if that1.Before != nil { + return false + } + } else if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(*that1.After) { + if this.After == nil { + if that1.After != nil { + return false + } + } else if !this.After.Equal(*that1.After) { return false } if this.TraceId != that1.TraceId { @@ -697,7 +745,9 @@ func (m *ActualLRPInstanceChangedEvent) GetTraceId() string { if m != nil { return m.TraceId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInstanceChangedEvent) SetTraceId(value string) { if m != nil { @@ -758,8 +808,8 @@ func ActualLRPInstanceChangedEventFromProtoSlice(values []*ProtoActualLRPInstanc // Prevent copylock errors when using ProtoActualLRPInstanceRemovedEvent directly type ActualLRPInstanceRemovedEvent struct { - ActualLrp *ActualLRP - TraceId string + ActualLrp *ActualLRP `json:"actual_lrp,omitempty"` + TraceId string `json:"trace_id"` } func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { @@ -784,7 +834,11 @@ func (this *ActualLRPInstanceRemovedEvent) Equal(that interface{}) bool { return false } - if !this.ActualLrp.Equal(*that1.ActualLrp) { + if this.ActualLrp == nil { + if that1.ActualLrp != nil { + return false + } + } else if !this.ActualLrp.Equal(*that1.ActualLrp) { return false } if this.TraceId != that1.TraceId { @@ -807,7 +861,9 @@ func (m *ActualLRPInstanceRemovedEvent) GetTraceId() string { if m != nil { return m.TraceId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPInstanceRemovedEvent) SetTraceId(value string) { if m != nil { @@ -862,8 +918,8 @@ func ActualLRPInstanceRemovedEventFromProtoSlice(values []*ProtoActualLRPInstanc // Prevent copylock errors when using ProtoDesiredLRPCreatedEvent directly type DesiredLRPCreatedEvent struct { - DesiredLrp *DesiredLRP - TraceId string + DesiredLrp *DesiredLRP `json:"desired_lrp,omitempty"` + TraceId string `json:"trace_id"` } func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { @@ -888,7 +944,11 @@ func (this *DesiredLRPCreatedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(*that1.DesiredLrp) { + if this.DesiredLrp == nil { + if that1.DesiredLrp != nil { + return false + } + } else if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } if this.TraceId != that1.TraceId { @@ -911,7 +971,9 @@ func (m *DesiredLRPCreatedEvent) GetTraceId() string { if m != nil { return m.TraceId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPCreatedEvent) SetTraceId(value string) { if m != nil { @@ -966,9 +1028,9 @@ func DesiredLRPCreatedEventFromProtoSlice(values []*ProtoDesiredLRPCreatedEvent) // Prevent copylock errors when using ProtoDesiredLRPChangedEvent directly type DesiredLRPChangedEvent struct { - Before *DesiredLRP - After *DesiredLRP - TraceId string + Before *DesiredLRP `json:"before,omitempty"` + After *DesiredLRP `json:"after,omitempty"` + TraceId string `json:"trace_id"` } func (this *DesiredLRPChangedEvent) Equal(that interface{}) bool { @@ -993,10 +1055,18 @@ func (this *DesiredLRPChangedEvent) Equal(that interface{}) bool { return false } - if !this.Before.Equal(*that1.Before) { + if this.Before == nil { + if that1.Before != nil { + return false + } + } else if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(*that1.After) { + if this.After == nil { + if that1.After != nil { + return false + } + } else if !this.After.Equal(*that1.After) { return false } if this.TraceId != that1.TraceId { @@ -1030,7 +1100,9 @@ func (m *DesiredLRPChangedEvent) GetTraceId() string { if m != nil { return m.TraceId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPChangedEvent) SetTraceId(value string) { if m != nil { @@ -1087,8 +1159,8 @@ func DesiredLRPChangedEventFromProtoSlice(values []*ProtoDesiredLRPChangedEvent) // Prevent copylock errors when using ProtoDesiredLRPRemovedEvent directly type DesiredLRPRemovedEvent struct { - DesiredLrp *DesiredLRP - TraceId string + DesiredLrp *DesiredLRP `json:"desired_lrp,omitempty"` + TraceId string `json:"trace_id"` } func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { @@ -1113,7 +1185,11 @@ func (this *DesiredLRPRemovedEvent) Equal(that interface{}) bool { return false } - if !this.DesiredLrp.Equal(*that1.DesiredLrp) { + if this.DesiredLrp == nil { + if that1.DesiredLrp != nil { + return false + } + } else if !this.DesiredLrp.Equal(*that1.DesiredLrp) { return false } if this.TraceId != that1.TraceId { @@ -1136,7 +1212,9 @@ func (m *DesiredLRPRemovedEvent) GetTraceId() string { if m != nil { return m.TraceId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesiredLRPRemovedEvent) SetTraceId(value string) { if m != nil { @@ -1191,11 +1269,11 @@ func DesiredLRPRemovedEventFromProtoSlice(values []*ProtoDesiredLRPRemovedEvent) // Prevent copylock errors when using ProtoActualLRPCrashedEvent directly type ActualLRPCrashedEvent struct { - ActualLrpKey ActualLRPKey - ActualLrpInstanceKey ActualLRPInstanceKey - CrashCount int32 - CrashReason string - Since int64 + ActualLrpKey ActualLRPKey `json:"actual_lrp_key"` + ActualLrpInstanceKey ActualLRPInstanceKey `json:"actual_lrp_instance_key"` + CrashCount int32 `json:"crash_count"` + CrashReason string `json:"crash_reason,omitempty"` + Since int64 `json:"since"` } func (this *ActualLRPCrashedEvent) Equal(that interface{}) bool { @@ -1251,7 +1329,9 @@ func (m *ActualLRPCrashedEvent) GetCrashCount() int32 { if m != nil { return m.CrashCount } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ActualLRPCrashedEvent) SetCrashCount(value int32) { if m != nil { @@ -1262,7 +1342,9 @@ func (m *ActualLRPCrashedEvent) GetCrashReason() string { if m != nil { return m.CrashReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ActualLRPCrashedEvent) SetCrashReason(value string) { if m != nil { @@ -1273,7 +1355,9 @@ func (m *ActualLRPCrashedEvent) GetSince() int64 { if m != nil { return m.Since } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *ActualLRPCrashedEvent) SetSince(value int64) { if m != nil { @@ -1334,7 +1418,7 @@ func ActualLRPCrashedEventFromProtoSlice(values []*ProtoActualLRPCrashedEvent) [ // Prevent copylock errors when using ProtoEventsByCellId directly type EventsByCellId struct { - CellId string + CellId string `json:"cell_id"` } func (this *EventsByCellId) Equal(that interface{}) bool { @@ -1368,7 +1452,9 @@ func (m *EventsByCellId) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *EventsByCellId) SetCellId(value string) { if m != nil { @@ -1421,7 +1507,7 @@ func EventsByCellIdFromProtoSlice(values []*ProtoEventsByCellId) []*EventsByCell // Prevent copylock errors when using ProtoTaskCreatedEvent directly type TaskCreatedEvent struct { - Task *Task + Task *Task `json:"task,omitempty"` } func (this *TaskCreatedEvent) Equal(that interface{}) bool { @@ -1446,7 +1532,11 @@ func (this *TaskCreatedEvent) Equal(that interface{}) bool { return false } - if !this.Task.Equal(*that1.Task) { + if this.Task == nil { + if that1.Task != nil { + return false + } + } else if !this.Task.Equal(*that1.Task) { return false } return true @@ -1508,8 +1598,8 @@ func TaskCreatedEventFromProtoSlice(values []*ProtoTaskCreatedEvent) []*TaskCrea // Prevent copylock errors when using ProtoTaskChangedEvent directly type TaskChangedEvent struct { - Before *Task - After *Task + Before *Task `json:"before,omitempty"` + After *Task `json:"after,omitempty"` } func (this *TaskChangedEvent) Equal(that interface{}) bool { @@ -1534,10 +1624,18 @@ func (this *TaskChangedEvent) Equal(that interface{}) bool { return false } - if !this.Before.Equal(*that1.Before) { + if this.Before == nil { + if that1.Before != nil { + return false + } + } else if !this.Before.Equal(*that1.Before) { return false } - if !this.After.Equal(*that1.After) { + if this.After == nil { + if that1.After != nil { + return false + } + } else if !this.After.Equal(*that1.After) { return false } return true @@ -1612,7 +1710,7 @@ func TaskChangedEventFromProtoSlice(values []*ProtoTaskChangedEvent) []*TaskChan // Prevent copylock errors when using ProtoTaskRemovedEvent directly type TaskRemovedEvent struct { - Task *Task + Task *Task `json:"task,omitempty"` } func (this *TaskRemovedEvent) Equal(that interface{}) bool { @@ -1637,7 +1735,11 @@ func (this *TaskRemovedEvent) Equal(that interface{}) bool { return false } - if !this.Task.Equal(*that1.Task) { + if this.Task == nil { + if that1.Task != nil { + return false + } + } else if !this.Task.Equal(*that1.Task) { return false } return true diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 29759761..f427cac4 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: image_layer.proto package models @@ -271,53 +271,54 @@ var File_image_layer_proto protoreflect.FileDescriptor var file_image_layer_proto_rawDesc = []byte{ 0x0a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaf, 0x05, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc3, 0x05, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, - 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x65, 0x73, 0x74, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3c, 0x0a, 0x0a, - 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, - 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x41, 0x0a, 0x0a, 0x6d, 0x65, - 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, - 0x65, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x53, 0x0a, - 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, - 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, - 0x2e, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, - 0x52, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, - 0x68, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7b, 0x0a, 0x0f, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x16, 0x44, 0x69, 0x67, - 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x49, 0x6e, 0x76, 0x61, - 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, - 0x01, 0x1a, 0x18, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, - 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x26, 0x0a, 0x06, 0x53, - 0x48, 0x41, 0x35, 0x31, 0x32, 0x10, 0x02, 0x1a, 0x1a, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, - 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x35, 0x31, - 0x32, 0x08, 0x01, 0x22, 0x6f, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, - 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x47, 0x5a, 0x10, 0x01, 0x1a, - 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x67, 0x7a, - 0x12, 0x18, 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, - 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x03, 0x5a, 0x49, - 0x50, 0x10, 0x03, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, - 0x65, 0x5a, 0x69, 0x70, 0x22, 0x62, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, - 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, - 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x10, 0x01, 0x1a, 0x12, - 0x82, 0x7d, 0x0f, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x53, 0x68, 0x61, 0x72, - 0x65, 0x64, 0x12, 0x24, 0x0a, 0x09, 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, 0x49, 0x56, 0x45, 0x10, - 0x02, 0x1a, 0x15, 0x82, 0x7d, 0x12, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x45, - 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, - 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, - 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x15, + 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x2f, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x41, 0x0a, 0x0a, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, + 0x79, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, + 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x46, 0x0a, 0x0a, 0x6d, 0x65, 0x64, + 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x12, 0x53, 0x0a, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, 0x6f, + 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, + 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, + 0x69, 0x74, 0x68, 0x6d, 0x52, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, + 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, + 0x67, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7b, 0x0a, 0x0f, 0x44, 0x69, + 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, + 0x16, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, + 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x06, 0x53, 0x48, 0x41, + 0x32, 0x35, 0x36, 0x10, 0x01, 0x1a, 0x18, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, + 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, + 0x26, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x35, 0x31, 0x32, 0x10, 0x02, 0x1a, 0x1a, 0x82, 0x7d, 0x15, + 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, + 0x68, 0x61, 0x35, 0x31, 0x32, 0x08, 0x01, 0x22, 0x6f, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, + 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x47, + 0x5a, 0x10, 0x01, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, + 0x65, 0x54, 0x67, 0x7a, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x1a, 0x0f, 0x82, + 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x61, 0x72, 0x12, 0x18, + 0x0a, 0x03, 0x5a, 0x49, 0x50, 0x10, 0x03, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, + 0x61, 0x54, 0x79, 0x70, 0x65, 0x5a, 0x69, 0x70, 0x22, 0x62, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, + 0x10, 0x01, 0x1a, 0x12, 0x82, 0x7d, 0x0f, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, + 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x12, 0x24, 0x0a, 0x09, 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, + 0x49, 0x56, 0x45, 0x10, 0x02, 0x1a, 0x15, 0x82, 0x7d, 0x12, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, + 0x79, 0x70, 0x65, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x42, 0x22, 0x5a, 0x20, + 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, + 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/models/image_layer.proto b/models/image_layer.proto index 33d8b996..a0967253 100644 --- a/models/image_layer.proto +++ b/models/image_layer.proto @@ -26,10 +26,10 @@ message ProtoImageLayer { } string name = 1; - string url = 2 [json_name = "url"]; - string destination_path = 3 [json_name = "destination_path"]; - Type layer_type = 4 [json_name = "layer_type"]; - MediaType media_type = 5 [json_name = "media_type"]; + string url = 2 [json_name = "url", (bbs.bbs_json_always_emit) = true]; + string destination_path = 3 [json_name = "destination_path", (bbs.bbs_json_always_emit) = true]; + Type layer_type = 4 [json_name = "layer_type", (bbs.bbs_json_always_emit) = true]; + MediaType media_type = 5 [json_name = "media_type", (bbs.bbs_json_always_emit) = true]; DigestAlgorithm digest_algorithm = 6 [json_name = "digest_algorithm"]; string digest_value = 7 [json_name = "digest_value"]; } diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index b0ce4ca8..d3901f34 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: image_layer.proto package models @@ -105,13 +105,13 @@ func (m ImageLayer_Type) String() string { // Prevent copylock errors when using ProtoImageLayer directly type ImageLayer struct { - Name string - Url string - DestinationPath string - LayerType ImageLayer_Type - MediaType ImageLayer_MediaType - DigestAlgorithm ImageLayer_DigestAlgorithm - DigestValue string + Name string `json:"name,omitempty"` + Url string `json:"url"` + DestinationPath string `json:"destination_path"` + LayerType ImageLayer_Type `json:"layer_type"` + MediaType ImageLayer_MediaType `json:"media_type"` + DigestAlgorithm ImageLayer_DigestAlgorithm `json:"digest_algorithm,omitempty"` + DigestValue string `json:"digest_value,omitempty"` } func (this *ImageLayer) Equal(that interface{}) bool { @@ -163,7 +163,9 @@ func (m *ImageLayer) GetName() string { if m != nil { return m.Name } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ImageLayer) SetName(value string) { if m != nil { @@ -174,7 +176,9 @@ func (m *ImageLayer) GetUrl() string { if m != nil { return m.Url } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ImageLayer) SetUrl(value string) { if m != nil { @@ -185,7 +189,9 @@ func (m *ImageLayer) GetDestinationPath() string { if m != nil { return m.DestinationPath } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ImageLayer) SetDestinationPath(value string) { if m != nil { @@ -196,7 +202,9 @@ func (m *ImageLayer) GetLayerType() ImageLayer_Type { if m != nil { return m.LayerType } - return 0 + var defaultValue ImageLayer_Type + defaultValue = 0 + return defaultValue } func (m *ImageLayer) SetLayerType(value ImageLayer_Type) { if m != nil { @@ -207,7 +215,9 @@ func (m *ImageLayer) GetMediaType() ImageLayer_MediaType { if m != nil { return m.MediaType } - return 0 + var defaultValue ImageLayer_MediaType + defaultValue = 0 + return defaultValue } func (m *ImageLayer) SetMediaType(value ImageLayer_MediaType) { if m != nil { @@ -218,7 +228,9 @@ func (m *ImageLayer) GetDigestAlgorithm() ImageLayer_DigestAlgorithm { if m != nil { return m.DigestAlgorithm } - return 0 + var defaultValue ImageLayer_DigestAlgorithm + defaultValue = 0 + return defaultValue } func (m *ImageLayer) SetDigestAlgorithm(value ImageLayer_DigestAlgorithm) { if m != nil { @@ -229,7 +241,9 @@ func (m *ImageLayer) GetDigestValue() string { if m != nil { return m.DigestValue } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ImageLayer) SetDigestValue(value string) { if m != nil { diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index de6e1869..feaae0a3 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: log_rate_limit.proto package models diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index f453f4f4..9833f7b4 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: log_rate_limit.proto package models // Prevent copylock errors when using ProtoLogRateLimit directly type LogRateLimit struct { - BytesPerSecond int64 + BytesPerSecond int64 `json:"bytes_per_second,omitempty"` } func (this *LogRateLimit) Equal(that interface{}) bool { @@ -42,7 +42,9 @@ func (m *LogRateLimit) GetBytesPerSecond() int64 { if m != nil { return m.BytesPerSecond } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *LogRateLimit) SetBytesPerSecond(value int64) { if m != nil { diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index a205a885..1652360f 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: metric_tags.proto package models diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 57a56441..e51d08e0 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: metric_tags.proto package models @@ -42,8 +42,8 @@ func (m MetricTagValue_DynamicValue) String() string { // Prevent copylock errors when using ProtoMetricTagValue directly type MetricTagValue struct { - Static string - Dynamic MetricTagValue_DynamicValue + Static string `json:"static,omitempty"` + Dynamic MetricTagValue_DynamicValue `json:"dynamic,omitempty"` } func (this *MetricTagValue) Equal(that interface{}) bool { @@ -80,7 +80,9 @@ func (m *MetricTagValue) GetStatic() string { if m != nil { return m.Static } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *MetricTagValue) SetStatic(value string) { if m != nil { @@ -91,7 +93,9 @@ func (m *MetricTagValue) GetDynamic() MetricTagValue_DynamicValue { if m != nil { return m.Dynamic } - return 0 + var defaultValue MetricTagValue_DynamicValue + defaultValue = 0 + return defaultValue } func (m *MetricTagValue) SetDynamic(value MetricTagValue_DynamicValue) { if m != nil { diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 9d8c1807..09c7cf55 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: modification_tag.proto package models @@ -80,13 +80,15 @@ var File_modification_tag_proto protoreflect.FileDescriptor var file_modification_tag_proto_rawDesc = []byte{ 0x0a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x22, 0x42, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, - 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x14, - 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, - 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, - 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4c, 0x0a, 0x14, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x54, 0x61, 0x67, 0x12, 0x19, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x19, + 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, + 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, + 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -118,6 +120,7 @@ func file_modification_tag_proto_init() { if File_modification_tag_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_modification_tag_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoModificationTag); i { diff --git a/models/modification_tag.proto b/models/modification_tag.proto index 79fe2fa9..9deedf04 100644 --- a/models/modification_tag.proto +++ b/models/modification_tag.proto @@ -3,9 +3,10 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; message ProtoModificationTag { - string epoch = 1 [json_name = "epoch"]; - uint32 index = 2 [json_name = "index"]; + string epoch = 1 [json_name = "epoch", (bbs.bbs_json_always_emit) = true]; + uint32 index = 2 [json_name = "index", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 0815522f..445e96f3 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: modification_tag.proto package models // Prevent copylock errors when using ProtoModificationTag directly type ModificationTag struct { - Epoch string - Index uint32 + Epoch string `json:"epoch"` + Index uint32 `json:"index"` } func (this *ModificationTag) Equal(that interface{}) bool { @@ -46,7 +46,9 @@ func (m *ModificationTag) GetEpoch() string { if m != nil { return m.Epoch } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *ModificationTag) SetEpoch(value string) { if m != nil { @@ -57,7 +59,9 @@ func (m *ModificationTag) GetIndex() uint32 { if m != nil { return m.Index } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *ModificationTag) SetIndex(value uint32) { if m != nil { diff --git a/models/network.pb.go b/models/network.pb.go index df3f1622..17ed437c 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: network.proto package models diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 5cedfc24..e434efb0 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: network.proto package models // Prevent copylock errors when using ProtoNetwork directly type Network struct { - Properties map[string]string + Properties map[string]string `json:"properties,omitempty"` } func (this *Network) Equal(that interface{}) bool { @@ -33,7 +33,11 @@ func (this *Network) Equal(that interface{}) bool { return false } - if len(this.Properties) != len(that1.Properties) { + if this.Properties == nil { + if that1.Properties != nil { + return false + } + } else if len(this.Properties) != len(that1.Properties) { return false } for i := range this.Properties { diff --git a/models/ping.pb.go b/models/ping.pb.go index 7652906c..9ae632e5 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: ping.proto package models @@ -71,9 +71,10 @@ var File_ping_proto protoreflect.FileDescriptor var file_ping_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x22, 0x31, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, - 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x76, + 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x36, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, @@ -109,6 +110,7 @@ func file_ping_proto_init() { if File_ping_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_ping_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoPingResponse); i { diff --git a/models/ping.proto b/models/ping.proto index 2df3a8f0..5afb0798 100644 --- a/models/ping.proto +++ b/models/ping.proto @@ -3,7 +3,8 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; message ProtoPingResponse { - bool available = 1 [json_name = "available"]; + bool available = 1 [json_name = "available", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 293e4e80..2295b5a9 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: ping.proto package models // Prevent copylock errors when using ProtoPingResponse directly type PingResponse struct { - Available bool + Available bool `json:"available"` } func (this *PingResponse) Equal(that interface{}) bool { @@ -42,7 +42,9 @@ func (m *PingResponse) GetAvailable() bool { if m != nil { return m.Available } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *PingResponse) SetAvailable(value bool) { if m != nil { diff --git a/models/security_group.pb.go b/models/security_group.pb.go index 9cba9c3b..d366a767 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: security_group.proto package models @@ -229,35 +229,37 @@ var File_security_group_proto protoreflect.FileDescriptor var file_security_group_proto_rawDesc = []byte{ 0x0a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x38, - 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x37, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x49, 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, - 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x22, 0x93, 0x02, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, - 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, - 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x05, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, - 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x36, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, - 0x61, 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, - 0x67, 0x65, 0x52, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x33, - 0x0a, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x49, 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, - 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, + 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x42, 0x0a, 0x0e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x19, 0x0a, 0x05, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x15, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x41, 0x0a, + 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x17, + 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, + 0x22, 0x98, 0x02, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, + 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x64, + 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x05, 0x70, + 0x6f, 0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, + 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x36, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, + 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, + 0x65, 0x52, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x33, 0x0a, + 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, + 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, + 0x66, 0x6f, 0x12, 0x15, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, + 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, + 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, + 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -293,6 +295,7 @@ func file_security_group_proto_init() { if File_security_group_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_security_group_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoPortRange); i { diff --git a/models/security_group.proto b/models/security_group.proto index 8f7de56c..79188c39 100644 --- a/models/security_group.proto +++ b/models/security_group.proto @@ -3,23 +3,24 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; message ProtoPortRange { - uint32 start = 1 [json_name = "start"]; - uint32 end = 2 [json_name = "end"]; + uint32 start = 1 [json_name = "start", (bbs.bbs_json_always_emit) = true]; + uint32 end = 2 [json_name = "end", (bbs.bbs_json_always_emit) = true]; } message ProtoICMPInfo { - int32 type = 1 [json_name = "type"]; - int32 code = 2 [json_name = "code"]; + int32 type = 1 [json_name = "type", (bbs.bbs_json_always_emit) = true]; + int32 code = 2 [json_name = "code", (bbs.bbs_json_always_emit) = true]; } message ProtoSecurityGroupRule { - string protocol = 1; - repeated string destinations = 2; - repeated uint32 ports = 3 [packed = false]; - ProtoPortRange port_range = 4 [json_name = "port_range"]; - ProtoICMPInfo icmp_info = 5 [json_name = "icmp_info"]; - bool log = 6 [json_name = "log"]; - repeated string annotations = 7; + string protocol = 1; + repeated string destinations = 2; + repeated uint32 ports = 3 [packed = false]; + ProtoPortRange port_range = 4 [json_name = "port_range"]; + ProtoICMPInfo icmp_info = 5 [json_name = "icmp_info"]; + bool log = 6 [json_name = "log", (bbs.bbs_json_always_emit) = true]; + repeated string annotations = 7; } diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 0d372efd..9dca8603 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: security_group.proto package models // Prevent copylock errors when using ProtoPortRange directly type PortRange struct { - Start uint32 - End uint32 + Start uint32 `json:"start"` + End uint32 `json:"end"` } func (this *PortRange) Equal(that interface{}) bool { @@ -46,7 +46,9 @@ func (m *PortRange) GetStart() uint32 { if m != nil { return m.Start } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *PortRange) SetStart(value uint32) { if m != nil { @@ -57,7 +59,9 @@ func (m *PortRange) GetEnd() uint32 { if m != nil { return m.End } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *PortRange) SetEnd(value uint32) { if m != nil { @@ -112,8 +116,8 @@ func PortRangeFromProtoSlice(values []*ProtoPortRange) []*PortRange { // Prevent copylock errors when using ProtoICMPInfo directly type ICMPInfo struct { - Type int32 - Code int32 + Type int32 `json:"type"` + Code int32 `json:"code"` } func (this *ICMPInfo) Equal(that interface{}) bool { @@ -150,7 +154,9 @@ func (m *ICMPInfo) GetType() int32 { if m != nil { return m.Type } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ICMPInfo) SetType(value int32) { if m != nil { @@ -161,7 +167,9 @@ func (m *ICMPInfo) GetCode() int32 { if m != nil { return m.Code } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *ICMPInfo) SetCode(value int32) { if m != nil { @@ -216,13 +224,13 @@ func ICMPInfoFromProtoSlice(values []*ProtoICMPInfo) []*ICMPInfo { // Prevent copylock errors when using ProtoSecurityGroupRule directly type SecurityGroupRule struct { - Protocol string - Destinations []string - Ports []uint32 - PortRange *PortRange - IcmpInfo *ICMPInfo - Log bool - Annotations []string + Protocol string `json:"protocol,omitempty"` + Destinations []string `json:"destinations,omitempty"` + Ports []uint32 `json:"ports,omitempty"` + PortRange *PortRange `json:"port_range,omitempty"` + IcmpInfo *ICMPInfo `json:"icmp_info,omitempty"` + Log bool `json:"log"` + Annotations []string `json:"annotations,omitempty"` } func (this *SecurityGroupRule) Equal(that interface{}) bool { @@ -250,7 +258,11 @@ func (this *SecurityGroupRule) Equal(that interface{}) bool { if this.Protocol != that1.Protocol { return false } - if len(this.Destinations) != len(that1.Destinations) { + if this.Destinations == nil { + if that1.Destinations != nil { + return false + } + } else if len(this.Destinations) != len(that1.Destinations) { return false } for i := range this.Destinations { @@ -258,7 +270,11 @@ func (this *SecurityGroupRule) Equal(that interface{}) bool { return false } } - if len(this.Ports) != len(that1.Ports) { + if this.Ports == nil { + if that1.Ports != nil { + return false + } + } else if len(this.Ports) != len(that1.Ports) { return false } for i := range this.Ports { @@ -266,16 +282,28 @@ func (this *SecurityGroupRule) Equal(that interface{}) bool { return false } } - if !this.PortRange.Equal(*that1.PortRange) { + if this.PortRange == nil { + if that1.PortRange != nil { + return false + } + } else if !this.PortRange.Equal(*that1.PortRange) { return false } - if !this.IcmpInfo.Equal(*that1.IcmpInfo) { + if this.IcmpInfo == nil { + if that1.IcmpInfo != nil { + return false + } + } else if !this.IcmpInfo.Equal(*that1.IcmpInfo) { return false } if this.Log != that1.Log { return false } - if len(this.Annotations) != len(that1.Annotations) { + if this.Annotations == nil { + if that1.Annotations != nil { + return false + } + } else if len(this.Annotations) != len(that1.Annotations) { return false } for i := range this.Annotations { @@ -289,7 +317,9 @@ func (m *SecurityGroupRule) GetProtocol() string { if m != nil { return m.Protocol } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *SecurityGroupRule) SetProtocol(value string) { if m != nil { @@ -344,7 +374,9 @@ func (m *SecurityGroupRule) GetLog() bool { if m != nil { return m.Log } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *SecurityGroupRule) SetLog(value bool) { if m != nil { diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 139d10f2..b30d7146 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: sidecar.proto package models @@ -87,18 +87,19 @@ var File_sidecar_proto protoreflect.FileDescriptor var file_sidecar_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, - 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x73, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, - 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, + 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0x7d, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, + 0x72, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, + 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, + 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, + 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -132,6 +133,7 @@ func file_sidecar_proto_init() { if File_sidecar_proto != nil { return } + file_bbs_proto_init() file_actions_proto_init() if !protoimpl.UnsafeEnabled { file_sidecar_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { diff --git a/models/sidecar.proto b/models/sidecar.proto index 83a5e237..8ed1abd0 100644 --- a/models/sidecar.proto +++ b/models/sidecar.proto @@ -3,11 +3,12 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "actions.proto"; message ProtoSidecar { ProtoAction action = 1; - int32 disk_mb = 2 [json_name = "disk_mb"]; - int32 memory_mb = 3 [json_name = "memory_mb"]; + int32 disk_mb = 2 [json_name = "disk_mb", (bbs.bbs_json_always_emit) = true]; + int32 memory_mb = 3 [json_name = "memory_mb", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 778045d9..8f3d109e 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: sidecar.proto package models // Prevent copylock errors when using ProtoSidecar directly type Sidecar struct { - Action *Action - DiskMb int32 - MemoryMb int32 + Action *Action `json:"action,omitempty"` + DiskMb int32 `json:"disk_mb"` + MemoryMb int32 `json:"memory_mb"` } func (this *Sidecar) Equal(that interface{}) bool { @@ -35,7 +35,11 @@ func (this *Sidecar) Equal(that interface{}) bool { return false } - if !this.Action.Equal(*that1.Action) { + if this.Action == nil { + if that1.Action != nil { + return false + } + } else if !this.Action.Equal(*that1.Action) { return false } if this.DiskMb != that1.DiskMb { @@ -48,20 +52,22 @@ func (this *Sidecar) Equal(that interface{}) bool { } func (m *Sidecar) GetAction() *Action { if m != nil { - return m.Action.GetValue().(*Action) + return m.Action } return nil } func (m *Sidecar) SetAction(value *Action) { if m != nil { - m.Action.SetValue(value) + m.Action = value } } func (m *Sidecar) GetDiskMb() int32 { if m != nil { return m.DiskMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *Sidecar) SetDiskMb(value int32) { if m != nil { @@ -72,7 +78,9 @@ func (m *Sidecar) GetMemoryMb() int32 { if m != nil { return m.MemoryMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *Sidecar) SetMemoryMb(value int32) { if m != nil { diff --git a/models/task.pb.go b/models/task.pb.go index 9a2f18c6..fb1a9eff 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: task.proto package models @@ -479,23 +479,24 @@ var File_task_proto protoreflect.FileDescriptor var file_task_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, - 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, - 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x99, 0x0b, 0x0a, - 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x44, 0x0a, + 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, + 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x73, 0x65, 0x63, + 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x76, 0x6f, 0x6c, 0x75, + 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, + 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, + 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, + 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd5, 0x0b, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, @@ -503,125 +504,132 @@ var file_task_proto_rawDesc = []byte{ 0x65, 0x6e, 0x76, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, - 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, - 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, - 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x70, - 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x70, 0x72, - 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, - 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x75, - 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x38, 0x0a, 0x17, 0x63, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, - 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x63, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, - 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, - 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, - 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, - 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, - 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, - 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, - 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, - 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, - 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, - 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, + 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, + 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, + 0x6d, 0x62, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, + 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, + 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x0a, + 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, + 0x69, 0x64, 0x12, 0x27, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, + 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x6d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0b, 0x72, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, + 0x6c, 0x65, 0x12, 0x38, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x17, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, + 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, + 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, + 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, + 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, + 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, + 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, + 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, + 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, + 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, - 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x12, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, - 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, - 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x26, 0x0a, - 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, - 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, - 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, - 0x73, 0x12, 0x5a, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x26, 0x0a, - 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x3b, 0x0a, - 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x19, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, - 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, - 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1a, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, - 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x4d, 0x0a, - 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x1b, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbd, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x45, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, - 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x74, 0x61, - 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, - 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, - 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, - 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, - 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, - 0x5f, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, - 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, - 0x5f, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, - 0x5f, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, - 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, - 0x73, 0x75, 0x6c, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x0e, - 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0b, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, - 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x72, - 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2a, - 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, - 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, - 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, 0x0a, - 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, 0x73, - 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, - 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, - 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x11, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, + 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, + 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, + 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, + 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5a, + 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, + 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x0e, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, + 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, + 0x79, 0x65, 0x72, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, + 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, + 0x69, 0x6d, 0x69, 0x74, 0x12, 0x4d, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x18, 0x1b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, + 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0xfe, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x4a, 0x0a, + 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, + 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x23, + 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, + 0x5f, 0x61, 0x74, 0x12, 0x33, 0x0a, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x32, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x0a, 0x07, + 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x72, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1b, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, + 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x66, + 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, + 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, + 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x2f, 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, + 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, + 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, + 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, + 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, + 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x10, 0x04, + 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, + 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -680,6 +688,7 @@ func file_task_proto_init() { if File_task_proto != nil { return } + file_bbs_proto_init() file_actions_proto_init() file_environment_variables_proto_init() file_security_group_proto_init() diff --git a/models/task.proto b/models/task.proto index 473ebae2..d0763055 100644 --- a/models/task.proto +++ b/models/task.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "actions.proto"; import "environment_variables.proto"; import "security_group.proto"; @@ -15,17 +16,17 @@ import "log_rate_limit.proto"; import "metric_tags.proto"; message ProtoTaskDefinition { - string root_fs = 1 [json_name = "rootfs"]; + string root_fs = 1 [json_name = "rootfs", (bbs.bbs_json_always_emit) = true]; repeated ProtoEnvironmentVariable environment_variables = 2 [json_name = "env"]; ProtoAction action = 3; - int32 disk_mb = 4 [json_name = "disk_mb"]; - int32 memory_mb = 5 [json_name = "memory_mb"]; - uint32 cpu_weight = 6 [json_name = "cpu_weight"]; - bool privileged = 7 [json_name = "privileged"]; - string log_source = 8 [json_name = "log_source"]; - string log_guid = 9 [json_name = "log_guid"]; - string metrics_guid = 10 [json_name = "metrics_guid"]; - string result_file = 11 [json_name = "result_file"]; + int32 disk_mb = 4 [json_name = "disk_mb", (bbs.bbs_json_always_emit) = true]; + int32 memory_mb = 5 [json_name = "memory_mb", (bbs.bbs_json_always_emit) = true]; + uint32 cpu_weight = 6 [json_name = "cpu_weight", (bbs.bbs_json_always_emit) = true]; + bool privileged = 7 [json_name = "privileged", (bbs.bbs_json_always_emit) = true]; + string log_source = 8 [json_name = "log_source", (bbs.bbs_json_always_emit) = true]; + string log_guid = 9 [json_name = "log_guid", (bbs.bbs_json_always_emit) = true]; + string metrics_guid = 10 [json_name = "metrics_guid", (bbs.bbs_json_always_emit) = true]; + string result_file = 11 [json_name = "result_file", (bbs.bbs_json_always_emit) = true]; string completion_callback_url = 12 [json_name = "completion_callback_url"]; string annotation = 13; repeated ProtoSecurityGroupRule egress_rules = 14 [json_name = "egress_rules"]; @@ -35,10 +36,10 @@ message ProtoTaskDefinition { repeated ProtoVolumeMount volume_mounts = 18 [json_name = "volume_mounts"]; ProtoNetwork network = 19; repeated string placement_tags = 20 [json_name = "placement_tags"]; - int32 max_pids = 21 [json_name = "max_pids"]; + int32 max_pids = 21 [json_name = "max_pids", (bbs.bbs_json_always_emit) = true]; ProtoCertificateProperties certificate_properties = 22 [json_name = "certificate_properties"]; - string image_username = 23 [json_name = "image_username"]; - string image_password = 24 [json_name = "image_password"]; + string image_username = 23 [json_name = "image_username", (bbs.bbs_json_always_emit) = true]; + string image_password = 24 [json_name = "image_password", (bbs.bbs_json_always_emit) = true]; repeated ProtoImageLayer image_layers = 25 [json_name = "image_layers"]; ProtoLogRateLimit log_rate_limit = 26 [json_name = "log_rate_limit"]; map metric_tags = 27 [json_name = "metric_tags"]; @@ -53,22 +54,22 @@ message ProtoTask { Resolving = 4; } - ProtoTaskDefinition task_definition = 1 [json_name = "task_definition"]; + ProtoTaskDefinition task_definition = 1 [json_name = "task_definition", (bbs.bbs_json_always_emit) = true]; - string task_guid = 2 [json_name = "task_guid"]; - string domain = 3 [json_name = "domain"]; - int64 created_at = 4 [json_name = "created_at"]; - int64 updated_at = 5 [json_name = "updated_at"]; - int64 first_completed_at = 6 [json_name = "first_completed_at"]; + string task_guid = 2 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; + string domain = 3 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; + int64 created_at = 4 [json_name = "created_at", (bbs.bbs_json_always_emit) = true]; + int64 updated_at = 5 [json_name = "updated_at", (bbs.bbs_json_always_emit) = true]; + int64 first_completed_at = 6 [json_name = "first_completed_at", (bbs.bbs_json_always_emit) = true]; - State state = 7 [json_name = "state"]; + State state = 7 [json_name = "state", (bbs.bbs_json_always_emit) = true]; - string cell_id = 8 [json_name = "cell_id"]; + string cell_id = 8 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; - string result = 9 [json_name = "result"]; - bool failed = 10 [json_name = "failed"]; - string failure_reason = 11 [json_name = "failure_reason"]; - int32 rejection_count = 12 [json_name = "rejection_count"]; - string rejection_reason = 13 [json_name = "rejection_reason"]; + string result = 9 [json_name = "result", (bbs.bbs_json_always_emit) = true]; + bool failed = 10 [json_name = "failed", (bbs.bbs_json_always_emit) = true]; + string failure_reason = 11 [json_name = "failure_reason", (bbs.bbs_json_always_emit) = true]; + int32 rejection_count = 12 [json_name = "rejection_count", (bbs.bbs_json_always_emit) = true]; + string rejection_reason = 13 [json_name = "rejection_reason", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index dae0fcaf..8c5976b7 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: task.proto package models @@ -12,33 +12,33 @@ import ( // Prevent copylock errors when using ProtoTaskDefinition directly type TaskDefinition struct { - RootFs string - EnvironmentVariables []*EnvironmentVariable - Action *Action - DiskMb int32 - MemoryMb int32 - CpuWeight uint32 - Privileged bool - LogSource string - LogGuid string - MetricsGuid string - ResultFile string - CompletionCallbackUrl string - Annotation string - EgressRules []*SecurityGroupRule - CachedDependencies []*CachedDependency - LegacyDownloadUser string - TrustedSystemCertificatesPath string - VolumeMounts []*VolumeMount - Network *Network - PlacementTags []string - MaxPids int32 - CertificateProperties *CertificateProperties - ImageUsername string - ImagePassword string - ImageLayers []*ImageLayer - LogRateLimit *LogRateLimit - MetricTags map[string]*MetricTagValue + RootFs string `json:"rootfs"` + EnvironmentVariables []*EnvironmentVariable `json:"env,omitempty"` + Action *Action `json:"action,omitempty"` + DiskMb int32 `json:"disk_mb"` + MemoryMb int32 `json:"memory_mb"` + CpuWeight uint32 `json:"cpu_weight"` + Privileged bool `json:"privileged"` + LogSource string `json:"log_source"` + LogGuid string `json:"log_guid"` + MetricsGuid string `json:"metrics_guid"` + ResultFile string `json:"result_file"` + CompletionCallbackUrl string `json:"completion_callback_url,omitempty"` + Annotation string `json:"annotation,omitempty"` + EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` + CachedDependencies []*CachedDependency `json:"cached_dependencies,omitempty"` + LegacyDownloadUser string `json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` + Network *Network `json:"network,omitempty"` + PlacementTags []string `json:"placement_tags,omitempty"` + MaxPids int32 `json:"max_pids"` + CertificateProperties *CertificateProperties `json:"certificate_properties,omitempty"` + ImageUsername string `json:"image_username"` + ImagePassword string `json:"image_password"` + ImageLayers []*ImageLayer `json:"image_layers,omitempty"` + LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` + MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` } func (this *TaskDefinition) Equal(that interface{}) bool { @@ -66,7 +66,11 @@ func (this *TaskDefinition) Equal(that interface{}) bool { if this.RootFs != that1.RootFs { return false } - if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { + if this.EnvironmentVariables == nil { + if that1.EnvironmentVariables != nil { + return false + } + } else if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { return false } for i := range this.EnvironmentVariables { @@ -74,7 +78,11 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } - if !this.Action.Equal(*that1.Action) { + if this.Action == nil { + if that1.Action != nil { + return false + } + } else if !this.Action.Equal(*that1.Action) { return false } if this.DiskMb != that1.DiskMb { @@ -107,7 +115,11 @@ func (this *TaskDefinition) Equal(that interface{}) bool { if this.Annotation != that1.Annotation { return false } - if len(this.EgressRules) != len(that1.EgressRules) { + if this.EgressRules == nil { + if that1.EgressRules != nil { + return false + } + } else if len(this.EgressRules) != len(that1.EgressRules) { return false } for i := range this.EgressRules { @@ -115,7 +127,11 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } - if len(this.CachedDependencies) != len(that1.CachedDependencies) { + if this.CachedDependencies == nil { + if that1.CachedDependencies != nil { + return false + } + } else if len(this.CachedDependencies) != len(that1.CachedDependencies) { return false } for i := range this.CachedDependencies { @@ -129,7 +145,11 @@ func (this *TaskDefinition) Equal(that interface{}) bool { if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { return false } - if len(this.VolumeMounts) != len(that1.VolumeMounts) { + if this.VolumeMounts == nil { + if that1.VolumeMounts != nil { + return false + } + } else if len(this.VolumeMounts) != len(that1.VolumeMounts) { return false } for i := range this.VolumeMounts { @@ -137,10 +157,18 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } - if !this.Network.Equal(*that1.Network) { + if this.Network == nil { + if that1.Network != nil { + return false + } + } else if !this.Network.Equal(*that1.Network) { return false } - if len(this.PlacementTags) != len(that1.PlacementTags) { + if this.PlacementTags == nil { + if that1.PlacementTags != nil { + return false + } + } else if len(this.PlacementTags) != len(that1.PlacementTags) { return false } for i := range this.PlacementTags { @@ -151,7 +179,11 @@ func (this *TaskDefinition) Equal(that interface{}) bool { if this.MaxPids != that1.MaxPids { return false } - if !this.CertificateProperties.Equal(*that1.CertificateProperties) { + if this.CertificateProperties == nil { + if that1.CertificateProperties != nil { + return false + } + } else if !this.CertificateProperties.Equal(*that1.CertificateProperties) { return false } if this.ImageUsername != that1.ImageUsername { @@ -160,7 +192,11 @@ func (this *TaskDefinition) Equal(that interface{}) bool { if this.ImagePassword != that1.ImagePassword { return false } - if len(this.ImageLayers) != len(that1.ImageLayers) { + if this.ImageLayers == nil { + if that1.ImageLayers != nil { + return false + } + } else if len(this.ImageLayers) != len(that1.ImageLayers) { return false } for i := range this.ImageLayers { @@ -168,14 +204,22 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } - if !this.LogRateLimit.Equal(*that1.LogRateLimit) { + if this.LogRateLimit == nil { + if that1.LogRateLimit != nil { + return false + } + } else if !this.LogRateLimit.Equal(*that1.LogRateLimit) { return false } - if len(this.MetricTags) != len(that1.MetricTags) { + if this.MetricTags == nil { + if that1.MetricTags != nil { + return false + } + } else if len(this.MetricTags) != len(that1.MetricTags) { return false } for i := range this.MetricTags { - if this.MetricTags[i] != that1.MetricTags[i] { + if !this.MetricTags[i].Equal(that1.MetricTags[i]) { return false } } @@ -185,7 +229,9 @@ func (m *TaskDefinition) GetRootFs() string { if m != nil { return m.RootFs } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetRootFs(value string) { if m != nil { @@ -205,20 +251,22 @@ func (m *TaskDefinition) SetEnvironmentVariables(value []*EnvironmentVariable) { } func (m *TaskDefinition) GetAction() *Action { if m != nil { - return m.Action.GetValue().(*Action) + return m.Action } return nil } func (m *TaskDefinition) SetAction(value *Action) { if m != nil { - m.Action.SetValue(value) + m.Action = value } } func (m *TaskDefinition) GetDiskMb() int32 { if m != nil { return m.DiskMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *TaskDefinition) SetDiskMb(value int32) { if m != nil { @@ -229,7 +277,9 @@ func (m *TaskDefinition) GetMemoryMb() int32 { if m != nil { return m.MemoryMb } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *TaskDefinition) SetMemoryMb(value int32) { if m != nil { @@ -240,7 +290,9 @@ func (m *TaskDefinition) GetCpuWeight() uint32 { if m != nil { return m.CpuWeight } - return 0 + var defaultValue uint32 + defaultValue = 0 + return defaultValue } func (m *TaskDefinition) SetCpuWeight(value uint32) { if m != nil { @@ -251,7 +303,9 @@ func (m *TaskDefinition) GetPrivileged() bool { if m != nil { return m.Privileged } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *TaskDefinition) SetPrivileged(value bool) { if m != nil { @@ -262,7 +316,9 @@ func (m *TaskDefinition) GetLogSource() string { if m != nil { return m.LogSource } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetLogSource(value string) { if m != nil { @@ -273,7 +329,9 @@ func (m *TaskDefinition) GetLogGuid() string { if m != nil { return m.LogGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetLogGuid(value string) { if m != nil { @@ -284,7 +342,9 @@ func (m *TaskDefinition) GetMetricsGuid() string { if m != nil { return m.MetricsGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetMetricsGuid(value string) { if m != nil { @@ -295,7 +355,9 @@ func (m *TaskDefinition) GetResultFile() string { if m != nil { return m.ResultFile } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetResultFile(value string) { if m != nil { @@ -306,7 +368,9 @@ func (m *TaskDefinition) GetCompletionCallbackUrl() string { if m != nil { return m.CompletionCallbackUrl } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetCompletionCallbackUrl(value string) { if m != nil { @@ -317,7 +381,9 @@ func (m *TaskDefinition) GetAnnotation() string { if m != nil { return m.Annotation } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetAnnotation(value string) { if m != nil { @@ -352,7 +418,9 @@ func (m *TaskDefinition) GetLegacyDownloadUser() string { if m != nil { return m.LegacyDownloadUser } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetLegacyDownloadUser(value string) { if m != nil { @@ -363,7 +431,9 @@ func (m *TaskDefinition) GetTrustedSystemCertificatesPath() string { if m != nil { return m.TrustedSystemCertificatesPath } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetTrustedSystemCertificatesPath(value string) { if m != nil { @@ -407,7 +477,9 @@ func (m *TaskDefinition) GetMaxPids() int32 { if m != nil { return m.MaxPids } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *TaskDefinition) SetMaxPids(value int32) { if m != nil { @@ -429,7 +501,9 @@ func (m *TaskDefinition) GetImageUsername() string { if m != nil { return m.ImageUsername } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetImageUsername(value string) { if m != nil { @@ -440,7 +514,9 @@ func (m *TaskDefinition) GetImagePassword() string { if m != nil { return m.ImagePassword } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskDefinition) SetImagePassword(value string) { if m != nil { @@ -636,19 +712,19 @@ func (m Task_State) String() string { // Prevent copylock errors when using ProtoTask directly type Task struct { - TaskDefinition *TaskDefinition - TaskGuid string - Domain string - CreatedAt int64 - UpdatedAt int64 - FirstCompletedAt int64 - State Task_State - CellId string - Result string - Failed bool - FailureReason string - RejectionCount int32 - RejectionReason string + TaskDefinition *TaskDefinition `json:"task_definition"` + TaskGuid string `json:"task_guid"` + Domain string `json:"domain"` + CreatedAt int64 `json:"created_at"` + UpdatedAt int64 `json:"updated_at"` + FirstCompletedAt int64 `json:"first_completed_at"` + State Task_State `json:"state"` + CellId string `json:"cell_id"` + Result string `json:"result"` + Failed bool `json:"failed"` + FailureReason string `json:"failure_reason"` + RejectionCount int32 `json:"rejection_count"` + RejectionReason string `json:"rejection_reason"` } func (this *Task) Equal(that interface{}) bool { @@ -673,7 +749,11 @@ func (this *Task) Equal(that interface{}) bool { return false } - if !this.TaskDefinition.Equal(*that1.TaskDefinition) { + if this.TaskDefinition == nil { + if that1.TaskDefinition != nil { + return false + } + } else if !this.TaskDefinition.Equal(*that1.TaskDefinition) { return false } if this.TaskGuid != that1.TaskGuid { @@ -729,7 +809,9 @@ func (m *Task) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Task) SetTaskGuid(value string) { if m != nil { @@ -740,7 +822,9 @@ func (m *Task) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Task) SetDomain(value string) { if m != nil { @@ -751,7 +835,9 @@ func (m *Task) GetCreatedAt() int64 { if m != nil { return m.CreatedAt } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *Task) SetCreatedAt(value int64) { if m != nil { @@ -762,7 +848,9 @@ func (m *Task) GetUpdatedAt() int64 { if m != nil { return m.UpdatedAt } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *Task) SetUpdatedAt(value int64) { if m != nil { @@ -773,7 +861,9 @@ func (m *Task) GetFirstCompletedAt() int64 { if m != nil { return m.FirstCompletedAt } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *Task) SetFirstCompletedAt(value int64) { if m != nil { @@ -784,7 +874,9 @@ func (m *Task) GetState() Task_State { if m != nil { return m.State } - return 0 + var defaultValue Task_State + defaultValue = 0 + return defaultValue } func (m *Task) SetState(value Task_State) { if m != nil { @@ -795,7 +887,9 @@ func (m *Task) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Task) SetCellId(value string) { if m != nil { @@ -806,7 +900,9 @@ func (m *Task) GetResult() string { if m != nil { return m.Result } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Task) SetResult(value string) { if m != nil { @@ -817,7 +913,9 @@ func (m *Task) GetFailed() bool { if m != nil { return m.Failed } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *Task) SetFailed(value bool) { if m != nil { @@ -828,7 +926,9 @@ func (m *Task) GetFailureReason() string { if m != nil { return m.FailureReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Task) SetFailureReason(value string) { if m != nil { @@ -839,7 +939,9 @@ func (m *Task) GetRejectionCount() int32 { if m != nil { return m.RejectionCount } - return 0 + var defaultValue int32 + defaultValue = 0 + return defaultValue } func (m *Task) SetRejectionCount(value int32) { if m != nil { @@ -850,7 +952,9 @@ func (m *Task) GetRejectionReason() string { if m != nil { return m.RejectionReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *Task) SetRejectionReason(value string) { if m != nil { diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index c288db7f..ebb941af 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: task_requests.proto package models @@ -780,98 +780,106 @@ var File_task_requests_proto protoreflect.FileDescriptor var file_task_requests_proto_rawDesc = []byte{ 0x0a, 0x13, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0a, 0x74, - 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x46, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, - 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x95, - 0x01, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x54, 0x61, - 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x45, 0x0a, 0x0f, 0x74, 0x61, 0x73, - 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, + 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0x46, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, + 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0xa4, 0x01, 0x0a, 0x16, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x4a, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, + 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, - 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x4f, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, - 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, - 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x66, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, - 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x73, - 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0c, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, - 0x60, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, 0x6c, 0x54, 0x61, 0x73, 0x6b, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, - 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, - 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x3a, 0x02, 0x18, - 0x01, 0x22, 0x62, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, - 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, - 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x6a, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x34, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, - 0x73, 0x6b, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, - 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0xaa, 0x01, 0x0a, 0x18, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, - 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, - 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, - 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, - 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x22, 0x59, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, + 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, + 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x07, + 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x6b, 0x0a, 0x16, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, + 0x27, 0x0a, 0x0c, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x73, 0x68, 0x6f, 0x75, + 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x6a, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x46, 0x61, 0x69, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, + 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, - 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0xd1, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x0e, - 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, - 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1e, 0x0a, 0x0a, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x22, 0x45, 0x0a, 0x11, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x65, 0x6c, - 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, - 0x5f, 0x69, 0x64, 0x22, 0x67, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x12, 0x27, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x36, 0x0a, 0x16, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x79, 0x47, 0x75, 0x69, 0x64, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x22, 0x64, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, - 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, - 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x3a, 0x02, 0x18, 0x01, 0x22, 0x6c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6a, + 0x65, 0x63, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, + 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x12, 0x2f, 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, + 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, + 0x6f, 0x6e, 0x22, 0x39, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x47, + 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, + 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0xc3, 0x01, + 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, + 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, + 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, + 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, + 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, + 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, + 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x22, 0xea, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, + 0x6b, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, + 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, + 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, + 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x1b, + 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x61, + 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0a, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, + 0x22, 0x4f, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, + 0x64, 0x22, 0x67, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x12, 0x27, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, + 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3b, 0x0a, 0x16, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x79, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, + 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x64, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, + 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, + 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, + 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -925,6 +933,7 @@ func file_task_requests_proto_init() { if File_task_requests_proto != nil { return } + file_bbs_proto_init() file_task_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { diff --git a/models/task_requests.proto b/models/task_requests.proto index b87b08cf..25e2be35 100644 --- a/models/task_requests.proto +++ b/models/task_requests.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; import "task.proto"; import "error.proto"; @@ -11,68 +12,68 @@ message ProtoTaskLifecycleResponse { } message ProtoDesireTaskRequest { - ProtoTaskDefinition task_definition = 1 [json_name = "task_definition"]; - string task_guid = 2 [json_name = "task_guid"]; - string domain = 3 [json_name = "domain"]; + ProtoTaskDefinition task_definition = 1 [json_name = "task_definition", (bbs.bbs_json_always_emit) = true]; + string task_guid = 2 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; + string domain = 3 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; } message ProtoStartTaskRequest { - string task_guid = 1 [json_name = "task_guid"]; - string cell_id = 2 [json_name = "cell_id"]; + string task_guid = 1 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; + string cell_id = 2 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; } message ProtoStartTaskResponse { - ProtoError error = 1; - bool should_start = 2 [json_name = "should_start"]; + ProtoError error = 1; + bool should_start = 2 [json_name = "should_start", (bbs.bbs_json_always_emit) = true]; } message ProtoFailTaskRequest { option deprecated = true; - string task_guid = 1 [json_name = "task_guid"]; - string failure_reason = 2 [json_name = "failure_reason"]; + string task_guid = 1 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; + string failure_reason = 2 [json_name = "failure_reason", (bbs.bbs_json_always_emit) = true]; } message ProtoRejectTaskRequest { - string task_guid = 1 [json_name = "task_guid"]; - string rejection_reason = 2 [json_name = "rejection_reason"]; + string task_guid = 1 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; + string rejection_reason = 2 [json_name = "rejection_reason", (bbs.bbs_json_always_emit) = true]; } message ProtoTaskGuidRequest { - string task_guid = 1 [json_name = "task_guid"]; + string task_guid = 1 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; } message ProtoCompleteTaskRequest { - string task_guid = 1 [json_name = "task_guid"]; - string cell_id = 2 [json_name = "cell_id"]; - bool failed = 3 [json_name = "failed"]; - string failure_reason = 4 [json_name = "failure_reason"]; - string result = 5 [json_name = "result"]; + string task_guid = 1 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; + string cell_id = 2 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; + bool failed = 3 [json_name = "failed", (bbs.bbs_json_always_emit) = true]; + string failure_reason = 4 [json_name = "failure_reason", (bbs.bbs_json_always_emit) = true]; + string result = 5 [json_name = "result", (bbs.bbs_json_always_emit) = true]; } message ProtoTaskCallbackResponse { - string task_guid = 1 [json_name = "task_guid"]; - bool failed = 2 [json_name = "failed"]; - string failure_reason = 3 [json_name = "failure_reason"]; - string result = 4 [json_name = "result"]; - string annotation = 5; - int64 created_at = 6 [json_name = "created_at"]; + string task_guid = 1 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; + bool failed = 2 [json_name = "failed", (bbs.bbs_json_always_emit) = true]; + string failure_reason = 3 [json_name = "failure_reason", (bbs.bbs_json_always_emit) = true]; + string result = 4 [json_name = "result", (bbs.bbs_json_always_emit) = true]; + string annotation = 5; + int64 created_at = 6 [json_name = "created_at", (bbs.bbs_json_always_emit) = true]; } message ProtoTasksRequest{ - string domain = 1 [json_name = "domain"]; - string cell_id = 2 [json_name = "cell_id"]; + string domain = 1 [json_name = "domain", (bbs.bbs_json_always_emit) = true]; + string cell_id = 2 [json_name = "cell_id", (bbs.bbs_json_always_emit) = true]; } message ProtoTasksResponse{ - ProtoError error = 1; - repeated ProtoTask tasks = 2; + ProtoError error = 1; + repeated ProtoTask tasks = 2; } message ProtoTaskByGuidRequest{ - string task_guid = 1 [json_name = "task_guid"]; + string task_guid = 1 [json_name = "task_guid", (bbs.bbs_json_always_emit) = true]; } message ProtoTaskResponse{ - ProtoError error = 1; - ProtoTask task = 2; + ProtoError error = 1; + ProtoTask task = 2; } diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 6b361444..3f5196cd 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: task_requests.proto package models // Prevent copylock errors when using ProtoTaskLifecycleResponse directly type TaskLifecycleResponse struct { - Error *Error + Error *Error `json:"error,omitempty"` } func (this *TaskLifecycleResponse) Equal(that interface{}) bool { @@ -33,7 +33,11 @@ func (this *TaskLifecycleResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } return true @@ -95,9 +99,9 @@ func TaskLifecycleResponseFromProtoSlice(values []*ProtoTaskLifecycleResponse) [ // Prevent copylock errors when using ProtoDesireTaskRequest directly type DesireTaskRequest struct { - TaskDefinition *TaskDefinition - TaskGuid string - Domain string + TaskDefinition *TaskDefinition `json:"task_definition"` + TaskGuid string `json:"task_guid"` + Domain string `json:"domain"` } func (this *DesireTaskRequest) Equal(that interface{}) bool { @@ -122,7 +126,11 @@ func (this *DesireTaskRequest) Equal(that interface{}) bool { return false } - if !this.TaskDefinition.Equal(*that1.TaskDefinition) { + if this.TaskDefinition == nil { + if that1.TaskDefinition != nil { + return false + } + } else if !this.TaskDefinition.Equal(*that1.TaskDefinition) { return false } if this.TaskGuid != that1.TaskGuid { @@ -148,7 +156,9 @@ func (m *DesireTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesireTaskRequest) SetTaskGuid(value string) { if m != nil { @@ -159,7 +169,9 @@ func (m *DesireTaskRequest) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *DesireTaskRequest) SetDomain(value string) { if m != nil { @@ -216,8 +228,8 @@ func DesireTaskRequestFromProtoSlice(values []*ProtoDesireTaskRequest) []*Desire // Prevent copylock errors when using ProtoStartTaskRequest directly type StartTaskRequest struct { - TaskGuid string - CellId string + TaskGuid string `json:"task_guid"` + CellId string `json:"cell_id"` } func (this *StartTaskRequest) Equal(that interface{}) bool { @@ -254,7 +266,9 @@ func (m *StartTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *StartTaskRequest) SetTaskGuid(value string) { if m != nil { @@ -265,7 +279,9 @@ func (m *StartTaskRequest) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *StartTaskRequest) SetCellId(value string) { if m != nil { @@ -320,8 +336,8 @@ func StartTaskRequestFromProtoSlice(values []*ProtoStartTaskRequest) []*StartTas // Prevent copylock errors when using ProtoStartTaskResponse directly type StartTaskResponse struct { - Error *Error - ShouldStart bool + Error *Error `json:"error,omitempty"` + ShouldStart bool `json:"should_start"` } func (this *StartTaskResponse) Equal(that interface{}) bool { @@ -346,7 +362,11 @@ func (this *StartTaskResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } if this.ShouldStart != that1.ShouldStart { @@ -369,7 +389,9 @@ func (m *StartTaskResponse) GetShouldStart() bool { if m != nil { return m.ShouldStart } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *StartTaskResponse) SetShouldStart(value bool) { if m != nil { @@ -424,8 +446,8 @@ func StartTaskResponseFromProtoSlice(values []*ProtoStartTaskResponse) []*StartT // Prevent copylock errors when using ProtoFailTaskRequest directly type FailTaskRequest struct { - TaskGuid string - FailureReason string + TaskGuid string `json:"task_guid"` + FailureReason string `json:"failure_reason"` } func (this *FailTaskRequest) Equal(that interface{}) bool { @@ -462,7 +484,9 @@ func (m *FailTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *FailTaskRequest) SetTaskGuid(value string) { if m != nil { @@ -473,7 +497,9 @@ func (m *FailTaskRequest) GetFailureReason() string { if m != nil { return m.FailureReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *FailTaskRequest) SetFailureReason(value string) { if m != nil { @@ -528,8 +554,8 @@ func FailTaskRequestFromProtoSlice(values []*ProtoFailTaskRequest) []*FailTaskRe // Prevent copylock errors when using ProtoRejectTaskRequest directly type RejectTaskRequest struct { - TaskGuid string - RejectionReason string + TaskGuid string `json:"task_guid"` + RejectionReason string `json:"rejection_reason"` } func (this *RejectTaskRequest) Equal(that interface{}) bool { @@ -566,7 +592,9 @@ func (m *RejectTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RejectTaskRequest) SetTaskGuid(value string) { if m != nil { @@ -577,7 +605,9 @@ func (m *RejectTaskRequest) GetRejectionReason() string { if m != nil { return m.RejectionReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *RejectTaskRequest) SetRejectionReason(value string) { if m != nil { @@ -632,7 +662,7 @@ func RejectTaskRequestFromProtoSlice(values []*ProtoRejectTaskRequest) []*Reject // Prevent copylock errors when using ProtoTaskGuidRequest directly type TaskGuidRequest struct { - TaskGuid string + TaskGuid string `json:"task_guid"` } func (this *TaskGuidRequest) Equal(that interface{}) bool { @@ -666,7 +696,9 @@ func (m *TaskGuidRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskGuidRequest) SetTaskGuid(value string) { if m != nil { @@ -719,11 +751,11 @@ func TaskGuidRequestFromProtoSlice(values []*ProtoTaskGuidRequest) []*TaskGuidRe // Prevent copylock errors when using ProtoCompleteTaskRequest directly type CompleteTaskRequest struct { - TaskGuid string - CellId string - Failed bool - FailureReason string - Result string + TaskGuid string `json:"task_guid"` + CellId string `json:"cell_id"` + Failed bool `json:"failed"` + FailureReason string `json:"failure_reason"` + Result string `json:"result"` } func (this *CompleteTaskRequest) Equal(that interface{}) bool { @@ -769,7 +801,9 @@ func (m *CompleteTaskRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CompleteTaskRequest) SetTaskGuid(value string) { if m != nil { @@ -780,7 +814,9 @@ func (m *CompleteTaskRequest) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CompleteTaskRequest) SetCellId(value string) { if m != nil { @@ -791,7 +827,9 @@ func (m *CompleteTaskRequest) GetFailed() bool { if m != nil { return m.Failed } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *CompleteTaskRequest) SetFailed(value bool) { if m != nil { @@ -802,7 +840,9 @@ func (m *CompleteTaskRequest) GetFailureReason() string { if m != nil { return m.FailureReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CompleteTaskRequest) SetFailureReason(value string) { if m != nil { @@ -813,7 +853,9 @@ func (m *CompleteTaskRequest) GetResult() string { if m != nil { return m.Result } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *CompleteTaskRequest) SetResult(value string) { if m != nil { @@ -874,12 +916,12 @@ func CompleteTaskRequestFromProtoSlice(values []*ProtoCompleteTaskRequest) []*Co // Prevent copylock errors when using ProtoTaskCallbackResponse directly type TaskCallbackResponse struct { - TaskGuid string - Failed bool - FailureReason string - Result string - Annotation string - CreatedAt int64 + TaskGuid string `json:"task_guid"` + Failed bool `json:"failed"` + FailureReason string `json:"failure_reason"` + Result string `json:"result"` + Annotation string `json:"annotation,omitempty"` + CreatedAt int64 `json:"created_at"` } func (this *TaskCallbackResponse) Equal(that interface{}) bool { @@ -928,7 +970,9 @@ func (m *TaskCallbackResponse) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskCallbackResponse) SetTaskGuid(value string) { if m != nil { @@ -939,7 +983,9 @@ func (m *TaskCallbackResponse) GetFailed() bool { if m != nil { return m.Failed } - return false + var defaultValue bool + defaultValue = false + return defaultValue } func (m *TaskCallbackResponse) SetFailed(value bool) { if m != nil { @@ -950,7 +996,9 @@ func (m *TaskCallbackResponse) GetFailureReason() string { if m != nil { return m.FailureReason } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskCallbackResponse) SetFailureReason(value string) { if m != nil { @@ -961,7 +1009,9 @@ func (m *TaskCallbackResponse) GetResult() string { if m != nil { return m.Result } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskCallbackResponse) SetResult(value string) { if m != nil { @@ -972,7 +1022,9 @@ func (m *TaskCallbackResponse) GetAnnotation() string { if m != nil { return m.Annotation } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskCallbackResponse) SetAnnotation(value string) { if m != nil { @@ -983,7 +1035,9 @@ func (m *TaskCallbackResponse) GetCreatedAt() int64 { if m != nil { return m.CreatedAt } - return 0 + var defaultValue int64 + defaultValue = 0 + return defaultValue } func (m *TaskCallbackResponse) SetCreatedAt(value int64) { if m != nil { @@ -1046,8 +1100,8 @@ func TaskCallbackResponseFromProtoSlice(values []*ProtoTaskCallbackResponse) []* // Prevent copylock errors when using ProtoTasksRequest directly type TasksRequest struct { - Domain string - CellId string + Domain string `json:"domain"` + CellId string `json:"cell_id"` } func (this *TasksRequest) Equal(that interface{}) bool { @@ -1084,7 +1138,9 @@ func (m *TasksRequest) GetDomain() string { if m != nil { return m.Domain } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TasksRequest) SetDomain(value string) { if m != nil { @@ -1095,7 +1151,9 @@ func (m *TasksRequest) GetCellId() string { if m != nil { return m.CellId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TasksRequest) SetCellId(value string) { if m != nil { @@ -1150,8 +1208,8 @@ func TasksRequestFromProtoSlice(values []*ProtoTasksRequest) []*TasksRequest { // Prevent copylock errors when using ProtoTasksResponse directly type TasksResponse struct { - Error *Error - Tasks []*Task + Error *Error `json:"error,omitempty"` + Tasks []*Task `json:"tasks,omitempty"` } func (this *TasksResponse) Equal(that interface{}) bool { @@ -1176,10 +1234,18 @@ func (this *TasksResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if len(this.Tasks) != len(that1.Tasks) { + if this.Tasks == nil { + if that1.Tasks != nil { + return false + } + } else if len(this.Tasks) != len(that1.Tasks) { return false } for i := range this.Tasks { @@ -1259,7 +1325,7 @@ func TasksResponseFromProtoSlice(values []*ProtoTasksResponse) []*TasksResponse // Prevent copylock errors when using ProtoTaskByGuidRequest directly type TaskByGuidRequest struct { - TaskGuid string + TaskGuid string `json:"task_guid"` } func (this *TaskByGuidRequest) Equal(that interface{}) bool { @@ -1293,7 +1359,9 @@ func (m *TaskByGuidRequest) GetTaskGuid() string { if m != nil { return m.TaskGuid } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *TaskByGuidRequest) SetTaskGuid(value string) { if m != nil { @@ -1346,8 +1414,8 @@ func TaskByGuidRequestFromProtoSlice(values []*ProtoTaskByGuidRequest) []*TaskBy // Prevent copylock errors when using ProtoTaskResponse directly type TaskResponse struct { - Error *Error - Task *Task + Error *Error `json:"error,omitempty"` + Task *Task `json:"task,omitempty"` } func (this *TaskResponse) Equal(that interface{}) bool { @@ -1372,10 +1440,18 @@ func (this *TaskResponse) Equal(that interface{}) bool { return false } - if !this.Error.Equal(*that1.Error) { + if this.Error == nil { + if that1.Error != nil { + return false + } + } else if !this.Error.Equal(*that1.Error) { return false } - if !this.Task.Equal(*that1.Task) { + if this.Task == nil { + if that1.Task != nil { + return false + } + } else if !this.Task.Equal(*that1.Task) { return false } return true diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 1340e407..b77d9adb 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.1 -// protoc v5.26.1 +// protoc v5.27.0 // source: volume_mount.proto package models @@ -198,30 +198,33 @@ var File_volume_mount_proto protoreflect.FileDescriptor var file_volume_mount_proto_rawDesc = []byte{ 0x0a, 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x55, 0x0a, 0x11, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x12, - 0x22, 0x0a, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x22, 0xa9, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, - 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, - 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, - 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x64, 0x69, - 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x5f, 0x64, 0x69, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x73, 0x68, - 0x61, 0x72, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x44, - 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x4a, 0x04, 0x08, - 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x22, - 0x3a, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, - 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x72, 0x69, 0x76, 0x65, - 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x64, - 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, + 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5f, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x09, + 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x12, + 0x27, 0x0a, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xbd, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1b, 0x0a, + 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x29, 0x0a, 0x0d, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, + 0x72, 0x5f, 0x64, 0x69, 0x72, 0x12, 0x17, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x36, + 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x68, 0x61, + 0x72, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, + 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x04, + 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x22, 0x3f, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x12, 0x27, 0x0a, 0x0c, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x64, 0x72, 0x69, + 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, + 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, + 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -256,6 +259,7 @@ func file_volume_mount_proto_init() { if File_volume_mount_proto != nil { return } + file_bbs_proto_init() if !protoimpl.UnsafeEnabled { file_volume_mount_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProtoSharedDevice); i { diff --git a/models/volume_mount.proto b/models/volume_mount.proto index a3bb09e4..ec3cf676 100644 --- a/models/volume_mount.proto +++ b/models/volume_mount.proto @@ -3,23 +3,25 @@ syntax = "proto3"; package models; option go_package="code.cloudfoundry.org/bbs/models"; +import "bbs.proto"; + message ProtoSharedDevice { - string volume_id = 1 [json_name = "volume_id"]; - string mount_config = 2 [json_name = "mount_config"]; + string volume_id = 1 [json_name = "volume_id", (bbs.bbs_json_always_emit) = true]; + string mount_config = 2 [json_name = "mount_config", (bbs.bbs_json_always_emit) = true]; } message ProtoVolumeMount { reserved 2, 4, 5; - string driver = 1 [json_name = "driver"]; - string container_dir = 3 [json_name = "container_dir"]; - string mode = 6 [json_name = "mode"]; + string driver = 1 [json_name = "driver", (bbs.bbs_json_always_emit) = true]; + string container_dir = 3 [json_name = "container_dir", (bbs.bbs_json_always_emit) = true]; + string mode = 6 [json_name = "mode", (bbs.bbs_json_always_emit) = true]; // oneof device { - ProtoSharedDevice shared = 7 [json_name = "shared"]; + ProtoSharedDevice shared = 7 [json_name = "shared", (bbs.bbs_json_always_emit) = true]; // } } message ProtoVolumePlacement { - repeated string driver_names = 1 [json_name = "driver_names"]; + repeated string driver_names = 1 [json_name = "driver_names", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 674803e9..7fe23bd4 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.26.1 +// - protoc v5.27.0 // source: volume_mount.proto package models // Prevent copylock errors when using ProtoSharedDevice directly type SharedDevice struct { - VolumeId string - MountConfig string + VolumeId string `json:"volume_id"` + MountConfig string `json:"mount_config"` } func (this *SharedDevice) Equal(that interface{}) bool { @@ -46,7 +46,9 @@ func (m *SharedDevice) GetVolumeId() string { if m != nil { return m.VolumeId } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *SharedDevice) SetVolumeId(value string) { if m != nil { @@ -57,7 +59,9 @@ func (m *SharedDevice) GetMountConfig() string { if m != nil { return m.MountConfig } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *SharedDevice) SetMountConfig(value string) { if m != nil { @@ -112,10 +116,10 @@ func SharedDeviceFromProtoSlice(values []*ProtoSharedDevice) []*SharedDevice { // Prevent copylock errors when using ProtoVolumeMount directly type VolumeMount struct { - Driver string - ContainerDir string - Mode string - Shared *SharedDevice + Driver string `json:"driver"` + ContainerDir string `json:"container_dir"` + Mode string `json:"mode"` + Shared *SharedDevice `json:"shared"` } func (this *VolumeMount) Equal(that interface{}) bool { @@ -149,7 +153,11 @@ func (this *VolumeMount) Equal(that interface{}) bool { if this.Mode != that1.Mode { return false } - if !this.Shared.Equal(*that1.Shared) { + if this.Shared == nil { + if that1.Shared != nil { + return false + } + } else if !this.Shared.Equal(*that1.Shared) { return false } return true @@ -158,7 +166,9 @@ func (m *VolumeMount) GetDriver() string { if m != nil { return m.Driver } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *VolumeMount) SetDriver(value string) { if m != nil { @@ -169,7 +179,9 @@ func (m *VolumeMount) GetContainerDir() string { if m != nil { return m.ContainerDir } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *VolumeMount) SetContainerDir(value string) { if m != nil { @@ -180,7 +192,9 @@ func (m *VolumeMount) GetMode() string { if m != nil { return m.Mode } - return "" + var defaultValue string + defaultValue = "" + return defaultValue } func (m *VolumeMount) SetMode(value string) { if m != nil { @@ -250,7 +264,7 @@ func VolumeMountFromProtoSlice(values []*ProtoVolumeMount) []*VolumeMount { // Prevent copylock errors when using ProtoVolumePlacement directly type VolumePlacement struct { - DriverNames []string + DriverNames []string `json:"driver_names"` } func (this *VolumePlacement) Equal(that interface{}) bool { @@ -275,7 +289,11 @@ func (this *VolumePlacement) Equal(that interface{}) bool { return false } - if len(this.DriverNames) != len(that1.DriverNames) { + if this.DriverNames == nil { + if that1.DriverNames != nil { + return false + } + } else if len(this.DriverNames) != len(that1.DriverNames) { return false } for i := range this.DriverNames { From fe81ce2161be76aac56eec764c59531d80ec1004 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 30 May 2024 20:24:14 +0000 Subject: [PATCH 099/155] copy() is destination first --- models/desired_lrp.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index bd8c06f8..f7b4048a 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -34,10 +34,10 @@ func PreloadedRootFS(stack string) string { func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo, metricTags map[string]*MetricTagValue) DesiredLRP { environmentVariables := make([]*EnvironmentVariable, len(runInfo.EnvironmentVariables)) - copy(runInfo.EnvironmentVariables, environmentVariables) + copy(environmentVariables, runInfo.EnvironmentVariables) egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) - copy(runInfo.EgressRules, egressRules) + copy(egressRules, runInfo.EgressRules) desiredLrpKey := schedInfo.DesiredLrpKey desiredLrpResource := schedInfo.DesiredLrpResource @@ -84,10 +84,10 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo func (desiredLRP *DesiredLRP) AddRunInfo(runInfo DesiredLRPRunInfo) { environmentVariables := make([]*EnvironmentVariable, len(runInfo.EnvironmentVariables)) - copy(runInfo.EnvironmentVariables, environmentVariables) + copy(environmentVariables, runInfo.EnvironmentVariables) egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) - copy(runInfo.EgressRules, egressRules) + copy(egressRules, runInfo.EgressRules) desiredLRP.EnvironmentVariables = environmentVariables desiredLRP.CachedDependencies = runInfo.CachedDependencies @@ -257,10 +257,10 @@ func (d *DesiredLRP) DesiredLRPRoutingInfo() DesiredLRP { func (d *DesiredLRP) DesiredLRPRunInfo(createdAt time.Time) DesiredLRPRunInfo { environmentVariables := make([]*EnvironmentVariable, len(d.EnvironmentVariables)) - copy(d.EnvironmentVariables, environmentVariables) + copy(environmentVariables, d.EnvironmentVariables) egressRules := make([]*SecurityGroupRule, len(d.EgressRules)) - copy(d.EgressRules, egressRules) + copy(egressRules, d.EgressRules) return NewDesiredLRPRunInfo( d.DesiredLRPKey(), From 996a74c0bfdaa8e46bf3a1825d8c933172b3adcb Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 30 May 2024 20:27:10 +0000 Subject: [PATCH 100/155] Remove usage of protojson, encoding/json package is enough for our use case --- models/actions_test.go | 92 ++++++++--------------- models/desired_lrp.go | 30 ++++---- models/desired_lrp_test.go | 90 ++++++++++------------ models/environment_variables.go | 6 +- models/routes.go | 21 ++---- models/routes_test.go | 28 +++---- models/security_groups_test.go | 7 +- models/task_test.go | 36 +++------ models/test/model_helpers/constructors.go | 2 +- 9 files changed, 125 insertions(+), 187 deletions(-) diff --git a/models/actions_test.go b/models/actions_test.go index 5b58fe62..f5cf3d33 100644 --- a/models/actions_test.go +++ b/models/actions_test.go @@ -1,23 +1,22 @@ package models_test import ( + "encoding/json" "fmt" - "log" "time" "code.cloudfoundry.org/bbs/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "google.golang.org/protobuf/encoding/protojson" ) var _ = Describe("Actions", func() { itSerializes := func(actionPayload string, a *models.Action) { action := models.UnwrapAction(a) It("Action -> JSON for "+string(action.ActionType()), func() { - marshalJson, err := protojson.Marshal(a.GetProto()) + marshalJson, err := json.Marshal(a.GetValue()) Expect(err).NotTo(HaveOccurred()) - Expect(string(marshalJson)).To(MatchJSON(actionPayload)) + Expect(marshalJson).To(MatchJSON(actionPayload)) }) } @@ -25,10 +24,10 @@ var _ = Describe("Actions", func() { action := models.UnwrapAction(a) It("JSON -> Action for "+string(action.ActionType()), func() { wrappedJSON := fmt.Sprintf(`{"%s":%s}`, action.ActionType(), actionPayload) - marshalledAction := new(models.ProtoAction) - err := protojson.Unmarshal([]byte(wrappedJSON), marshalledAction) + marshalledAction := new(models.Action) + err := json.Unmarshal([]byte(wrappedJSON), marshalledAction) Expect(err).NotTo(HaveOccurred()) - Expect(marshalledAction.FromProto()).To(BeEquivalentTo(a)) + Expect(marshalledAction).To(BeEquivalentTo(a)) }) } @@ -61,30 +60,18 @@ var _ = Describe("Actions", func() { It("Action -> JSON for a Nil action", func() { var action *models.ProtoAction = nil By("marshalling to JSON", func() { - json, err := protojson.Marshal(action) + json, err := json.Marshal(action) Expect(err).NotTo(HaveOccurred()) - log.Printf("%+v\n", json) - Expect(json).To(MatchJSON("{}")) + Expect(json).To(MatchJSON("null")) }) }) It("JSON -> Action for Nil action", func() { By("unwrapping", func() { - unmarshalledAction := new(models.ProtoAction) - err := protojson.Unmarshal([]byte("{}"), unmarshalledAction) + var unmarshalledAction *models.Action + err := json.Unmarshal([]byte("null"), &unmarshalledAction) Expect(err).NotTo(HaveOccurred()) - // TODO: protojson.Unmarshal requires a non-nil pointer in order to work - // see if we can find an alternative way of doing this so the following line works - // Expect(unmarshalledAction).To(BeNil()) - Expect(unmarshalledAction.DownloadAction).To(BeNil()) - Expect(unmarshalledAction.UploadAction).To(BeNil()) - Expect(unmarshalledAction.RunAction).To(BeNil()) - Expect(unmarshalledAction.TimeoutAction).To(BeNil()) - Expect(unmarshalledAction.EmitProgressAction).To(BeNil()) - Expect(unmarshalledAction.TryAction).To(BeNil()) - Expect(unmarshalledAction.ParallelAction).To(BeNil()) - Expect(unmarshalledAction.SerialAction).To(BeNil()) - Expect(unmarshalledAction.CodependentAction).To(BeNil()) + Expect(unmarshalledAction).To(BeNil()) }) }) @@ -318,13 +305,9 @@ var _ = Describe("Actions", func() { {"name":"FOO", "value":"1"}, {"name":"BAR", "value":"2"} ], - "resource_limits":{"nofile": "10", "nproc": "20"} + "resource_limits":{"nofile": 10, "nproc": 20}, + "suppress_log_output": false }`, - //TODO: double-check these properties - // protobuf v3 makes uint64 a string - //"resource_limits":{"nofile": 10, "nproc": 20} - // protojson does not emit this - //"suppress_log_output": false models.WrapAction(&models.RunAction{ User: "me", Path: "rm", @@ -334,8 +317,8 @@ var _ = Describe("Actions", func() { {"FOO", "1"}, {"BAR", "2"}, }, - ResourceLimits: resourceLimits, - // SuppressLogOutput: false, + ResourceLimits: resourceLimits, + SuppressLogOutput: false, }), ) @@ -385,19 +368,14 @@ var _ = Describe("Actions", func() { "run": { "path": "echo", "resource_limits":{ - "nofile": "10" + "nofile": 10 }, - "user": "someone" + "user": "someone", + "suppress_log_output": false } }, - "timeout_ms": "10" + "timeout_ms": 10 }`, - //TODO: double-check these properties - // protobuf v3 makes uint64 a string - //"resource_limits":{"nofile": 10} - //"timeout_ms": 10 - // protojson does not emit this - //"suppress_log_output": false models.WrapAction( models.Timeout( &models.RunAction{ @@ -474,13 +452,11 @@ var _ = Describe("Actions", func() { "run": { "path": "echo", "resource_limits":{}, - "user": "me" + "user": "me", + "suppress_log_output": false } } }`, - //TODO: double-check these properties - // protojson does not emit this - //"suppress_log_output": false models.WrapAction(models.Try(&models.RunAction{ Path: "echo", User: "me", @@ -545,14 +521,12 @@ var _ = Describe("Actions", func() { "run": { "resource_limits": {}, "path": "echo", - "user": "me" + "user": "me", + "suppress_log_output": false } } ] }`, - //TODO: double-check these properties - // protojson does not emit this - //"suppress_log_output": false models.WrapAction(models.Parallel( &models.DownloadAction{ From: "web_location", @@ -641,14 +615,12 @@ var _ = Describe("Actions", func() { "run": { "resource_limits": {}, "path": "echo", - "user": "me" + "user": "me", + "suppress_log_output": false } } ] }`, - //TODO: double-check these properties - // protojson does not emit this - //"suppress_log_output": false models.WrapAction(models.Serial( &models.DownloadAction{ From: "web_location", @@ -722,13 +694,11 @@ var _ = Describe("Actions", func() { "run": { "path": "echo", "resource_limits":{}, - "user": "me" + "user": "me", + "suppress_log_output": false } } }`, - //TODO: double-check these properties - // protojson does not emit this - //"suppress_log_output": false models.WrapAction(models.EmitProgressFor( &models.RunAction{ Path: "echo", @@ -794,14 +764,12 @@ var _ = Describe("Actions", func() { "run": { "resource_limits": {}, "path": "echo", - "user": "me" + "user": "me", + "suppress_log_output": false } } - ] + ] }`, - //TODO: double-check these properties - // protojson does not emit this - //"suppress_log_output": false models.WrapAction(models.Codependent( &models.DownloadAction{ From: "web_location", diff --git a/models/desired_lrp.go b/models/desired_lrp.go index f7b4048a..4c6dd930 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -52,7 +52,7 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo RootFs: desiredLrpResource.RootFs, Instances: schedInfo.Instances, Annotation: schedInfo.Annotation, - Routes: schedInfo.Routes, + Routes: &schedInfo.Routes, ModificationTag: &schedInfo.ModificationTag, EnvironmentVariables: environmentVariables, CachedDependencies: runInfo.CachedDependencies, @@ -210,7 +210,7 @@ func (d *DesiredLRP) DesiredLRPResource() DesiredLRPResource { func (d *DesiredLRP) DesiredLRPSchedulingInfo() DesiredLRPSchedulingInfo { var routes Routes if d.Routes != nil { - routes = *ParseRoutes(d.Routes) + routes = *d.Routes } var modificationTag ModificationTag if d.ModificationTag != nil { @@ -238,7 +238,7 @@ func (d *DesiredLRP) DesiredLRPSchedulingInfo() DesiredLRPSchedulingInfo { func (d *DesiredLRP) DesiredLRPRoutingInfo() DesiredLRP { var routes Routes if d.Routes != nil { - routes = *ParseRoutes(d.Routes) + routes = *d.Routes } var modificationTag ModificationTag @@ -340,8 +340,8 @@ func (desired DesiredLRP) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range desired.Routes { - totalRoutesLength += len(value) + for _, value := range *desired.Routes { + totalRoutesLength += len(*value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -380,8 +380,8 @@ func (desired *DesiredLRPUpdate) Validate() error { totalRoutesLength := 0 if desired.Routes != nil { - for _, value := range desired.Routes { - totalRoutesLength += len(value) + for _, value := range *desired.Routes { + totalRoutesLength += len(*value) if totalRoutesLength > maximumRouteLength { validationError = validationError.Append(ErrInvalidField{"routes"}) break @@ -407,14 +407,14 @@ func (desired DesiredLRPUpdate) IsRoutesGroupUpdated(routes *Routes, routerGroup return true } - desiredRoutes, desiredRoutesPresent := (desired.Routes)[routerGroup] + desiredRoutes, desiredRoutesPresent := (*desired.Routes)[routerGroup] requestRoutes, requestRoutesPresent := (*routes)[routerGroup] if desiredRoutesPresent != requestRoutesPresent { return true } if desiredRoutesPresent && requestRoutesPresent { - return !bytes.Equal(desiredRoutes, *requestRoutes) + return !bytes.Equal(*desiredRoutes, *requestRoutes) } return true @@ -455,7 +455,7 @@ func (desired *DesiredLRPUpdate) UnmarshalJSON(data []byte) error { if update.Instances != nil { desired.SetInstances(update.Instances) } - desired.Routes = *update.Routes.ToProto() + desired.Routes = update.Routes if update.Annotation != nil { desired.SetAnnotation(update.Annotation) } @@ -470,7 +470,7 @@ func (desired DesiredLRPUpdate) MarshalJSON() ([]byte, error) { i := desired.GetInstances() update.Instances = i } - update.Routes = ParseRoutes(desired.Routes) + update.Routes = desired.Routes if desired.AnnotationExists() { a := desired.GetAnnotation() update.Annotation = a @@ -515,7 +515,7 @@ func NewDesiredLRPSchedulingInfo( Annotation: annotation, Instances: instances, DesiredLrpResource: resource, - Routes: *routes.ToProto(), + Routes: routes, ModificationTag: modTag, VolumePlacement: volumePlacement, PlacementTags: placementTags, @@ -534,7 +534,7 @@ func NewDesiredLRPRoutingInfo( Domain: key.Domain, LogGuid: key.LogGuid, Instances: instances, - Routes: *routes.ToProto(), + Routes: routes, ModificationTag: modTag, MetricTags: metrTags, } @@ -545,7 +545,7 @@ func (s *DesiredLRPSchedulingInfo) ApplyUpdate(update *DesiredLRPUpdate) { s.Instances = *update.GetInstances() } if update.Routes != nil { - s.Routes = update.Routes + s.Routes = *update.Routes } if update.AnnotationExists() { s.Annotation = *update.GetAnnotation() @@ -560,7 +560,7 @@ func (*DesiredLRPSchedulingInfo) Version() format.Version { func (s DesiredLRPSchedulingInfo) Validate() error { var validationError ValidationError - validationError = validationError.Check(s.DesiredLrpKey, s.DesiredLrpResource, ParseRoutes(s.Routes)) + validationError = validationError.Check(s.DesiredLrpKey, s.DesiredLrpResource, s.Routes) if s.GetInstances() < 0 { validationError = validationError.Append(ErrInvalidField{"instances"}) diff --git a/models/desired_lrp_test.go b/models/desired_lrp_test.go index 625827ef..7bd25bd1 100644 --- a/models/desired_lrp_test.go +++ b/models/desired_lrp_test.go @@ -5,18 +5,17 @@ import ( "encoding/base64" "encoding/json" "fmt" - "log" "time" "code.cloudfoundry.org/bbs/format" "code.cloudfoundry.org/bbs/models" "code.cloudfoundry.org/bbs/models/test/model_helpers" - "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" . "code.cloudfoundry.org/bbs/test_helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + gomegaformat "github.com/onsi/gomega/format" ) var _ = Describe("DesiredLRP", func() { @@ -341,28 +340,34 @@ var _ = Describe("DesiredLRP", func() { Describe("serialization", func() { It("successfully round trips through json and protobuf", func() { + // JSON jsonSerialization, err := json.Marshal(desiredLRP) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(jsonDesiredLRP)) - protoSerialization, err := proto.Marshal(desiredLRP.ToProto()) + // Protobuf + protoDesiredLrp := desiredLRP.ToProto() + protoSerialization, err := proto.Marshal(protoDesiredLrp) Expect(err).NotTo(HaveOccurred()) var protoDeserialization models.ProtoDesiredLRP err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) - desiredRoutes := desiredLRP.Routes + desiredRoutes := *desiredLRP.Routes deserializedRoutes := protoDeserialization.Routes - Expect(deserializedRoutes).To(HaveLen(len(desiredRoutes))) + Expect(deserializedRoutes.Routes).To(HaveLen(len(desiredRoutes))) for k := range desiredRoutes { - Expect(string(deserializedRoutes[k])).To(MatchJSON(string(desiredRoutes[k]))) + Expect(string(deserializedRoutes.Routes[k])).To(MatchJSON(string(*desiredRoutes[k]))) } desiredLRP.Routes = nil protoDeserialization.Routes = nil - Expect(protoDeserialization.FromProto()).To(Equal(desiredLRP)) + fromProtoDesiredLrp := *protoDeserialization.FromProto() + gomegaformat.MaxLength = 0 + Expect(fromProtoDesiredLrp.Equal(desiredLRP)).To(BeTrue()) + Expect(fromProtoDesiredLrp).To(Equal(desiredLRP)) }) }) @@ -383,13 +388,13 @@ var _ = Describe("DesiredLRP", func() { It("allows empty routes to be set", func() { update := &models.DesiredLRPUpdate{ - Routes: make(map[string][]byte), + Routes: &models.Routes{}, } schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = make(map[string][]byte) + expectedSchedulingInfo.Routes = models.Routes{} expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -432,13 +437,13 @@ var _ = Describe("DesiredLRP", func() { "router": &rawMessage, } update := &models.DesiredLRPUpdate{ - Routes: *routes.ToProto(), + Routes: routes, } schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = *routes.ToProto() + expectedSchedulingInfo.Routes = *routes expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -472,7 +477,7 @@ var _ = Describe("DesiredLRP", func() { Context("when update contains routes", func() { BeforeEach(func() { - update.Routes = *routes.ToProto() + update.Routes = routes }) It("returns true when provided routes are not set", func() { @@ -1300,22 +1305,20 @@ var _ = Describe("DesiredLRP", func() { }) var _ = Describe("DesiredLRPUpdate", func() { - var desiredLRPUpdate models.ProtoDesiredLRPUpdate - var nonprotoDesiredLRPUpdate models.DesiredLRPUpdate + var desiredLRPUpdate models.DesiredLRPUpdate BeforeEach(func() { instances := int32(2) desiredLRPUpdate.Instances = &instances - nonprotoRoutes := &models.Routes{ + routes := &models.Routes{ "foo": &json.RawMessage{'"', 'b', 'a', 'r', '"'}, } - desiredLRPUpdate.Routes = *nonprotoRoutes.ToProto() - //desiredLRPUpdate.Routes = nonprotoRoutes//.ToProto() - nonprotoDesiredLRPUpdate = *desiredLRPUpdate.FromProto() + desiredLRPUpdate.Routes = routes annotation := "some-text" - desiredLRPUpdate.Annotation = &annotation - desiredLRPUpdate.MetricTags = map[string]*models.ProtoMetricTagValue{ + desiredLRPUpdate.SetAnnotation(&annotation) + // desiredLRPUpdate.Annotation = &annotation + desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{ "some-tag": {Static: "some-value"}, } }) @@ -1330,48 +1333,48 @@ var _ = Describe("DesiredLRPUpdate", func() { It("requires a positive nonzero number of instances", func() { invalidInstances := int32(-1) desiredLRPUpdate.Instances = &invalidInstances - assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "instances") + assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "instances") zeroInstances := int32(0) desiredLRPUpdate.Instances = &zeroInstances - validationErr := desiredLRPUpdate.FromProto().Validate() + validationErr := desiredLRPUpdate.Validate() Expect(validationErr).NotTo(HaveOccurred()) oneInstance := int32(1) desiredLRPUpdate.Instances = &oneInstance - validationErr = desiredLRPUpdate.FromProto().Validate() + validationErr = desiredLRPUpdate.Validate() Expect(validationErr).NotTo(HaveOccurred()) }) It("limits the annotation length", func() { largeString := randStringBytes(50000) desiredLRPUpdate.Annotation = &largeString - assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "annotation") + assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "annotation") }) Context("metric tags", func() { It("is invalid when both static and dynamic values are provided for the same key", func() { - desiredLRPUpdate.MetricTags = map[string]*models.ProtoMetricTagValue{ - "some_metric": {Static: "some-value", Dynamic: models.ProtoMetricTagValue_DynamicValue(models.ProtoMetricTagValue_INDEX)}, + desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{ + "some_metric": {Static: "some-value", Dynamic: models.MetricTagValue_DynamicValue(models.ProtoMetricTagValue_INDEX)}, } - assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "metric_tags") - assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "static") - assertDesiredLRPValidationFailsWithMessage(*desiredLRPUpdate.FromProto(), "dynamic") + assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "metric_tags") + assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "static") + assertDesiredLRPValidationFailsWithMessage(desiredLRPUpdate, "dynamic") }) It("is valid when metric tags is empty", func() { - desiredLRPUpdate.MetricTags = map[string]*models.ProtoMetricTagValue{} - Expect(desiredLRPUpdate.FromProto().Validate()).To(Succeed()) + desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{} + Expect(desiredLRPUpdate.Validate()).To(Succeed()) }) It("is valid when metric tags is nil", func() { desiredLRPUpdate.MetricTags = nil - Expect(desiredLRPUpdate.FromProto().Validate()).To(Succeed()) + Expect(desiredLRPUpdate.Validate()).To(Succeed()) }) }) }) - FDescribe("serialization", func() { + Describe("serialization", func() { var expectedJSON string BeforeEach(func() { expectedJSON = `{ @@ -1389,25 +1392,12 @@ var _ = Describe("DesiredLRPUpdate", func() { }) It("can marshal to JSON and back", func() { - log.Printf("\n") - log.Printf("NonProtoDesiredLRPUpdate: %+v\n", nonprotoDesiredLRPUpdate) - log.Printf("DesiredLRPUpdate Proto: %+v\n", &desiredLRPUpdate) - log.Printf("DesiredLRPUpdate.FromProto: %+v\n", desiredLRPUpdate.FromProto()) - log.Printf("DesiredLRPUpdate.FromProto Routes: %+v\n", desiredLRPUpdate.FromProto().Routes) - log.Printf("DesiredLRPUpdate Routes: %+v\n", desiredLRPUpdate.Routes) - // log.Printf("DesiredLRPUpdate Routes.FromProto: %+v\n", desiredLRPUpdate.Routes.FromProto()) - // log.Printf("DesiredLRPUpdate Routes.ToProto: %+v\n", desiredLRPUpdate.Routes.ToProto()) - // log.Printf("DesiredLRPUpdate Routes.ToProto Routes: %+v\n", desiredLRPUpdate.Routes.ToProto().Routes) - standard, _ := json.Marshal(&desiredLRPUpdate) - stdRoutes, _ := json.Marshal(&desiredLRPUpdate.Routes) - log.Printf("standard: %+v", string(standard)) - log.Printf("standard routes: %+v", string(stdRoutes)) - actual, _ := protojson.Marshal(&desiredLRPUpdate) + actual, _ := json.Marshal(&desiredLRPUpdate) Expect(actual).To(MatchJSON(expectedJSON)) - var testV models.DesiredLRPUpdate - Expect(protojson.Unmarshal([]byte(expectedJSON), testV.ToProto())).To(Succeed()) - Expect(testV).To(Equal(&desiredLRPUpdate)) + testV := models.DesiredLRPUpdate{} + Expect(json.Unmarshal([]byte(expectedJSON), &testV)).To(Succeed()) + Expect(testV).To(Equal(desiredLRPUpdate)) }) }) diff --git a/models/environment_variables.go b/models/environment_variables.go index 49185848..6e4381ae 100644 --- a/models/environment_variables.go +++ b/models/environment_variables.go @@ -1,8 +1,10 @@ package models -import "errors" +import ( + "errors" +) -func (envVar EnvironmentVariable) Validate() error { +func (envVar *EnvironmentVariable) Validate() error { if envVar.Name == "" { return errors.New("invalid field: name cannot be blank") } diff --git a/models/routes.go b/models/routes.go index 7fbbaa3f..267d9f09 100644 --- a/models/routes.go +++ b/models/routes.go @@ -3,7 +3,6 @@ package models import ( bytes "bytes" "encoding/json" - "log" ) type Routes map[string]*json.RawMessage @@ -22,20 +21,20 @@ func ParseRoutes(b map[string][]byte) *Routes { return &routes } -func (r *Routes) ToProto() *map[string][]byte { +func (r *Routes) ToProto() *ProtoRoutes { if r == nil { return nil } - // pr := &ProtoRoutes{ - // Routes: map[string][]byte{}, - // } - pr := make(map[string][]byte) + pr := &ProtoRoutes{ + Routes: map[string][]byte{}, + } + // pr := make(map[string][]byte) for k, v := range *r { - pr[k] = *v + pr.Routes[k] = *v } - return &pr + return pr } func (pr *ProtoRoutes) FromProto() *Routes { @@ -94,17 +93,11 @@ func (pr *ProtoRoutes) FromProto() *Routes { // } func (r *Routes) Equal(other Routes) bool { - log.Printf("Routes.Equal") - log.Printf("other: %+v", other) - log.Printf("r: %+v", r) if other == nil { return r == nil } for k, v := range *r { - log.Printf("\n") - log.Printf("key: %+v, value: %+v", k, v) if !bytes.Equal(*v, *other[k]) { - log.Printf("bytes.Equal failed on v=%+v and other[k]=%+v\n", *v, *other[k]) return false } } diff --git a/models/routes_test.go b/models/routes_test.go index 12838e9d..e56785e7 100644 --- a/models/routes_test.go +++ b/models/routes_test.go @@ -2,10 +2,8 @@ package models_test import ( "encoding/json" - "log" "code.cloudfoundry.org/bbs/models" - "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" . "github.com/onsi/ginkgo/v2" @@ -20,15 +18,17 @@ var _ = Describe("Routes", func() { itSerializes := func(routes *models.Routes) { BeforeEach(func() { - update = models.DesiredLRPUpdate{ - Routes: *routes.ToProto(), + + // don't really care for branching logic in tests, but don't want to change the test right now + if routes == nil { + update = models.DesiredLRPUpdate{ + Routes: nil, + } + } else { + update = models.DesiredLRPUpdate{ + Routes: routes, + } } - log.Printf("INPUT routes: %+v\n", routes) - log.Printf("INPUT update: %+v\n", update) - log.Printf("INPUT update.routes: %+v\n", update.Routes) - // for k, v := range *update.Routes { - // log.Printf("key: %+v, value: %+v", k, string(*v)) - // } /* The point of these tests is to go from non-proto struct to JSON/Protobuf (binary) representation and back. @@ -45,16 +45,12 @@ var _ = Describe("Routes", func() { 2024-05-15: It remains to be seen if this extra layer is going to cause performance issues */ - log.Printf("update.ToProto(): %+v\n", update.ToProto()) - b, err := protojson.Marshal(update.ToProto()) + b, err := json.Marshal(update.ToProto()) Expect(err).NotTo(HaveOccurred()) - err = protojson.Unmarshal(b, &aJson) - log.Printf("JSON-aJson: %+v\n", aJson.FromProto()) - log.Printf("JSON-aJson routes: %+v\n", aJson.FromProto().Routes) + err = json.Unmarshal(b, &aJson) Expect(err).NotTo(HaveOccurred()) protoUpdate := update.ToProto() - log.Printf("protoUpdate: %+v\n", protoUpdate) b, err = proto.Marshal(protoUpdate) Expect(err).NotTo(HaveOccurred()) err = proto.Unmarshal(b, &resultProto) diff --git a/models/security_groups_test.go b/models/security_groups_test.go index 2821a362..dd25e1f4 100644 --- a/models/security_groups_test.go +++ b/models/security_groups_test.go @@ -1,10 +1,11 @@ package models_test import ( + "encoding/json" + "code.cloudfoundry.org/bbs/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" ) @@ -390,7 +391,7 @@ var _ = Describe("SecurityGroupRule", func() { }) It("successfully round trips through json and protobuf", func() { - jsonSerialization, err := protojson.Marshal(securityGroup.ToProto()) + jsonSerialization, err := json.Marshal(securityGroup.ToProto()) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(securityGroupJson)) @@ -420,7 +421,7 @@ var _ = Describe("SecurityGroupRule", func() { }) It("successfully json serializes empty arrays to nil", func() { - jsonSerialization, err := protojson.Marshal(securityGroup.ToProto()) + jsonSerialization, err := json.Marshal(securityGroup.ToProto()) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(securityGroupJson)) }) diff --git a/models/task_test.go b/models/task_test.go index 6690e848..96863479 100644 --- a/models/task_test.go +++ b/models/task_test.go @@ -10,14 +10,12 @@ import ( . "code.cloudfoundry.org/bbs/test_helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" ) var _ = Describe("Task", func() { var taskPayload string var task models.Task - var protoTask models.ProtoTask BeforeEach(func() { taskPayload = `{ @@ -27,10 +25,12 @@ var _ = Describe("Task", func() { "result": "turboencabulated", "failed":true, "failure_reason":"because i said so", - "created_at": "1393371971000000000", - "updated_at": "1393371971000000010", - "first_completed_at": "1393371971000000030", + "created_at": 1393371971000000000, + "updated_at": 1393371971000000010, + "first_completed_at": 1393371971000000030, "state": "Pending", + "rejection_count": 0, + "rejection_reason": "", "task_definition" : { "rootfs": "docker:///docker.com/docker", "env":[ @@ -53,7 +53,7 @@ var _ = Describe("Task", func() { "memory_mb":256, "disk_mb":1024, "log_rate_limit": { - "bytes_per_second": "2048" + "bytes_per_second": 2048 }, "cpu_weight": 42, "privileged": true, @@ -80,7 +80,8 @@ var _ = Describe("Task", func() { { "protocol": "udp", "destinations": ["8.8.0.0/16"], - "ports": [53] + "ports": [53], + "log": false } ], "completion_callback_url":"http://user:password@a.b.c/d/e/f", @@ -91,7 +92,7 @@ var _ = Describe("Task", func() { "image_username": "jake", "image_password": "thedog", "image_layers": [ - { + { "url": "some-url", "destination_path": "/tmp", "media_type": "TGZ", @@ -112,27 +113,14 @@ var _ = Describe("Task", func() { } } }` - // TODO: double-check these fields - // protobuf v3 makes uint64 a string - // "created_at": "1393371971000000000", - // "updated_at": "1393371971000000010", - // "first_completed_at": "1393371971000000030", - // "log_rate_limit": { - // "bytes_per_second": "2048" - // }, - // protojson does not emit this - // egress_rules -> "log": false - // "rejection_count": 0, - // "rejection_reason": "", - - err := protojson.Unmarshal([]byte(taskPayload), &protoTask) + + err := json.Unmarshal([]byte(taskPayload), &task) Expect(err).NotTo(HaveOccurred()) - task = *protoTask.FromProto() }) Describe("serialization", func() { It("successfully round trips through json and protobuf", func() { - jsonSerialization, err := protojson.Marshal(task.ToProto()) + jsonSerialization, err := json.Marshal(task) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(taskPayload)) diff --git a/models/test/model_helpers/constructors.go b/models/test/model_helpers/constructors.go index 85989cfa..bc8e4f3d 100644 --- a/models/test/model_helpers/constructors.go +++ b/models/test/model_helpers/constructors.go @@ -96,7 +96,7 @@ func NewValidDesiredLRP(guid string) *models.DesiredLRP { MemoryMb: 1024, CpuWeight: 42, MaxPids: 1024, - Routes: *routes.ToProto(), + Routes: routes, LogSource: "some-log-source", LogGuid: "some-log-guid", MetricsGuid: "some-metrics-guid", From 544e998afdb5576d4c6ce171c19fc2cff263e867 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 31 May 2024 16:09:38 +0000 Subject: [PATCH 101/155] Naming convention changes due to protobuf updates --- client_test.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/client_test.go b/client_test.go index c1e42668..13455b55 100644 --- a/client_test.go +++ b/client_test.go @@ -61,9 +61,9 @@ var _ = Describe("Client", func() { It("populates the request", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) request := models.StartActualLRPRequest{ - ActualLrpKey: actualLRP.ActualLrpKey, - ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, - ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, + ActualLrpKey: &actualLRP.ActualLrpKey, + ActualLrpInstanceKey: &actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: &actualLRP.ActualLrpNetInfo, ActualLrpInternalRoutes: actualLRP.ActualLrpInternalRoutes, MetricTags: actualLRP.MetricTags, AvailabilityZone: actualLRP.AvailabilityZone, @@ -80,7 +80,7 @@ var _ = Describe("Client", func() { ), ) - err := internalClient.StartActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) + err := internalClient.StartActualLRP(logger, "some-trace-id", &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -101,9 +101,9 @@ var _ = Describe("Client", func() { It("Falls back to the deprecated endpoint if the current endpoint returns a 404", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) request := &models.StartActualLRPRequest{ - ActualLrpKey: actualLRP.ActualLrpKey, - ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, - ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, + ActualLrpKey: &actualLRP.ActualLrpKey, + ActualLrpInstanceKey: &actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: &actualLRP.ActualLrpNetInfo, ActualLrpInternalRoutes: nil, MetricTags: nil, AvailabilityZone: "", @@ -123,7 +123,7 @@ var _ = Describe("Client", func() { ), ) - err := internalClient.StartActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) + err := internalClient.StartActualLRP(logger, "some-trace-id", &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -163,9 +163,9 @@ var _ = Describe("Client", func() { It("populates the request", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) request := &models.EvacuateRunningActualLRPRequest{ - ActualLrpKey: actualLRP.ActualLrpKey, - ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, - ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, + ActualLrpKey: &actualLRP.ActualLrpKey, + ActualLrpInstanceKey: &actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: &actualLRP.ActualLrpNetInfo, ActualLrpInternalRoutes: actualLRP.ActualLrpInternalRoutes, MetricTags: actualLRP.MetricTags, AvailabilityZone: actualLRP.AvailabilityZone, @@ -181,7 +181,7 @@ var _ = Describe("Client", func() { ), ) - _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) + _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) It("Calls the current endpoint", func() { @@ -201,9 +201,9 @@ var _ = Describe("Client", func() { It("Falls back to the deprecated endpoint if the current endpoint returns a 404", func() { actualLRP := model_helpers.NewValidActualLRP("some-guid", 0) request := &models.EvacuateRunningActualLRPRequest{ - ActualLrpKey: actualLRP.ActualLrpKey, - ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, - ActualLrpNetInfo: actualLRP.ActualLrpNetInfo, + ActualLrpKey: &actualLRP.ActualLrpKey, + ActualLrpInstanceKey: &actualLRP.ActualLrpInstanceKey, + ActualLrpNetInfo: &actualLRP.ActualLrpNetInfo, ActualLrpInternalRoutes: nil, MetricTags: nil, Routable: nil, @@ -224,7 +224,7 @@ var _ = Describe("Client", func() { ), ) - _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey, actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) + _, err := internalClient.EvacuateRunningActualLRP(logger, "some-trace-id", &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, false, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) From 20d5acb59e4664fab0aa908db6f186d177c2aed1 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 31 May 2024 16:10:46 +0000 Subject: [PATCH 102/155] Have to pass a Proto struct in order to populate correctly, then use FromProto for the return value --- client.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client.go b/client.go index ac781329..298a0102 100644 --- a/client.go +++ b/client.go @@ -380,13 +380,14 @@ func (c *client) ActualLRPGroups(logger lager.Logger, traceID string, filter mod Domain: filter.Domain, CellId: filter.CellID, } - response := models.ActualLRPGroupsResponse{} - err := c.doRequest(logger, traceID, ActualLRPGroupsRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + response := models.ProtoActualLRPGroupsResponse{} + err := c.doRequest(logger, traceID, ActualLRPGroupsRoute_r0, nil, nil, request.ToProto(), &response) if err != nil { return nil, err } + nonProtoResponse := response.FromProto() - return response.ActualLrpGroups, response.Error.ToError() + return nonProtoResponse.ActualLrpGroups, nonProtoResponse.Error.ToError() } // Deprecated: use ActaulLRPs instead From f2159b9a20c91c6f80cacd919b079e39df1c5829 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 31 May 2024 19:39:18 +0000 Subject: [PATCH 103/155] Naming convention changes due to protobuf updates Regen protos --- controllers/actual_lrp_lifecycle_controller.go | 18 +++++++++--------- controllers/evacuation_controller.go | 12 ++++++------ .../calculator/actual_lrp_event_calculator.go | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/controllers/actual_lrp_lifecycle_controller.go b/controllers/actual_lrp_lifecycle_controller.go index a5d4e059..494eea51 100644 --- a/controllers/actual_lrp_lifecycle_controller.go +++ b/controllers/actual_lrp_lifecycle_controller.go @@ -61,7 +61,7 @@ func findWithPresence(lrps []*models.ActualLRP, presence models.ActualLRP_Presen func lookupLRPInSlice(lrps []*models.ActualLRP, key *models.ActualLRPInstanceKey) *models.ActualLRP { for _, lrp := range lrps { - if lrp.ActualLRPInstanceKey == *key { + if lrp.ActualLrpInstanceKey == *key { return lrp } } @@ -148,9 +148,9 @@ func (h *ActualLRPLifecycleController) StartActualLRP(ctx context.Context, suspect := findWithPresence(lrps, models.ActualLRP_Suspect) if evacuating != nil { - err = h.evacuationDB.RemoveEvacuatingActualLRP(ctx, logger, &evacuating.ActualLRPKey, &evacuating.ActualLRPInstanceKey) + err = h.evacuationDB.RemoveEvacuatingActualLRP(ctx, logger, &evacuating.ActualLrpKey, &evacuating.ActualLrpInstanceKey) if err != nil { - logger.Error("failed-to-remove-evacuating-actual-lrp", err, lager.Data{"instance-guid": evacuating.ActualLRPInstanceKey}) + logger.Error("failed-to-remove-evacuating-actual-lrp", err, lager.Data{"instance-guid": evacuating.ActualLrpInstanceKey}) } newLRPs = eventCalculator.RecordChange(evacuating, nil, newLRPs) } @@ -189,7 +189,7 @@ func (h *ActualLRPLifecycleController) CrashActualLRP(ctx context.Context, logge } afterLRPs := eventCalculator.RecordChange(suspectLRP, nil, lrps) - logger.Info("removing-suspect-lrp", lager.Data{"ig": suspectLRP.InstanceGuid}) + logger.Info("removing-suspect-lrp", lager.Data{"ig": suspectLRP.ActualLrpInstanceKey.InstanceGuid}) go eventCalculator.EmitEvents(traceId, lrps, afterLRPs) return nil @@ -214,9 +214,9 @@ func (h *ActualLRPLifecycleController) CrashActualLRP(ctx context.Context, logge } startRequest := auctioneer.NewLRPStartRequestFromSchedulingInfo(schedInfo, int(actualLRPKey.Index)) - logger.Info("start-lrp-auction-request", lager.Data{"app_guid": schedInfo.ProcessGuid, "index": int(actualLRPKey.Index)}) + logger.Info("start-lrp-auction-request", lager.Data{"app_guid": schedInfo.DesiredLrpKey.ProcessGuid, "index": int(actualLRPKey.Index)}) err = h.auctioneerClient.RequestLRPAuctions(logger, trace.RequestIdFromContext(ctx), []*auctioneer.LRPStartRequest{&startRequest}) - logger.Info("finished-lrp-auction-request", lager.Data{"app_guid": schedInfo.ProcessGuid, "index": int(actualLRPKey.Index)}) + logger.Info("finished-lrp-auction-request", lager.Data{"app_guid": schedInfo.DesiredLrpKey.ProcessGuid, "index": int(actualLRPKey.Index)}) if err != nil { logger.Error("failed-requesting-auction", err) } @@ -305,7 +305,7 @@ func (h *ActualLRPLifecycleController) RetireActualLRP(ctx context.Context, logg } removeLRP := func() error { - err = h.db.RemoveActualLRP(ctx, logger, lrp.ProcessGuid, lrp.Index, &lrp.ActualLRPInstanceKey) + err = h.db.RemoveActualLRP(ctx, logger, lrp.ActualLrpKey.ProcessGuid, lrp.ActualLrpKey.Index, &lrp.ActualLrpInstanceKey) if err == nil { recordChange() } @@ -317,7 +317,7 @@ func (h *ActualLRPLifecycleController) RetireActualLRP(ctx context.Context, logg case models.ActualLRPStateUnclaimed, models.ActualLRPStateCrashed: err = removeLRP() case models.ActualLRPStateClaimed, models.ActualLRPStateRunning: - cell, err = h.serviceClient.CellById(logger, lrp.CellId) + cell, err = h.serviceClient.CellById(logger, lrp.ActualLrpInstanceKey.CellId) if err != nil { bbsErr := models.ConvertError(err) if bbsErr.Type == models.Error_ResourceNotFound { @@ -332,7 +332,7 @@ func (h *ActualLRPLifecycleController) RetireActualLRP(ctx context.Context, logg if err != nil { return err } - err = client.StopLRPInstance(logger, lrp.ActualLRPKey, lrp.ActualLRPInstanceKey) + err = client.StopLRPInstance(logger, lrp.ActualLrpKey, lrp.ActualLrpInstanceKey) } if err == nil { diff --git a/controllers/evacuation_controller.go b/controllers/evacuation_controller.go index 81f43e0b..2ae8969d 100644 --- a/controllers/evacuation_controller.go +++ b/controllers/evacuation_controller.go @@ -78,7 +78,7 @@ func (h *EvacuationController) RemoveEvacuatingActualLRP(ctx context.Context, lo instance := findWithPresence(actualLRPs, models.ActualLRP_Ordinary) if instance != nil { - evacuatingLRPLogData["replacement-lrp-instance-key"] = instance.ActualLRPInstanceKey + evacuatingLRPLogData["replacement-lrp-instance-key"] = instance.ActualLrpInstanceKey evacuatingLRPLogData["replacement-state"] = instance.State evacuatingLRPLogData["replacement-lrp-placement-error"] = instance.PlacementError } @@ -404,7 +404,7 @@ func (h *EvacuationController) evacuateInstance(ctx context.Context, logger lage ActualLRPInstanceHub: h.actualLRPInstanceHub, } - evacuating, err := h.db.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, actualLRP.GetRoutable(), actualLRP.AvailabilityZone) + evacuating, err := h.db.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, actualLRP.ActualLrpInternalRoutes, actualLRP.MetricTags, *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) if err != nil { return err } @@ -421,7 +421,7 @@ func (h *EvacuationController) evacuateInstance(ctx context.Context, logger lage }() if actualLRP.Presence == models.ActualLRP_Suspect { - _, err := h.suspectLRPDB.RemoveSuspectActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := h.suspectLRPDB.RemoveSuspectActualLRP(ctx, logger, &actualLRP.ActualLrpKey) if err != nil { logger.Error("failed-removing-suspect-actual-lrp", err) return err @@ -430,7 +430,7 @@ func (h *EvacuationController) evacuateInstance(ctx context.Context, logger lage return nil } - _, after, err := h.actualLRPDB.UnclaimActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, after, err := h.actualLRPDB.UnclaimActualLRP(ctx, logger, &actualLRP.ActualLrpKey) if err != nil { return err } @@ -441,7 +441,7 @@ func (h *EvacuationController) evacuateInstance(ctx context.Context, logger lage // compatible. newLRPs = eventCalculator.RecordChange(nil, after, newLRPs) - h.requestAuction(ctx, logger, &actualLRP.ActualLRPKey) + h.requestAuction(ctx, logger, &actualLRP.ActualLrpKey) return nil } @@ -450,7 +450,7 @@ func (h *EvacuationController) removeEvacuating(ctx context.Context, logger lage return nil, nil } - err := h.db.RemoveEvacuatingActualLRP(ctx, logger, &evacuating.ActualLRPKey, &evacuating.ActualLRPInstanceKey) + err := h.db.RemoveEvacuatingActualLRP(ctx, logger, &evacuating.ActualLrpKey, &evacuating.ActualLrpInstanceKey) if err == nil { return evacuating, nil diff --git a/events/calculator/actual_lrp_event_calculator.go b/events/calculator/actual_lrp_event_calculator.go index d77fbac9..af1a7724 100644 --- a/events/calculator/actual_lrp_event_calculator.go +++ b/events/calculator/actual_lrp_event_calculator.go @@ -217,7 +217,7 @@ func (e ActualLRPEventCalculator) RecordChange(before, after *models.ActualLRP, continue } - if before != nil && l.ActualLRPInstanceKey.Equal(before.ActualLRPInstanceKey) { + if before != nil && l.ActualLrpInstanceKey.Equal(before.ActualLrpInstanceKey) { newLRPs = append(newLRPs, after) found = true } else { @@ -307,8 +307,8 @@ func generateUnclaimedGroupEvents(before, after *models.ActualLRP) []models.Even } func generateUpdateGroupEvents(before, after *models.ActualLRP) []models.Event { - if !before.ActualLRPInstanceKey.Empty() && - !after.ActualLRPInstanceKey.Equal(before.ActualLRPInstanceKey) { + if !before.ActualLrpInstanceKey.Empty() && + !after.ActualLrpInstanceKey.Equal(before.ActualLrpInstanceKey) { // an Ordinary LRP replaced Suspect LRP return wrapEvent( //lint:ignore SA1019 - still need to emit these events until the ActaulLRPGroup api is deleted @@ -374,7 +374,7 @@ func getEventLRP(e models.Event) (*models.ActualLRP, bool) { case *models.ActualLRPInstanceCreatedEvent: return x.ActualLrp, false case *models.ActualLRPInstanceChangedEvent: - return x.After.ToActualLRP(x.ActualLRPKey, x.ActualLRPInstanceKey), false + return x.After.ToActualLRP(x.ActualLrpKey, x.ActualLrpInstanceKey), false case *models.ActualLRPCrashedEvent: return nil, true } From 8266589658e1d84a720bad3b5a584a51c4aaa22a Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 31 May 2024 19:39:58 +0000 Subject: [PATCH 104/155] Have to use Proto structs (.ToProto()) in proto.Marshal --- events/event_source_test.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/events/event_source_test.go b/events/event_source_test.go index bd0f1858..1d5a6d94 100644 --- a/events/event_source_test.go +++ b/events/event_source_test.go @@ -45,7 +45,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { expectedEvent = models.NewDesiredLRPCreatedEvent(desiredLRP, "some-trace-id") - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -74,7 +74,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { expectedEvent = models.NewDesiredLRPChangedEvent(desiredLRP, desiredLRP, "some-trace-id") - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -103,7 +103,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { expectedEvent = models.NewDesiredLRPRemovedEvent(desiredLRP, "some-trace-id") - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -146,7 +146,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method expectedEvent = models.NewActualLRPCreatedEvent(actualLRPGroup) - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -179,7 +179,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method expectedEvent = models.NewActualLRPChangedEvent(actualLRPGroup, actualLRPGroup) - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -212,7 +212,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method expectedEvent = models.NewActualLRPRemovedEvent(actualLRPGroup) - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -243,7 +243,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { expectedEvent = models.NewActualLRPCrashedEvent(actualLRP, actualLRP) - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -280,7 +280,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { expectedEvent = models.NewTaskCreatedEvent(task) - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -309,7 +309,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { expectedEvent = models.NewTaskChangedEvent(task, task) - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -338,7 +338,7 @@ var _ = Describe("EventSource", func() { BeforeEach(func() { expectedEvent = models.NewTaskRemovedEvent(task) - payload, err := proto.Marshal(expectedEvent) + payload, err := proto.Marshal(expectedEvent.ToProto()) Expect(err).NotTo(HaveOccurred()) payload = []byte(base64.StdEncoding.EncodeToString(payload)) @@ -358,7 +358,7 @@ var _ = Describe("EventSource", func() { taskRemovedEvent, ok := event.(*models.TaskRemovedEvent) Expect(ok).To(BeTrue()) - Expect(taskRemovedEvent).To(Equal(expectedEvent)) + Expect(taskRemovedEvent).To(Equal(expectedEvent.ToProto())) }) }) }) From 2886e0862c488305d8c86b5d2347f77ba5a7b609 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 31 May 2024 21:31:43 +0000 Subject: [PATCH 105/155] Add Validate functions for Proto structs --- models/actual_lrp_requests.go | 60 ++++++++++++++++++++++++++++++++++ models/desired_lrp.go | 28 ++++++++++++++++ models/desired_lrp_requests.go | 20 ++++++++++++ models/domains.go | 4 +++ models/events.go | 4 +++ models/task_requests.go | 32 ++++++++++++++++++ 6 files changed, 148 insertions(+) diff --git a/models/actual_lrp_requests.go b/models/actual_lrp_requests.go index 1b64ac28..aabd6403 100644 --- a/models/actual_lrp_requests.go +++ b/models/actual_lrp_requests.go @@ -2,6 +2,10 @@ package models import "encoding/json" +func (request *ProtoActualLRPsRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *ActualLRPsRequest) Validate() error { return nil } @@ -41,11 +45,19 @@ func (request ActualLRPsRequest) MarshalJSON() ([]byte, error) { return json.Marshal(internalRequest) } +func (request *ProtoActualLRPGroupsRequest) Validate() error { + return request.FromProto().Validate() +} + // Deprecated: use the ActualLRPInstances API instead func (request *ActualLRPGroupsRequest) Validate() error { return nil } +func (request *ProtoActualLRPGroupsByProcessGuidRequest) Validate() error { + return request.FromProto().Validate() +} + // Deprecated: use the ActualLRPInstances API instead func (request *ActualLRPGroupsByProcessGuidRequest) Validate() error { var validationError ValidationError @@ -61,6 +73,10 @@ func (request *ActualLRPGroupsByProcessGuidRequest) Validate() error { return nil } +func (request *ProtoActualLRPGroupByProcessGuidAndIndexRequest) Validate() error { + return request.FromProto().Validate() +} + // Deprecated: use the ActualLRPInstances API instead func (request *ActualLRPGroupByProcessGuidAndIndexRequest) Validate() error { var validationError ValidationError @@ -80,6 +96,10 @@ func (request *ActualLRPGroupByProcessGuidAndIndexRequest) Validate() error { return nil } +func (request *ProtoRemoveActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *RemoveActualLRPRequest) Validate() error { var validationError ValidationError @@ -98,6 +118,10 @@ func (request *RemoveActualLRPRequest) Validate() error { return nil } +func (request *ProtoClaimActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *ClaimActualLRPRequest) Validate() error { var validationError ValidationError @@ -118,6 +142,10 @@ func (request *ClaimActualLRPRequest) Validate() error { return nil } +func (request *ProtoStartActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *StartActualLRPRequest) Validate() error { var validationError ValidationError @@ -146,6 +174,10 @@ func (request *StartActualLRPRequest) Validate() error { return nil } +func (request *ProtoCrashActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *CrashActualLRPRequest) Validate() error { var validationError ValidationError @@ -168,6 +200,10 @@ func (request *CrashActualLRPRequest) Validate() error { return nil } +func (request *ProtoFailActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *FailActualLRPRequest) Validate() error { var validationError ValidationError @@ -188,6 +224,10 @@ func (request *FailActualLRPRequest) Validate() error { return nil } +func (request *ProtoRetireActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *RetireActualLRPRequest) Validate() error { var validationError ValidationError @@ -204,6 +244,10 @@ func (request *RetireActualLRPRequest) Validate() error { return nil } +func (request *ProtoRemoveEvacuatingActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *RemoveEvacuatingActualLRPRequest) Validate() error { var validationError ValidationError @@ -226,6 +270,10 @@ func (request *RemoveEvacuatingActualLRPRequest) Validate() error { return nil } +func (request *ProtoEvacuateClaimedActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *EvacuateClaimedActualLRPRequest) Validate() error { var validationError ValidationError @@ -248,6 +296,10 @@ func (request *EvacuateClaimedActualLRPRequest) Validate() error { return nil } +func (request *ProtoEvacuateCrashedActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *EvacuateCrashedActualLRPRequest) Validate() error { var validationError ValidationError @@ -274,6 +326,10 @@ func (request *EvacuateCrashedActualLRPRequest) Validate() error { return nil } +func (request *ProtoEvacuateStoppedActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *EvacuateStoppedActualLRPRequest) Validate() error { var validationError ValidationError @@ -296,6 +352,10 @@ func (request *EvacuateStoppedActualLRPRequest) Validate() error { return nil } +func (request *ProtoEvacuateRunningActualLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *EvacuateRunningActualLRPRequest) Validate() error { var validationError ValidationError diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 4c6dd930..a02e9b82 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -296,6 +296,10 @@ func (d *DesiredLRP) Copy() *DesiredLRP { return &newDesired } +func (request *ProtoDesiredLRP) Validate() error { + return request.FromProto().Validate() +} + func (desired DesiredLRP) Validate() error { var validationError ValidationError @@ -367,6 +371,10 @@ func (desired DesiredLRP) Validate() error { return validationError.ToError() } +func (request *ProtoDesiredLRPUpdate) Validate() error { + return request.FromProto().Validate() +} + func (desired *DesiredLRPUpdate) Validate() error { var validationError ValidationError @@ -487,6 +495,10 @@ func NewDesiredLRPKey(processGuid, domain, logGuid string) DesiredLRPKey { } } +func (request *ProtoDesiredLRPKey) Validate() error { + return request.FromProto().Validate() +} + func (key DesiredLRPKey) Validate() error { var validationError ValidationError if key.GetDomain() == "" { @@ -557,6 +569,10 @@ func (*DesiredLRPSchedulingInfo) Version() format.Version { return format.V0 } +func (request *ProtoDesiredLRPSchedulingInfo) Validate() error { + return request.FromProto().Validate() +} + func (s DesiredLRPSchedulingInfo) Validate() error { var validationError ValidationError @@ -582,6 +598,10 @@ func NewDesiredLRPResource(memoryMb, diskMb, maxPids int32, rootFs string) Desir } } +func (request *ProtoDesiredLRPResource) Validate() error { + return request.FromProto().Validate() +} + func (resource DesiredLRPResource) Validate() error { var validationError ValidationError @@ -660,6 +680,10 @@ func NewDesiredLRPRunInfo( } } +func (request *ProtoDesiredLRPRunInfo) Validate() error { + return request.FromProto().Validate() +} + func (runInfo DesiredLRPRunInfo) Validate() error { var validationError ValidationError @@ -746,6 +770,10 @@ func (*CertificateProperties) Version() format.Version { return format.V0 } +func (request *ProtoCertificateProperties) Validate() error { + return request.FromProto().Validate() +} + func (CertificateProperties) Validate() error { return nil } diff --git a/models/desired_lrp_requests.go b/models/desired_lrp_requests.go index 92030fec..626f53a1 100644 --- a/models/desired_lrp_requests.go +++ b/models/desired_lrp_requests.go @@ -1,9 +1,17 @@ package models +func (request *ProtoDesiredLRPsRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *DesiredLRPsRequest) Validate() error { return nil } +func (request *ProtoDesiredLRPByProcessGuidRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *DesiredLRPByProcessGuidRequest) Validate() error { var validationError ValidationError @@ -18,6 +26,10 @@ func (request *DesiredLRPByProcessGuidRequest) Validate() error { return nil } +func (request *ProtoDesireLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *DesireLRPRequest) Validate() error { var validationError ValidationError @@ -34,6 +46,10 @@ func (request *DesireLRPRequest) Validate() error { return nil } +func (request *ProtoUpdateDesiredLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *UpdateDesiredLRPRequest) Validate() error { var validationError ValidationError @@ -54,6 +70,10 @@ func (request *UpdateDesiredLRPRequest) Validate() error { return nil } +func (request *ProtoRemoveDesiredLRPRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *RemoveDesiredLRPRequest) Validate() error { var validationError ValidationError diff --git a/models/domains.go b/models/domains.go index a94ee90c..b5bdd0f8 100644 --- a/models/domains.go +++ b/models/domains.go @@ -25,6 +25,10 @@ func NewDomainSet(domains []string) DomainSet { return domainSet } +func (request *ProtoUpsertDomainRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *UpsertDomainRequest) Validate() error { var validationError ValidationError diff --git a/models/events.go b/models/events.go index f2265cfe..dc81a9c4 100644 --- a/models/events.go +++ b/models/events.go @@ -312,6 +312,10 @@ func (event *ActualLRPInstanceCreatedEvent) ToEventProto() proto.Message { return event.ToProto() } +func (request *ProtoEventsByCellId) Validate() error { + return request.FromProto().Validate() +} + func (request *EventsByCellId) Validate() error { return nil } diff --git a/models/task_requests.go b/models/task_requests.go index a3fa65aa..844edf5a 100644 --- a/models/task_requests.go +++ b/models/task_requests.go @@ -1,5 +1,9 @@ package models +func (request *ProtoDesireTaskRequest) Validate() error { + return request.FromProto().Validate() +} + func (req *DesireTaskRequest) Validate() error { var validationError ValidationError @@ -24,6 +28,10 @@ func (req *DesireTaskRequest) Validate() error { return nil } +func (request *ProtoStartTaskRequest) Validate() error { + return request.FromProto().Validate() +} + func (req *StartTaskRequest) Validate() error { var validationError ValidationError @@ -41,6 +49,10 @@ func (req *StartTaskRequest) Validate() error { return nil } +func (request *ProtoCompleteTaskRequest) Validate() error { + return request.FromProto().Validate() +} + func (req *CompleteTaskRequest) Validate() error { var validationError ValidationError @@ -58,6 +70,10 @@ func (req *CompleteTaskRequest) Validate() error { return nil } +func (request *ProtoFailTaskRequest) Validate() error { + return request.FromProto().Validate() +} + func (req *FailTaskRequest) Validate() error { var validationError ValidationError @@ -75,6 +91,10 @@ func (req *FailTaskRequest) Validate() error { return nil } +func (request *ProtoRejectTaskRequest) Validate() error { + return request.FromProto().Validate() +} + func (req *RejectTaskRequest) Validate() error { var validationError ValidationError @@ -92,10 +112,18 @@ func (req *RejectTaskRequest) Validate() error { return nil } +func (request *ProtoTasksRequest) Validate() error { + return request.FromProto().Validate() +} + func (req *TasksRequest) Validate() error { return nil } +func (request *ProtoTaskByGuidRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *TaskByGuidRequest) Validate() error { var validationError ValidationError @@ -110,6 +138,10 @@ func (request *TaskByGuidRequest) Validate() error { return nil } +func (request *ProtoTaskGuidRequest) Validate() error { + return request.FromProto().Validate() +} + func (request *TaskGuidRequest) Validate() error { var validationError ValidationError From 6f3d82feb92d6c785b2f5df1858fe8e92d0668f9 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 31 May 2024 21:34:51 +0000 Subject: [PATCH 106/155] Structure and naming changes due to Protobuf upgrades Regen protos --- controllers/task_controller.go | 6 +++--- handlers/desired_lrp_handlers.go | 22 +++++++++++----------- handlers/events_handlers_r0.go | 16 ++++++++-------- taskworkpool/taskcallback.go | 8 ++++---- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/controllers/task_controller.go b/controllers/task_controller.go index 4f020746..e9f60e47 100644 --- a/controllers/task_controller.go +++ b/controllers/task_controller.go @@ -107,7 +107,7 @@ func (c *TaskController) CancelTask(ctx context.Context, logger lager.Logger, ta } go c.taskHub.Emit(models.NewTaskChangedEvent(before, after)) - if after.CompletionCallbackUrl != "" { + if after.TaskDefinition.CompletionCallbackUrl != "" { logger.Info("task-client-completing-task") go c.taskCompletionClient.Submit(c.db, c.taskHub, after) } @@ -151,7 +151,7 @@ func (c *TaskController) FailTask(ctx context.Context, logger lager.Logger, task go c.taskHub.Emit(models.NewTaskChangedEvent(before, after)) - if after.CompletionCallbackUrl != "" { + if after.TaskDefinition.CompletionCallbackUrl != "" { logger.Info("task-client-completing-task") go c.taskCompletionClient.Submit(c.db, c.taskHub, after) } @@ -209,7 +209,7 @@ func (c *TaskController) CompleteTask( c.taskStatMetronNotifier.RecordTaskSucceeded(cellID) } - if after.CompletionCallbackUrl != "" { + if after.TaskDefinition.CompletionCallbackUrl != "" { logger.Info("task-client-completing-task") go c.taskCompletionClient.Submit(c.db, c.taskHub, after) } diff --git a/handlers/desired_lrp_handlers.go b/handlers/desired_lrp_handlers.go index 4bd01a32..0a4f9eb0 100644 --- a/handlers/desired_lrp_handlers.go +++ b/handlers/desired_lrp_handlers.go @@ -341,16 +341,16 @@ func (h *DesiredLRPHandler) startInstanceRange(ctx context.Context, logger lager keys := []*models.ActualLRPKey{} for actualIndex := lower; actualIndex < upper; actualIndex++ { - key := models.NewActualLRPKey(schedulingInfo.ProcessGuid, int32(actualIndex), schedulingInfo.Domain) + key := models.NewActualLRPKey(schedulingInfo.DesiredLrpKey.ProcessGuid, int32(actualIndex), schedulingInfo.DesiredLrpKey.Domain) keys = append(keys, &key) } createdIndices := h.createUnclaimedActualLRPs(ctx, logger, keys) start := auctioneer.NewLRPStartRequestFromSchedulingInfo(schedulingInfo, createdIndices...) - logger.Info("start-lrp-auction-request", lager.Data{"app_guid": schedulingInfo.ProcessGuid, "indices": createdIndices}) + logger.Info("start-lrp-auction-request", lager.Data{"app_guid": schedulingInfo.DesiredLrpKey.ProcessGuid, "indices": createdIndices}) err := h.auctioneerClient.RequestLRPAuctions(logger, trace.RequestIdFromContext(ctx), []*auctioneer.LRPStartRequest{&start}) - logger.Info("finished-lrp-auction-request", lager.Data{"app_guid": schedulingInfo.ProcessGuid, "indices": createdIndices}) + logger.Info("finished-lrp-auction-request", lager.Data{"app_guid": schedulingInfo.DesiredLrpKey.ProcessGuid, "indices": createdIndices}) if err != nil { logger.Error("failed-to-request-auction", err) } @@ -415,10 +415,10 @@ func (h *DesiredLRPHandler) stopInstancesFrom(ctx context.Context, logger lager. lrp := actualLRPs[i] if lrp.Presence != models.ActualLRP_Evacuating { - if lrp.Index >= int32(index) { + if lrp.ActualLrpKey.Index >= int32(index) { switch lrp.State { case models.ActualLRPStateUnclaimed, models.ActualLRPStateCrashed: - err = h.actualLRPDB.RemoveActualLRP(ctx, logger.Session("remove-actual"), lrp.ProcessGuid, lrp.Index, nil) + err = h.actualLRPDB.RemoveActualLRP(ctx, logger.Session("remove-actual"), lrp.ActualLrpKey.ProcessGuid, lrp.ActualLrpKey.Index, nil) if err != nil { logger.Error("failed-removing-lrp-instance", err) } else { @@ -427,7 +427,7 @@ func (h *DesiredLRPHandler) stopInstancesFrom(ctx context.Context, logger lager. go h.actualLRPInstanceHub.Emit(models.NewActualLRPInstanceRemovedEvent(lrp, trace.RequestIdFromContext(ctx))) } default: - cellPresence, err := h.serviceClient.CellById(logger, lrp.CellId) + cellPresence, err := h.serviceClient.CellById(logger, lrp.ActualLrpInstanceKey.CellId) if err != nil { logger.Error("failed-fetching-cell-presence", err) continue @@ -439,7 +439,7 @@ func (h *DesiredLRPHandler) stopInstancesFrom(ctx context.Context, logger lager. } logger.Debug("stopping-lrp-instance") go func() { - err := repClient.StopLRPInstance(logger, lrp.ActualLRPKey, lrp.ActualLRPInstanceKey) + err := repClient.StopLRPInstance(logger, lrp.ActualLrpKey, lrp.ActualLrpInstanceKey) if err != nil { logger.Error("failed-stopping-lrp-instance", err) } @@ -462,7 +462,7 @@ func (h *DesiredLRPHandler) updateInstances(ctx context.Context, logger lager.Lo lrp := actualLRPs[i] if lrp.Presence != models.ActualLRP_Evacuating && lrp.State != models.ActualLRPStateUnclaimed && lrp.State != models.ActualLRPStateCrashed { - cellPresence, err := h.serviceClient.CellById(logger, lrp.CellId) + cellPresence, err := h.serviceClient.CellById(logger, lrp.ActualLrpInstanceKey.CellId) if err != nil { logger.Error("failed-fetching-cell-presence", err) continue @@ -486,8 +486,8 @@ func (h *DesiredLRPHandler) updateInstances(ctx context.Context, logger lager.Lo var metricTags map[string]string if metricTagsUpdated { metricTags, err = models.ConvertMetricTags(update.MetricTags, map[models.MetricTagValue_DynamicValue]interface{}{ - models.MetricTagDynamicValueIndex: lrp.Index, - models.MetricTagDynamicValueInstanceGuid: lrp.InstanceGuid, + models.MetricTagValue_MetricTagDynamicValueIndex: lrp.ActualLrpKey.Index, + models.MetricTagValue_MetricTagDynamicValueInstanceGuid: lrp.ActualLrpInstanceKey.InstanceGuid, }) if err != nil { logger.Error("converting-metric-tags-failed", err) @@ -495,7 +495,7 @@ func (h *DesiredLRPHandler) updateInstances(ctx context.Context, logger lager.Lo } } - lrpUpdate := rep.NewLRPUpdate(lrp.ActualLRPInstanceKey.InstanceGuid, lrp.ActualLRPKey, internalRoutes, metricTags) + lrpUpdate := rep.NewLRPUpdate(lrp.ActualLrpInstanceKey.InstanceGuid, lrp.ActualLrpKey, internalRoutes, metricTags) go func() { err := repClient.UpdateLRPInstance(logger, lrpUpdate) if err != nil { diff --git a/handlers/events_handlers_r0.go b/handlers/events_handlers_r0.go index 98fca66f..7b1895aa 100644 --- a/handlers/events_handlers_r0.go +++ b/handlers/events_handlers_r0.go @@ -205,7 +205,7 @@ func filterByCellID(cellID string, bbsEvent models.Event, err error) (bool, erro return false, resolveError } - if lrp.CellId != cellID { + if lrp.ActualLrpInstanceKey.CellId != cellID { return false, nil } @@ -221,7 +221,7 @@ func filterByCellID(cellID string, bbsEvent models.Event, err error) (bool, erro if afterResolveError != nil { return false, afterResolveError } - if afterLRP.CellId != cellID && beforeLRP.CellId != cellID { + if afterLRP.ActualLrpInstanceKey.CellId != cellID && beforeLRP.ActualLrpInstanceKey.CellId != cellID { return false, nil } @@ -232,12 +232,12 @@ func filterByCellID(cellID string, bbsEvent models.Event, err error) (bool, erro if resolveError != nil { return false, resolveError } - if lrp.CellId != cellID { + if lrp.ActualLrpInstanceKey.CellId != cellID { return false, nil } case *models.ActualLRPCrashedEvent: - if x.ActualLRPInstanceKey.CellId != cellID { + if x.ActualLrpInstanceKey.CellId != cellID { return false, nil } } @@ -249,23 +249,23 @@ func filterInstanceEventByCellID(cellID string, bbsEvent models.Event, err error switch x := bbsEvent.(type) { case *models.ActualLRPInstanceCreatedEvent: lrp := x.ActualLrp - if lrp.CellId != cellID { + if lrp.ActualLrpInstanceKey.CellId != cellID { return false } case *models.ActualLRPInstanceChangedEvent: - if x.CellId != cellID { + if x.ActualLrpInstanceKey.CellId != cellID { return false } case *models.ActualLRPInstanceRemovedEvent: lrp := x.ActualLrp - if lrp.CellId != cellID { + if lrp.ActualLrpInstanceKey.CellId != cellID { return false } case *models.ActualLRPCrashedEvent: - if x.ActualLRPInstanceKey.CellId != cellID { + if x.ActualLrpInstanceKey.CellId != cellID { return false } } diff --git a/taskworkpool/taskcallback.go b/taskworkpool/taskcallback.go index c63fbeb9..e0fd9157 100644 --- a/taskworkpool/taskcallback.go +++ b/taskworkpool/taskcallback.go @@ -89,7 +89,7 @@ func (twp *TaskCompletionWorkPool) Submit(taskDB db.TaskDB, taskHub events.Hub, func HandleCompletedTask(logger lager.Logger, httpClient *http.Client, taskDB db.TaskDB, taskHub events.Hub, task *models.Task) { logger = logger.Session("handle-completed-task", lager.Data{"task_guid": task.TaskGuid}) - if task.CompletionCallbackUrl != "" { + if task.TaskDefinition.CompletionCallbackUrl != "" { before, after, modelErr := taskDB.ResolvingTask(context.Background(), logger, task.TaskGuid) if modelErr != nil { logger.Error("marking-task-as-resolving-failed", modelErr) @@ -97,14 +97,14 @@ func HandleCompletedTask(logger lager.Logger, httpClient *http.Client, taskDB db } go taskHub.Emit(models.NewTaskChangedEvent(before, after)) - logger = logger.WithData(lager.Data{"callback_url": task.CompletionCallbackUrl}) + logger = logger.WithData(lager.Data{"callback_url": task.TaskDefinition.CompletionCallbackUrl}) json, err := json.Marshal(&models.TaskCallbackResponse{ TaskGuid: task.TaskGuid, Failed: task.Failed, FailureReason: task.FailureReason, Result: task.Result, - Annotation: task.Annotation, + Annotation: task.TaskDefinition.Annotation, CreatedAt: task.CreatedAt, }) if err != nil { @@ -116,7 +116,7 @@ func HandleCompletedTask(logger lager.Logger, httpClient *http.Client, taskDB db retriableErrRegexp := regexp.MustCompile("Client.Timeout|use of closed network connection") for i := 0; i < MAX_CB_RETRIES; i++ { - request, err := http.NewRequest("POST", task.CompletionCallbackUrl, bytes.NewReader(json)) + request, err := http.NewRequest("POST", task.TaskDefinition.CompletionCallbackUrl, bytes.NewReader(json)) if err != nil { logger.Error("building-request-failed", err) return From 07ffcca68c101337fd19fc1f6ac3eac5364b0be9 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 31 May 2024 21:36:35 +0000 Subject: [PATCH 107/155] Use google.golang protobuf instead of gogo protobuf Remove Unmarshal from MessageValidator interface (use proto.Marshal instead) --- format/envelope.go | 2 +- format/envelope_test.go | 16 ++--- format/format_test.go | 14 ++--- format/versioner.go | 2 +- handlers/actual_lrp_handlers.go | 32 ++++++---- handlers/actual_lrp_lifecycle_handler.go | 61 +++++++++++------- handlers/cell_handlers.go | 2 +- handlers/desired_lrp_handlers.go | 68 ++++++++++++-------- handlers/domain_handlers.go | 10 +-- handlers/evacuation_handler.go | 46 ++++++++------ handlers/events_handlers_r0.go | 11 ++-- handlers/handlers.go | 4 +- handlers/ping_handler.go | 2 +- handlers/task_handlers.go | 80 +++++++++++++++--------- 14 files changed, 212 insertions(+), 138 deletions(-) diff --git a/format/envelope.go b/format/envelope.go index dcd306d0..a9d814fa 100644 --- a/format/envelope.go +++ b/format/envelope.go @@ -2,7 +2,7 @@ package format import ( "code.cloudfoundry.org/lager/v3" - "github.com/gogo/protobuf/proto" + "google.golang.org/protobuf/proto" ) type EnvelopeFormat byte diff --git a/format/envelope_test.go b/format/envelope_test.go index ed7ebe53..742bff67 100644 --- a/format/envelope_test.go +++ b/format/envelope_test.go @@ -5,9 +5,9 @@ import ( "code.cloudfoundry.org/bbs/models" "code.cloudfoundry.org/bbs/models/test/model_helpers" "code.cloudfoundry.org/lager/v3/lagertest" - "github.com/gogo/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/proto" ) var _ = Describe("Envelope", func() { @@ -20,36 +20,36 @@ var _ = Describe("Envelope", func() { Describe("Marshal", func() { It("can successfully marshal a model object envelope", func() { task := model_helpers.NewValidTask("some-guid") - encoded, err := format.MarshalEnvelope(task) + encoded, err := format.MarshalEnvelope(task.ToProto()) Expect(err).NotTo(HaveOccurred()) Expect(format.EnvelopeFormat(encoded[0])).To(Equal(format.PROTO)) - var newTask models.Task + var newTask models.ProtoTask modelErr := proto.Unmarshal(encoded[2:], &newTask) Expect(modelErr).To(BeNil()) - Expect(*task).To(Equal(newTask)) + Expect(task).To(Equal(newTask.FromProto())) }) }) Describe("Unmarshal", func() { It("can marshal and unmarshal a task without losing data", func() { task := model_helpers.NewValidTask("some-guid") - payload, err := format.MarshalEnvelope(task) + payload, err := format.MarshalEnvelope(task.ToProto()) Expect(err).NotTo(HaveOccurred()) - resultingTask := new(models.Task) + resultingTask := new(models.ProtoTask) err = format.UnmarshalEnvelope(logger, payload, resultingTask) Expect(err).NotTo(HaveOccurred()) - Expect(*resultingTask).To(BeEquivalentTo(*task)) + Expect(resultingTask.FromProto()).To(BeEquivalentTo(task)) }) It("returns an error when the protobuf payload is invalid", func() { model := model_helpers.NewValidTask("foo") payload := []byte{byte(format.PROTO), byte(format.V0), 'f', 'o', 'o'} - err := format.UnmarshalEnvelope(logger, payload, model) + err := format.UnmarshalEnvelope(logger, payload, model.ToProto()) Expect(err).To(HaveOccurred()) }) }) diff --git a/format/format_test.go b/format/format_test.go index a9a08a05..60c5ae2d 100644 --- a/format/format_test.go +++ b/format/format_test.go @@ -3,9 +3,9 @@ package format_test import ( "code.cloudfoundry.org/lager/v3" "code.cloudfoundry.org/lager/v3/lagertest" - "github.com/gogo/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/proto" "code.cloudfoundry.org/bbs/encryption" "code.cloudfoundry.org/bbs/encryption/encryptionfakes" @@ -45,17 +45,17 @@ var _ = Describe("Format", func() { Describe("Marshal", func() { Describe("ENCRYPTED_PROTO", func() { It("marshals the data as protobuf with an base64 encoded ciphertext envelope", func() { - encoded, err := serializer.Marshal(logger, task) + encoded, err := serializer.Marshal(logger, task.ToProto()) Expect(err).NotTo(HaveOccurred()) unencoded, err := encoder.Decode(encoded) Expect(err).NotTo(HaveOccurred()) Expect(unencoded[0]).To(BeEquivalentTo(format.PROTO)) - var actualTask models.Task + var actualTask models.ProtoTask err = proto.Unmarshal(unencoded[2:], &actualTask) Expect(err).NotTo(HaveOccurred()) - Expect(actualTask).To(Equal(*task)) + Expect(*actualTask.FromProto()).To(Equal(*task)) }) }) }) @@ -63,13 +63,13 @@ var _ = Describe("Format", func() { Describe("Unmarshal", func() { Describe("ENCRYPTED_PROTO", func() { It("unmarshals the protobuf data from a base64 encoded ciphertext envelope", func() { - payload, err := serializer.Marshal(logger, task) + payload, err := serializer.Marshal(logger, task.ToProto()) Expect(err).NotTo(HaveOccurred()) - var decodedTask models.Task + var decodedTask models.ProtoTask err = serializer.Unmarshal(logger, payload, &decodedTask) Expect(err).NotTo(HaveOccurred()) - Expect(*task).To(Equal(decodedTask)) + Expect(*task).To(Equal(*decodedTask.FromProto())) }) }) }) diff --git a/format/versioner.go b/format/versioner.go index e4c3feb2..6eec60ef 100644 --- a/format/versioner.go +++ b/format/versioner.go @@ -1,6 +1,6 @@ package format -import "github.com/gogo/protobuf/proto" +import "google.golang.org/protobuf/proto" type Version byte diff --git a/handlers/actual_lrp_handlers.go b/handlers/actual_lrp_handlers.go index ebf76d0f..d4b3943d 100644 --- a/handlers/actual_lrp_handlers.go +++ b/handlers/actual_lrp_handlers.go @@ -26,15 +26,17 @@ func (h *ActualLRPHandler) ActualLRPs(logger lager.Logger, w http.ResponseWriter logger.Debug("starting") defer logger.Debug("complete") - request := &models.ActualLRPsRequest{} + var request *models.ActualLRPsRequest + protoRequest := &models.ProtoActualLRPsRequest{} response := &models.ActualLRPsResponse{} - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err == nil { var index *int32 if request.IndexExists() { i := request.GetIndex() - index = &i + index = i } filter := models.ActualLRPFilter{Domain: request.Domain, CellID: request.CellId, Index: index, ProcessGuid: request.ProcessGuid} response.ActualLrps, err = h.db.ActualLRPs(req.Context(), logger, filter) @@ -42,7 +44,7 @@ func (h *ActualLRPHandler) ActualLRPs(logger lager.Logger, w http.ResponseWriter response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -52,12 +54,14 @@ func (h *ActualLRPHandler) ActualLRPGroups(logger lager.Logger, w http.ResponseW logger = logger.Session("actual-lrp-groups").WithTraceInfo(req) request := &models.ActualLRPGroupsRequest{} + protoRequest := &models.ProtoActualLRPGroupsRequest{} response := &models.ActualLRPGroupsResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) if err != nil { + request = protoRequest.FromProto() response.Error = models.ConvertError(err) return } @@ -76,12 +80,14 @@ func (h *ActualLRPHandler) ActualLRPGroupsByProcessGuid(logger lager.Logger, w h var err error logger = logger.Session("actual-lrp-groups-by-process-guid").WithTraceInfo(req) - request := &models.ActualLRPGroupsByProcessGuidRequest{} + var request *models.ActualLRPGroupsByProcessGuidRequest + protoRequest := &models.ProtoActualLRPGroupsByProcessGuidRequest{} response := &models.ActualLRPGroupsResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -100,12 +106,14 @@ func (h *ActualLRPHandler) ActualLRPGroupByProcessGuidAndIndex(logger lager.Logg var err error logger = logger.Session("actual-lrp-group-by-process-guid-and-index").WithTraceInfo(req) - request := &models.ActualLRPGroupByProcessGuidAndIndexRequest{} + var request *models.ActualLRPGroupByProcessGuidAndIndexRequest + protoRequest := &models.ProtoActualLRPGroupByProcessGuidAndIndexRequest{} response := &models.ActualLRPGroupResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return diff --git a/handlers/actual_lrp_lifecycle_handler.go b/handlers/actual_lrp_lifecycle_handler.go index f8d3defb..b9d6b53c 100644 --- a/handlers/actual_lrp_lifecycle_handler.go +++ b/handlers/actual_lrp_lifecycle_handler.go @@ -51,12 +51,14 @@ func (h *ActualLRPLifecycleHandler) ClaimActualLRP(logger lager.Logger, w http.R logger.Debug("starting") defer logger.Debug("complete") - request := &models.ClaimActualLRPRequest{} + var request *models.ClaimActualLRPRequest + protoRequest := &models.ProtoClaimActualLRPRequest{} response := &models.ActualLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -71,13 +73,15 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP(logger lager.Logger, w http.R logger.Debug("starting") defer logger.Debug("complete") - request := &models.StartActualLRPRequest{} + var request *models.StartActualLRPRequest + protoRequest := &models.ProtoStartActualLRPRequest{} response := &models.ActualLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -85,7 +89,7 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP(logger lager.Logger, w http.R routable := true if request.RoutableExists() { r := request.GetRoutable() - routable = r + routable = *r } err = h.controller.StartActualLRP(req.Context(), logger, request.ActualLrpKey, request.ActualLrpInstanceKey, request.ActualLrpNetInfo, request.ActualLrpInternalRoutes, request.MetricTags, routable, request.AvailabilityZone) @@ -97,13 +101,15 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP_r0(logger lager.Logger, w htt logger.Debug("starting") defer logger.Debug("complete") - request := &models.StartActualLRPRequest{} + var request *models.StartActualLRPRequest + protoRequest := &models.ProtoStartActualLRPRequest{} response := &models.ActualLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -111,7 +117,7 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP_r0(logger lager.Logger, w htt routable := true if request.RoutableExists() { r := request.GetRoutable() - routable = r + routable = *r } err = h.controller.StartActualLRP(req.Context(), logger, request.ActualLrpKey, request.ActualLrpInstanceKey, request.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, nil, routable, request.AvailabilityZone) @@ -123,12 +129,14 @@ func (h *ActualLRPLifecycleHandler) CrashActualLRP(logger lager.Logger, w http.R logger.Debug("starting") defer logger.Debug("complete") - request := &models.CrashActualLRPRequest{} + var request *models.CrashActualLRPRequest + protoRequest := &models.ProtoCrashActualLRPRequest{} response := &models.ActualLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -147,13 +155,15 @@ func (h *ActualLRPLifecycleHandler) FailActualLRP(logger lager.Logger, w http.Re logger.Debug("starting") defer logger.Debug("complete") - request := &models.FailActualLRPRequest{} + var request *models.FailActualLRPRequest + protoRequest := &models.ProtoFailActualLRPRequest{} response := &models.ActualLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -169,13 +179,15 @@ func (h *ActualLRPLifecycleHandler) RemoveActualLRP(logger lager.Logger, w http. logger.Debug("starting") defer logger.Debug("complete") - request := &models.RemoveActualLRPRequest{} + var request *models.RemoveActualLRPRequest + protoRequest := &models.ProtoRemoveActualLRPRequest{} response := &models.ActualLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -189,14 +201,17 @@ func (h *ActualLRPLifecycleHandler) RetireActualLRP(logger lager.Logger, w http. logger = logger.Session("retire-actual-lrp").WithTraceInfo(req) logger.Debug("starting") defer logger.Debug("complete") - request := &models.RetireActualLRPRequest{} + + var request *models.RetireActualLRPRequest + protoRequest := &models.ProtoRetireActualLRPRequest{} response := &models.ActualLRPLifecycleResponse{} var err error defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return diff --git a/handlers/cell_handlers.go b/handlers/cell_handlers.go index df2c13dd..f6297cae 100644 --- a/handlers/cell_handlers.go +++ b/handlers/cell_handlers.go @@ -31,6 +31,6 @@ func (h *CellHandler) Cells(logger lager.Logger, w http.ResponseWriter, req *htt } response.Cells = cells response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } diff --git a/handlers/desired_lrp_handlers.go b/handlers/desired_lrp_handlers.go index 0a4f9eb0..631efbc7 100644 --- a/handlers/desired_lrp_handlers.go +++ b/handlers/desired_lrp_handlers.go @@ -70,10 +70,12 @@ func (h *DesiredLRPHandler) commonDesiredLRPs(logger lager.Logger, targetVersion var err error logger = logger.Session("desired-lrps").WithTraceInfo(req) - request := &models.DesiredLRPsRequest{} + var request *models.DesiredLRPsRequest + protoRequest := &models.ProtoDesiredLRPsRequest{} response := &models.DesiredLRPsResponse{} - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err == nil { filter := models.DesiredLRPFilter{Domain: request.Domain, ProcessGuids: request.ProcessGuids} @@ -90,7 +92,7 @@ func (h *DesiredLRPHandler) commonDesiredLRPs(logger lager.Logger, targetVersion } response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -107,10 +109,12 @@ func (h *DesiredLRPHandler) commonDesiredLRPByProcessGuid(logger lager.Logger, t var err error logger = logger.Session("desired-lrp-by-process-guid").WithTraceInfo(req) - request := &models.DesiredLRPByProcessGuidRequest{} + var request *models.DesiredLRPByProcessGuidRequest + protoRequest := &models.ProtoDesiredLRPByProcessGuidRequest{} response := &models.DesiredLRPResponse{} - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err == nil { var desiredLRP *models.DesiredLRP desiredLRP, err = h.desiredLRPDB.DesiredLRPByProcessGuid(req.Context(), logger, request.ProcessGuid) @@ -121,7 +125,7 @@ func (h *DesiredLRPHandler) commonDesiredLRPByProcessGuid(logger lager.Logger, t } response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -140,10 +144,12 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfos(logger lager.Logger, w htt logger.Debug("starting") defer logger.Debug("complete") - request := &models.DesiredLRPsRequest{} + var request *models.DesiredLRPsRequest + protoRequest := &models.ProtoDesiredLRPsRequest{} response := &models.DesiredLRPSchedulingInfosResponse{} - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err == nil { filter := models.DesiredLRPFilter{ Domain: request.Domain, @@ -153,7 +159,7 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfos(logger lager.Logger, w htt } response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -163,16 +169,18 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfoByProcessGuid(logger lager.L logger.Debug("starting") defer logger.Debug("complete") - request := &models.DesiredLRPByProcessGuidRequest{} + var request *models.DesiredLRPByProcessGuidRequest + protoRequest := &models.ProtoDesiredLRPByProcessGuidRequest{} response := &models.DesiredLRPSchedulingInfoByProcessGuidResponse{} - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err == nil { response.DesiredLrpSchedulingInfo, err = h.desiredLRPDB.DesiredLRPSchedulingInfoByProcessGuid(req.Context(), logger, request.ProcessGuid) } response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -182,10 +190,12 @@ func (h *DesiredLRPHandler) DesiredLRPRoutingInfos(logger lager.Logger, w http.R logger.Debug("starting") defer logger.Debug("complete") - request := &models.DesiredLRPsRequest{} + var request *models.DesiredLRPsRequest + protoRequest := &models.ProtoDesiredLRPsRequest{} response := &models.DesiredLRPsResponse{} - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err == nil { filter := models.DesiredLRPFilter{ Domain: request.Domain, @@ -195,19 +205,21 @@ func (h *DesiredLRPHandler) DesiredLRPRoutingInfos(logger lager.Logger, w http.R } response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } func (h *DesiredLRPHandler) DesireDesiredLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { logger = logger.Session("desire-lrp").WithTraceInfo(req) - request := &models.DesireLRPRequest{} + var request *models.DesireLRPRequest + protoRequest := &models.ProtoDesireLRPRequest{} response := &models.DesiredLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -240,12 +252,14 @@ func (h *DesiredLRPHandler) DesireDesiredLRP(logger lager.Logger, w http.Respons func (h *DesiredLRPHandler) UpdateDesiredLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { logger = logger.Session("update-desired-lrp").WithTraceInfo(req) - request := &models.UpdateDesiredLRPRequest{} + var request *models.UpdateDesiredLRPRequest + protoRequest := &models.ProtoUpdateDesiredLRPRequest{} response := &models.DesiredLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -276,13 +290,13 @@ func (h *DesiredLRPHandler) UpdateDesiredLRP(logger lager.Logger, w http.Respons logger.Debug("updating-lrp-instances") previousInstanceCount := beforeDesiredLRP.Instances - requestedInstances := request.Update.GetInstances() - previousInstanceCount + requestedInstances := *request.Update.GetInstances() - previousInstanceCount logger = logger.WithData(lager.Data{"instances_delta": requestedInstances}) if requestedInstances > 0 { logger.Debug("increasing-the-instances") schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() - h.startInstanceRange(trace.ContextWithRequestId(req), logger, previousInstanceCount, request.Update.GetInstances(), &schedulingInfo) + h.startInstanceRange(trace.ContextWithRequestId(req), logger, previousInstanceCount, *request.Update.GetInstances(), &schedulingInfo) } if requestedInstances < 0 { @@ -305,12 +319,14 @@ func (h *DesiredLRPHandler) UpdateDesiredLRP(logger lager.Logger, w http.Respons func (h *DesiredLRPHandler) RemoveDesiredLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { logger = logger.Session("remove-desired-lrp").WithTraceInfo(req) - request := &models.RemoveDesiredLRPRequest{} + var request *models.RemoveDesiredLRPRequest + protoRequest := &models.ProtoRemoveDesiredLRPRequest{} response := &models.DesiredLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return diff --git a/handlers/domain_handlers.go b/handlers/domain_handlers.go index 6951e24d..2ca478d5 100644 --- a/handlers/domain_handlers.go +++ b/handlers/domain_handlers.go @@ -32,7 +32,7 @@ func (h *DomainHandler) Domains(logger lager.Logger, w http.ResponseWriter, req response := &models.DomainsResponse{} response.Domains, err = h.db.FreshDomains(req.Context(), logger) response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -40,15 +40,17 @@ func (h *DomainHandler) Upsert(logger lager.Logger, w http.ResponseWriter, req * var err error logger = logger.Session("upsert").WithTraceInfo(req) - request := &models.UpsertDomainRequest{} + var request *models.UpsertDomainRequest + protoRequest := &models.ProtoUpsertDomainRequest{} response := &models.UpsertDomainResponse{} - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err == nil { err = h.db.UpsertDomain(req.Context(), logger, request.Domain, request.Ttl) } response.Error = models.ConvertError(err) - writeResponse(w, response) + writeResponse(w, response.ToProto()) exitIfUnrecoverable(logger, h.exitChan, response.Error) } diff --git a/handlers/evacuation_handler.go b/handlers/evacuation_handler.go index 03c9a928..599aaa25 100644 --- a/handlers/evacuation_handler.go +++ b/handlers/evacuation_handler.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/bbs/models" "code.cloudfoundry.org/lager/v3" - "github.com/gogo/protobuf/proto" + "google.golang.org/protobuf/proto" ) //counterfeiter:generate -o fake_controllers/fake_evacuation_controller.go . EvacuationController @@ -36,7 +36,7 @@ func NewEvacuationHandler( type MessageValidator interface { proto.Message Validate() error - Unmarshal(data []byte) error + // Unmarshal(data []byte) error } func (h *EvacuationHandler) RemoveEvacuatingActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -45,13 +45,15 @@ func (h *EvacuationHandler) RemoveEvacuatingActualLRP(logger lager.Logger, w htt logger.Info("started") defer logger.Info("completed") - request := &models.RemoveEvacuatingActualLRPRequest{} + var request *models.RemoveEvacuatingActualLRPRequest + protoRequest := &models.ProtoRemoveEvacuatingActualLRPRequest{} response := &models.RemoveEvacuatingActualLRPResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -66,12 +68,14 @@ func (h *EvacuationHandler) EvacuateClaimedActualLRP(logger lager.Logger, w http logger.Info("started") defer logger.Info("completed") - request := &models.EvacuateClaimedActualLRPRequest{} + var request *models.EvacuateClaimedActualLRPRequest + protoRequest := &models.ProtoEvacuateClaimedActualLRPRequest{} response := &models.EvacuationResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -89,12 +93,14 @@ func (h *EvacuationHandler) EvacuateCrashedActualLRP(logger lager.Logger, w http logger.Info("started") defer logger.Info("completed") - request := &models.EvacuateCrashedActualLRPRequest{} + var request *models.EvacuateCrashedActualLRPRequest + protoRequest := &models.ProtoEvacuateCrashedActualLRPRequest{} response := &models.EvacuationResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -110,13 +116,15 @@ func (h *EvacuationHandler) commonEvacuateRunningActualLRP(logger lager.Logger, logger.Info("starting") defer logger.Info("completed") + var request *models.EvacuateRunningActualLRPRequest + protoRequest := &models.ProtoEvacuateRunningActualLRPRequest{} response := &models.EvacuationResponse{} response.KeepContainer = true defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - request := &models.EvacuateRunningActualLRPRequest{} - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -132,7 +140,7 @@ func (h *EvacuationHandler) commonEvacuateRunningActualLRP(logger lager.Logger, routable := true if request.RoutableExists() { r := request.GetRoutable() - routable = r + routable = *r } keepContainer, err = h.controller.EvacuateRunningActualLRP(req.Context(), logger, request.ActualLrpKey, request.ActualLrpInstanceKey, request.ActualLrpNetInfo, actualLrpInternalRoutes, metricTags, routable, request.AvailabilityZone) @@ -153,13 +161,15 @@ func (h *EvacuationHandler) EvacuateRunningActualLRP_r0(logger lager.Logger, w h func (h *EvacuationHandler) EvacuateStoppedActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { logger = logger.Session("evacuate-stopped-actual-lrp").WithTraceInfo(req) - request := &models.EvacuateStoppedActualLRPRequest{} + var request *models.EvacuateStoppedActualLRPRequest + protoRequest := &models.ProtoEvacuateStoppedActualLRPRequest{} response := &models.EvacuationResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response) + defer writeResponse(w, response.ToProto()) - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-to-parse-request", err) response.Error = models.ConvertError(err) diff --git a/handlers/events_handlers_r0.go b/handlers/events_handlers_r0.go index 7b1895aa..d84a035c 100644 --- a/handlers/events_handlers_r0.go +++ b/handlers/events_handlers_r0.go @@ -11,8 +11,10 @@ import ( func (h *LRPGroupEventsHandler) commonSubscribe(logger lager.Logger, w http.ResponseWriter, req *http.Request, target format.Version) { logger = logger.Session("subscribe-r0").WithTraceInfo(req) - request := &models.EventsByCellId{} - err := parseRequest(logger, req, request) + var request *models.EventsByCellId + protoRequest := &models.ProtoEventsByCellId{} + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) w.WriteHeader(http.StatusInternalServerError) @@ -86,8 +88,9 @@ func (h *LRPGroupEventsHandler) Subscribe_r1(logger lager.Logger, w http.Respons func (h *LRPInstanceEventHandler) commonSubscribe(logger lager.Logger, w http.ResponseWriter, req *http.Request, target format.Version) { logger = logger.Session("subscribe-r0").WithTraceInfo(req) - request := &models.EventsByCellId{} - err := parseRequest(logger, req, request) + var request *models.EventsByCellId + protoRequest := &models.ProtoEventsByCellId{} + err := parseRequest(logger, req, protoRequest) if err != nil { logger.Error("failed-parsing-request", err) w.WriteHeader(http.StatusInternalServerError) diff --git a/handlers/handlers.go b/handlers/handlers.go index b907a8ec..2fd51544 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -18,8 +18,8 @@ import ( loggingclient "code.cloudfoundry.org/diego-logging-client" "code.cloudfoundry.org/lager/v3" "code.cloudfoundry.org/rep" - "github.com/gogo/protobuf/proto" "github.com/tedsuo/rata" + "google.golang.org/protobuf/proto" ) func New( @@ -173,7 +173,7 @@ func parseRequest(logger lager.Logger, req *http.Request, request MessageValidat return models.ErrUnknownError } - err = request.Unmarshal(data) + err = proto.Unmarshal(data, request) if err != nil { logger.Error("failed-to-parse-request-body", err) return models.ErrBadRequest diff --git a/handlers/ping_handler.go b/handlers/ping_handler.go index e76f81f4..d2af401d 100644 --- a/handlers/ping_handler.go +++ b/handlers/ping_handler.go @@ -17,5 +17,5 @@ func NewPingHandler() *PingHandler { func (h *PingHandler) Ping(logger lager.Logger, w http.ResponseWriter, req *http.Request) { response := &models.PingResponse{} response.Available = true - writeResponse(w, response) + writeResponse(w, response.ToProto()) } diff --git a/handlers/task_handlers.go b/handlers/task_handlers.go index ccff42f4..5e991cf9 100644 --- a/handlers/task_handlers.go +++ b/handlers/task_handlers.go @@ -46,13 +46,15 @@ func (h *TaskHandler) commonTasks(logger lager.Logger, targetVersion format.Vers var err error logger = logger.Session("tasks").WithTraceInfo(req) - request := &models.TasksRequest{} + var request *models.TasksRequest + protoRequest := &models.ProtoTasksRequest{} response := &models.TasksResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -81,13 +83,15 @@ func (h *TaskHandler) commonTaskByGuid(logger lager.Logger, targetVersion format var err error logger = logger.Session("task-by-guid").WithTraceInfo(req) - request := &models.TaskByGuidRequest{} + var request *models.TaskByGuidRequest + protoRequest := &models.ProtoTaskByGuidRequest{} response := &models.TaskResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -116,13 +120,15 @@ func (h *TaskHandler) DesireTask(logger lager.Logger, w http.ResponseWriter, req var err error logger = logger.Session("desire-task").WithTraceInfo(req) - request := &models.DesireTaskRequest{} + var request *models.DesireTaskRequest + protoRequest := &models.ProtoDesireTaskRequest{} response := &models.TaskLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -137,13 +143,15 @@ func (h *TaskHandler) StartTask(logger lager.Logger, w http.ResponseWriter, req var err error logger = logger.Session("start-task").WithTraceInfo(req) - request := &models.StartTaskRequest{} + var request *models.StartTaskRequest + protoRequest := &models.ProtoStartTaskRequest{} response := &models.StartTaskResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -157,13 +165,15 @@ func (h *TaskHandler) StartTask(logger lager.Logger, w http.ResponseWriter, req func (h *TaskHandler) CancelTask(logger lager.Logger, w http.ResponseWriter, req *http.Request) { logger = logger.Session("cancel-task").WithTraceInfo(req) - request := &models.TaskGuidRequest{} + var request *models.TaskGuidRequest + protoRequest := &models.ProtoTaskGuidRequest{} response := &models.TaskLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err := parseRequest(logger, req, request) + err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -179,13 +189,15 @@ func (h *TaskHandler) FailTask(logger lager.Logger, w http.ResponseWriter, req * var err error logger = logger.Session("fail-task").WithTraceInfo(req) - request := &models.FailTaskRequest{} + var request *models.FailTaskRequest + protoRequest := &models.ProtoFailTaskRequest{} response := &models.TaskLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -200,13 +212,15 @@ func (h *TaskHandler) RejectTask(logger lager.Logger, w http.ResponseWriter, req var err error logger = logger.Session("reject-task").WithTraceInfo(req) - request := &models.RejectTaskRequest{} + var request *models.RejectTaskRequest + protoRequest := &models.ProtoRejectTaskRequest{} response := &models.TaskLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -221,13 +235,15 @@ func (h *TaskHandler) CompleteTask(logger lager.Logger, w http.ResponseWriter, r var err error logger = logger.Session("complete-task").WithTraceInfo(req) - request := &models.CompleteTaskRequest{} + var request *models.CompleteTaskRequest + protoRequest := &models.ProtoCompleteTaskRequest{} response := &models.TaskLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) logger.Error("failed-parsing-request", err) @@ -242,13 +258,15 @@ func (h *TaskHandler) ResolvingTask(logger lager.Logger, w http.ResponseWriter, var err error logger = logger.Session("resolving-task").WithTraceInfo(req) - request := &models.TaskGuidRequest{} + var request *models.TaskGuidRequest + protoRequest := &models.ProtoTaskGuidRequest{} response := &models.TaskLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) @@ -263,13 +281,15 @@ func (h *TaskHandler) DeleteTask(logger lager.Logger, w http.ResponseWriter, req var err error logger = logger.Session("delete-task").WithTraceInfo(req) - request := &models.TaskGuidRequest{} + var request *models.TaskGuidRequest + protoRequest := &models.ProtoTaskGuidRequest{} response := &models.TaskLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer func() { writeResponse(w, response) }() + defer func() { writeResponse(w, response.ToProto()) }() - err = parseRequest(logger, req, request) + err = parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() if err != nil { logger.Error("failed-parsing-request", err) response.Error = models.ConvertError(err) From e7618d8354df9648f8aa06d32c707d87898eae85 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 3 Jun 2024 19:45:24 +0000 Subject: [PATCH 108/155] Add ToEventProto for models.Event interface --- events/eventfakes/fake_events.go | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/events/eventfakes/fake_events.go b/events/eventfakes/fake_events.go index 842c303a..8646a089 100644 --- a/events/eventfakes/fake_events.go +++ b/events/eventfakes/fake_events.go @@ -1,21 +1,27 @@ package eventfakes -import "errors" +import ( + "errors" + + "google.golang.org/protobuf/proto" +) type FakeEvent struct{ Token string } -func (FakeEvent) EventType() string { return "fake" } -func (FakeEvent) Key() string { return "fake" } -func (FakeEvent) ProtoMessage() {} -func (FakeEvent) Reset() {} -func (FakeEvent) String() string { return "fake" } -func (e FakeEvent) Marshal() ([]byte, error) { return []byte(e.Token), nil } +func (FakeEvent) EventType() string { return "fake" } +func (FakeEvent) Key() string { return "fake" } +func (FakeEvent) ProtoMessage() {} +func (FakeEvent) ToEventProto() proto.Message { return nil } +func (FakeEvent) Reset() {} +func (FakeEvent) String() string { return "fake" } +func (e FakeEvent) Marshal() ([]byte, error) { return []byte(e.Token), nil } type UnmarshalableEvent struct{ Fn func() } -func (UnmarshalableEvent) EventType() string { return "unmarshalable" } -func (UnmarshalableEvent) Key() string { return "unmarshalable" } -func (UnmarshalableEvent) ProtoMessage() {} -func (UnmarshalableEvent) Reset() {} -func (UnmarshalableEvent) String() string { return "unmarshalable" } -func (UnmarshalableEvent) Marshal() ([]byte, error) { return nil, errors.New("no workie") } +func (UnmarshalableEvent) EventType() string { return "unmarshalable" } +func (UnmarshalableEvent) Key() string { return "unmarshalable" } +func (UnmarshalableEvent) ProtoMessage() {} +func (UnmarshalableEvent) ToEventProto() proto.Message { return nil } +func (UnmarshalableEvent) Reset() {} +func (UnmarshalableEvent) String() string { return "unmarshalable" } +func (UnmarshalableEvent) Marshal() ([]byte, error) { return nil, errors.New("no workie") } From 2f46136ec45788fbda4ca4e0ba4dabcb1b6359af Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 3 Jun 2024 19:45:58 +0000 Subject: [PATCH 109/155] Add conversions for protobuf messages --- events/event_source.go | 52 +++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/events/event_source.go b/events/event_source.go index 2378dcfd..e54b43d0 100644 --- a/events/event_source.go +++ b/events/event_source.go @@ -143,28 +143,34 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { switch rawEvent.Name { case models.EventTypeDesiredLRPCreated: event := new(models.DesiredLRPCreatedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoDesiredLRPCreatedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeDesiredLRPChanged: event := new(models.DesiredLRPChangedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoDesiredLRPChangedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeDesiredLRPRemoved: event := new(models.DesiredLRPRemovedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoDesiredLRPRemovedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil @@ -172,10 +178,12 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPCreated: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPCreatedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoActualLRPCreatedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil @@ -183,10 +191,12 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPChanged: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPChangedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoActualLRPChangedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil @@ -194,73 +204,89 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPRemoved: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPRemovedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoActualLRPRemovedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeActualLRPCrashed: event := new(models.ActualLRPCrashedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoActualLRPCrashedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeTaskCreated: event := new(models.TaskCreatedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoTaskCreatedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeTaskChanged: event := new(models.TaskChangedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoTaskChangedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeTaskRemoved: event := new(models.TaskRemovedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoTaskRemovedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeActualLRPInstanceCreated: event := new(models.ActualLRPInstanceCreatedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoActualLRPInstanceCreatedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeActualLRPInstanceChanged: event := new(models.ActualLRPInstanceChangedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoActualLRPInstanceChangedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil case models.EventTypeActualLRPInstanceRemoved: event := new(models.ActualLRPInstanceRemovedEvent) - err := proto.Unmarshal(data, event.ToEventProto()) + protoEvent := new(models.ProtoActualLRPInstanceRemovedEvent) + err := proto.Unmarshal(data, protoEvent) if err != nil { return nil, NewInvalidPayloadError(rawEvent.Name, err) } + event = protoEvent.FromProto() return event, nil } From eb4cb9891ce6bd9008d34be592b23dc04514eec5 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 3 Jun 2024 19:46:31 +0000 Subject: [PATCH 110/155] expectedEvent doesn't need to be converted to a Proto here --- events/event_source_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events/event_source_test.go b/events/event_source_test.go index 1d5a6d94..7ed8c352 100644 --- a/events/event_source_test.go +++ b/events/event_source_test.go @@ -358,7 +358,7 @@ var _ = Describe("EventSource", func() { taskRemovedEvent, ok := event.(*models.TaskRemovedEvent) Expect(ok).To(BeTrue()) - Expect(taskRemovedEvent).To(Equal(expectedEvent.ToProto())) + Expect(taskRemovedEvent).To(Equal(expectedEvent)) }) }) }) From 12204c6a940d572042a9d4909fee2396546325b1 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 3 Jun 2024 20:00:54 +0000 Subject: [PATCH 111/155] Updated loggregator to v9 From 12fe191d36f0c22601f12b49424754e1164763c3 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 3 Jun 2024 20:13:40 +0000 Subject: [PATCH 112/155] Naming convention changes due to new protobuf --- cmd/bbs/actual_lrp_test.go | 109 ++-- cmd/bbs/desired_lrp_test.go | 5 +- cmd/bbs/evacuation_test.go | 38 +- cmd/bbs/event_stream_test.go | 36 +- cmd/bbs/lrp_convergence_test.go | 32 +- db/sqldb/actual_lrp_db.go | 107 ++-- db/sqldb/actual_lrp_db_test.go | 498 +++++++++--------- db/sqldb/desired_lrp_db.go | 41 +- db/sqldb/desired_lrp_db_test.go | 21 +- db/sqldb/evacuation_db.go | 50 +- db/sqldb/evacuation_db_test.go | 47 +- db/sqldb/lrp_convergence.go | 30 +- db/sqldb/lrp_convergence_test.go | 4 +- db/sqldb/suspect_db_test.go | 37 +- db/sqldb/task_db.go | 7 +- db/sqldb/task_db_test.go | 10 +- .../actual_lrp_event_calculator_test.go | 6 +- 17 files changed, 573 insertions(+), 505 deletions(-) diff --git a/cmd/bbs/actual_lrp_test.go b/cmd/bbs/actual_lrp_test.go index 333bd137..fa870fe4 100644 --- a/cmd/bbs/actual_lrp_test.go +++ b/cmd/bbs/actual_lrp_test.go @@ -126,68 +126,70 @@ var _ = Describe("ActualLRP API", func() { crashingLRPKey = models.NewActualLRPKey(crashingProcessGuid, crashingIndex, crashingDomain) crashingLRPInstanceKey = models.NewActualLRPInstanceKey(crashingInstanceGuid, otherCellID) + routableTrue := true + routableFalse := false baseLRP = &models.ActualLRP{ - ActualLRPKey: baseLRPKey, - ActualLRPInstanceKey: baseLRPInstanceKey, - ActualLRPNetInfo: netInfo, + ActualLrpKey: baseLRPKey, + ActualLrpInstanceKey: baseLRPInstanceKey, + ActualLrpNetInfo: netInfo, State: models.ActualLRPStateRunning, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - baseLRP.SetRoutable(true) + baseLRP.SetRoutable(&routableTrue) evacuatingLRP = &models.ActualLRP{ - ActualLRPKey: evacuatingLRPKey, - ActualLRPInstanceKey: evacuatingLRPInstanceKey, - ActualLRPNetInfo: netInfo, + ActualLrpKey: evacuatingLRPKey, + ActualLrpInstanceKey: evacuatingLRPInstanceKey, + ActualLrpNetInfo: netInfo, State: models.ActualLRPStateRunning, Presence: models.ActualLRP_Evacuating, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - evacuatingLRP.SetRoutable(true) + evacuatingLRP.SetRoutable(&routableTrue) evacuatingInstanceLRP = &models.ActualLRP{ - ActualLRPKey: evacuatingLRPKey, + ActualLrpKey: evacuatingLRPKey, State: models.ActualLRPStateUnclaimed, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - evacuatingInstanceLRP.SetRoutable(true) + evacuatingInstanceLRP.SetRoutable(&routableTrue) otherLRP0 = &models.ActualLRP{ - ActualLRPKey: otherLRP0Key, - ActualLRPInstanceKey: otherLRPInstanceKey, - ActualLRPNetInfo: netInfo, + ActualLrpKey: otherLRP0Key, + ActualLrpInstanceKey: otherLRPInstanceKey, + ActualLrpNetInfo: netInfo, State: models.ActualLRPStateRunning, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - otherLRP0.SetRoutable(true) + otherLRP0.SetRoutable(&routableTrue) otherLRP1 = &models.ActualLRP{ - ActualLRPKey: otherLRP1Key, - ActualLRPInstanceKey: otherLRPInstanceKey, - ActualLRPNetInfo: netInfo, + ActualLrpKey: otherLRP1Key, + ActualLrpInstanceKey: otherLRPInstanceKey, + ActualLrpNetInfo: netInfo, State: models.ActualLRPStateRunning, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - otherLRP1.SetRoutable(false) + otherLRP1.SetRoutable(&routableFalse) unclaimedLRP = &models.ActualLRP{ - ActualLRPKey: unclaimedLRPKey, + ActualLrpKey: unclaimedLRPKey, State: models.ActualLRPStateUnclaimed, } - unclaimedLRP.SetRoutable(false) + unclaimedLRP.SetRoutable(&routableFalse) crashingLRP = &models.ActualLRP{ - ActualLRPKey: crashingLRPKey, + ActualLrpKey: crashingLRPKey, State: models.ActualLRPStateCrashed, CrashReason: "crash", CrashCount: 3, @@ -195,63 +197,63 @@ var _ = Describe("ActualLRP API", func() { MetricTags: metricTags, AvailabilityZone: availabilityZone, } - crashingLRP.SetRoutable(false) + crashingLRP.SetRoutable(&routableFalse) retiredLRP = &models.ActualLRP{ - ActualLRPKey: retiredLRPKey, + ActualLrpKey: retiredLRPKey, State: models.ActualLRPStateRunning, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - retiredLRP.SetRoutable(false) + retiredLRP.SetRoutable(&routableFalse) var err error - baseDesiredLRP := model_helpers.NewValidDesiredLRP(baseLRP.ProcessGuid) + baseDesiredLRP := model_helpers.NewValidDesiredLRP(baseLRP.ActualLrpKey.ProcessGuid) baseDesiredLRP.Domain = baseDomain err = client.DesireLRP(logger, "some-trace-id", baseDesiredLRP) Expect(err).NotTo(HaveOccurred()) - err = client.StartActualLRP(logger, "some-trace-id", &baseLRPKey, &baseLRPInstanceKey, &netInfo, internalRoutes, metricTags, baseLRP.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &baseLRPKey, &baseLRPInstanceKey, &netInfo, internalRoutes, metricTags, *baseLRP.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) - otherDesiredLRP := model_helpers.NewValidDesiredLRP(otherLRP0.ProcessGuid) + otherDesiredLRP := model_helpers.NewValidDesiredLRP(otherLRP0.ActualLrpKey.ProcessGuid) otherDesiredLRP.Domain = otherDomain Expect(client.DesireLRP(logger, "some-trace-id", otherDesiredLRP)).To(Succeed()) - err = client.StartActualLRP(logger, "some-trace-id", &otherLRP0Key, &otherLRPInstanceKey, &netInfo, internalRoutes, metricTags, otherLRP0.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &otherLRP0Key, &otherLRPInstanceKey, &netInfo, internalRoutes, metricTags, *otherLRP0.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) - err = client.StartActualLRP(logger, "some-trace-id", &otherLRP1Key, &otherLRPInstanceKey, &netInfo, internalRoutes, metricTags, otherLRP1.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &otherLRP1Key, &otherLRPInstanceKey, &netInfo, internalRoutes, metricTags, *otherLRP1.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) - evacuatingDesiredLRP := model_helpers.NewValidDesiredLRP(evacuatingLRP.ProcessGuid) + evacuatingDesiredLRP := model_helpers.NewValidDesiredLRP(evacuatingLRP.ActualLrpKey.ProcessGuid) evacuatingDesiredLRP.Domain = evacuatingDomain err = client.DesireLRP(logger, "some-trace-id", evacuatingDesiredLRP) Expect(err).NotTo(HaveOccurred()) - err = client.StartActualLRP(logger, "some-trace-id", &evacuatingLRPKey, &evacuatingLRPInstanceKey, &netInfo, internalRoutes, metricTags, evacuatingLRP.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &evacuatingLRPKey, &evacuatingLRPInstanceKey, &netInfo, internalRoutes, metricTags, *evacuatingLRP.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) _, err = client.EvacuateRunningActualLRP(logger, "some-trace-id", &evacuatingLRPKey, &evacuatingLRPInstanceKey, &netInfo, internalRoutes, metricTags, true, availabilityZone) Expect(err).NotTo(HaveOccurred()) - unclaimedDesiredLRP := model_helpers.NewValidDesiredLRP(unclaimedLRP.ProcessGuid) + unclaimedDesiredLRP := model_helpers.NewValidDesiredLRP(unclaimedLRP.ActualLrpKey.ProcessGuid) unclaimedDesiredLRP.Domain = unclaimedDomain err = client.DesireLRP(logger, "some-trace-id", unclaimedDesiredLRP) Expect(err).NotTo(HaveOccurred()) - crashingDesiredLRP := model_helpers.NewValidDesiredLRP(crashingLRP.ProcessGuid) + crashingDesiredLRP := model_helpers.NewValidDesiredLRP(crashingLRP.ActualLrpKey.ProcessGuid) crashingDesiredLRP.Domain = crashingDomain Expect(client.DesireLRP(logger, "some-trace-id", crashingDesiredLRP)).To(Succeed()) for i := 0; i < 3; i++ { - err = client.StartActualLRP(logger, "some-trace-id", &crashingLRPKey, &crashingLRPInstanceKey, &netInfo, internalRoutes, metricTags, crashingLRP.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &crashingLRPKey, &crashingLRPInstanceKey, &netInfo, internalRoutes, metricTags, *crashingLRP.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) err = client.CrashActualLRP(logger, "some-trace-id", &crashingLRPKey, &crashingLRPInstanceKey, "crash") Expect(err).NotTo(HaveOccurred()) } - retiredDesiredLRP := model_helpers.NewValidDesiredLRP(retiredLRP.ProcessGuid) + retiredDesiredLRP := model_helpers.NewValidDesiredLRP(retiredLRP.ActualLrpKey.ProcessGuid) retiredDesiredLRP.Domain = retiredDomain err = client.DesireLRP(logger, "some-trace-id", retiredDesiredLRP) Expect(err).NotTo(HaveOccurred()) - err = client.StartActualLRP(logger, "some-trace-id", &retiredLRPKey, &retiredLRPInstanceKey, &netInfo, internalRoutes, metricTags, retiredLRP.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &retiredLRPKey, &retiredLRPInstanceKey, &netInfo, internalRoutes, metricTags, *retiredLRP.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) retireErr := client.RetireActualLRP(logger, "some-trace-id", &retiredLRPKey) Expect(retireErr).NotTo(HaveOccurred()) @@ -378,22 +380,23 @@ var _ = Describe("ActualLRP API", func() { tlsNetInfo = models.NewActualLRPNetInfo("127.0.0.1", "10.10.10.10", models.ActualLRPNetInfo_PreferredAddressHost, models.NewPortMappingWithTLSProxy(8080, 80, 60042, 443)) tlsEnabledLRP = &models.ActualLRP{ - ActualLRPKey: tlsEnabledLRPKey, - ActualLRPInstanceKey: tlsEnabledLRPInstanceKey, - ActualLRPNetInfo: tlsNetInfo, + ActualLrpKey: tlsEnabledLRPKey, + ActualLrpInstanceKey: tlsEnabledLRPInstanceKey, + ActualLrpNetInfo: tlsNetInfo, State: models.ActualLRPStateRunning, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - tlsEnabledLRP.SetRoutable(true) + routable := true + tlsEnabledLRP.SetRoutable(&routable) - tlsEnabledDesiredLRP := model_helpers.NewValidDesiredLRP(tlsEnabledLRP.ProcessGuid) + tlsEnabledDesiredLRP := model_helpers.NewValidDesiredLRP(tlsEnabledLRP.ActualLrpKey.ProcessGuid) tlsEnabledDesiredLRP.Domain = tlsEnabledDomain err := client.DesireLRP(logger, "some-trace-id", tlsEnabledDesiredLRP) Expect(err).NotTo(HaveOccurred()) - err = client.StartActualLRP(logger, "some-trace-id", &tlsEnabledLRPKey, &tlsEnabledLRPInstanceKey, &tlsNetInfo, internalRoutes, metricTags, tlsEnabledLRP.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &tlsEnabledLRPKey, &tlsEnabledLRPInstanceKey, &tlsNetInfo, internalRoutes, metricTags, *tlsEnabledLRP.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -477,22 +480,23 @@ var _ = Describe("ActualLRP API", func() { tlsNetInfo = models.NewActualLRPNetInfo("127.0.0.1", "10.10.10.10", models.ActualLRPNetInfo_PreferredAddressHost, models.NewPortMappingWithTLSProxy(8080, 80, 60042, 443)) tlsEnabledLRP = &models.ActualLRP{ - ActualLRPKey: tlsEnabledLRPKey, - ActualLRPInstanceKey: tlsEnabledLRPInstanceKey, - ActualLRPNetInfo: tlsNetInfo, + ActualLrpKey: tlsEnabledLRPKey, + ActualLrpInstanceKey: tlsEnabledLRPInstanceKey, + ActualLrpNetInfo: tlsNetInfo, State: models.ActualLRPStateRunning, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, } - tlsEnabledLRP.SetRoutable(true) + routable := true + tlsEnabledLRP.SetRoutable(&routable) - tlsEnabledDesiredLRP := model_helpers.NewValidDesiredLRP(tlsEnabledLRP.ProcessGuid) + tlsEnabledDesiredLRP := model_helpers.NewValidDesiredLRP(tlsEnabledLRP.ActualLrpKey.ProcessGuid) tlsEnabledDesiredLRP.Domain = tlsEnabledDomain err := client.DesireLRP(logger, "some-trace-id", tlsEnabledDesiredLRP) Expect(err).NotTo(HaveOccurred()) - err = client.StartActualLRP(logger, "some-trace-id", &tlsEnabledLRPKey, &tlsEnabledLRPInstanceKey, &tlsNetInfo, internalRoutes, metricTags, tlsEnabledLRP.GetRoutable(), availabilityZone) + err = client.StartActualLRP(logger, "some-trace-id", &tlsEnabledLRPKey, &tlsEnabledLRPInstanceKey, &tlsNetInfo, internalRoutes, metricTags, *tlsEnabledLRP.GetRoutable(), availabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -564,7 +568,7 @@ var _ = Describe("ActualLRP API", func() { expectedActualLRP := *unclaimedLRP expectedActualLRP.State = models.ActualLRPStateClaimed - expectedActualLRP.ActualLRPInstanceKey = instanceKey + expectedActualLRP.ActualLrpInstanceKey = instanceKey fetchedActualLRPGroup, err := client.ActualLRPs(logger, "some-trace-id", models.ActualLRPFilter{ProcessGuid: unclaimedProcessGuid, Index: &unclaimedIndex}) Expect(err).NotTo(HaveOccurred()) @@ -592,11 +596,12 @@ var _ = Describe("ActualLRP API", func() { expectedActualLRP := *unclaimedLRP expectedActualLRP.State = models.ActualLRPStateRunning - expectedActualLRP.ActualLRPInstanceKey = instanceKey - expectedActualLRP.ActualLRPNetInfo = netInfo + expectedActualLRP.ActualLrpInstanceKey = instanceKey + expectedActualLRP.ActualLrpNetInfo = netInfo expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(true) + routable := true + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone fetchedActualLRPGroup, err := client.ActualLRPs(logger, "some-trace-id", models.ActualLRPFilter{ProcessGuid: unclaimedProcessGuid, Index: &unclaimedIndex}) diff --git a/cmd/bbs/desired_lrp_test.go b/cmd/bbs/desired_lrp_test.go index f88b493e..77aaeb6f 100644 --- a/cmd/bbs/desired_lrp_test.go +++ b/cmd/bbs/desired_lrp_test.go @@ -202,7 +202,7 @@ var _ = Describe("DesiredLRP API", func() { JustBeforeEach(func() { expectedSchedulingInfo = desiredLRPs["domain-1"][0].DesiredLRPSchedulingInfo() - schedulingInfoByProcessGuid, getErr = client.DesiredLRPSchedulingInfoByProcessGuid(logger, "some-trace-id", expectedSchedulingInfo.GetProcessGuid()) + schedulingInfoByProcessGuid, getErr = client.DesiredLRPSchedulingInfoByProcessGuid(logger, "some-trace-id", expectedSchedulingInfo.DesiredLrpKey.GetProcessGuid()) schedulingInfoByProcessGuid.ModificationTag.Epoch = "epoch" }) @@ -362,7 +362,8 @@ var _ = Describe("DesiredLRP API", func() { err := client.DesireLRP(logger, "some-trace-id", desiredLRP) Expect(err).NotTo(HaveOccurred()) update := &models.DesiredLRPUpdate{} - update.SetInstances(3) + instances := int32(3) + update.SetInstances(&instances) updateErr = client.UpdateDesiredLRP(logger, "some-trace-id", "super-lrp", update) }) diff --git a/cmd/bbs/evacuation_test.go b/cmd/bbs/evacuation_test.go index 8b774942..81d1c3e0 100644 --- a/cmd/bbs/evacuation_test.go +++ b/cmd/bbs/evacuation_test.go @@ -20,30 +20,30 @@ var _ = Describe("Evacuation API", func() { actual = model_helpers.NewValidActualLRP("some-process-guid", 1) actual.State = models.ActualLRPStateRunning - desiredLRP := model_helpers.NewValidDesiredLRP(actual.ProcessGuid) + desiredLRP := model_helpers.NewValidDesiredLRP(actual.ActualLrpKey.ProcessGuid) desiredLRP.Instances = 2 Expect(client.DesireLRP(logger, "some-trace-id", desiredLRP)).To(Succeed()) - Expect(client.ClaimActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey)).To(Succeed()) - _, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ProcessGuid, int(actual.Index)) + Expect(client.ClaimActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey)).To(Succeed()) + _, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ActualLrpKey.ProcessGuid, int(actual.ActualLrpKey.Index)) Expect(err).NotTo(HaveOccurred()) }) Describe("RemoveEvacuatingActualLRP", func() { Context("when the lrp is running", func() { BeforeEach(func() { - Expect(client.StartActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey, &actual.ActualLRPNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "")).To(Succeed()) + Expect(client.StartActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey, &actual.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "")).To(Succeed()) }) It("removes the evacuating actual_lrp", func() { - keepContainer, err := client.EvacuateRunningActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey, &actual.ActualLRPNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") + keepContainer, err := client.EvacuateRunningActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey, &actual.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") Expect(keepContainer).To(BeTrue()) Expect(err).NotTo(HaveOccurred()) - err = client.RemoveEvacuatingActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey) + err = client.RemoveEvacuatingActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) - group, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ProcessGuid, int(actual.Index)) + group, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ActualLrpKey.ProcessGuid, int(actual.ActualLrpKey.Index)) Expect(err).ToNot(HaveOccurred()) Expect(group.Evacuating).To(BeNil()) }) @@ -69,7 +69,7 @@ var _ = Describe("Evacuation API", func() { } }() - err = client.RemoveEvacuatingActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey) + err = client.RemoveEvacuatingActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey) Expect(err).To(Equal(models.ErrResourceNotFound)) Consistently(ch).ShouldNot(Receive()) }) @@ -82,11 +82,11 @@ var _ = Describe("Evacuation API", func() { Describe("EvacuateClaimedActualLRP", func() { It("removes the claimed actual_lrp without evacuating", func() { - keepContainer, evacuateErr := client.EvacuateClaimedActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey) + keepContainer, evacuateErr := client.EvacuateClaimedActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey) Expect(keepContainer).To(BeFalse()) Expect(evacuateErr).NotTo(HaveOccurred()) - actualLRPGroup, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ProcessGuid, int(actual.Index)) + actualLRPGroup, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ActualLrpKey.ProcessGuid, int(actual.ActualLrpKey.Index)) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPGroup.Evacuating).To(BeNil()) Expect(actualLRPGroup.Instance).NotTo(BeNil()) @@ -96,16 +96,16 @@ var _ = Describe("Evacuation API", func() { Describe("EvacuateRunningActualLRP", func() { BeforeEach(func() { - err := client.StartActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey, &actual.ActualLRPNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") + err := client.StartActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey, &actual.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") Expect(err).NotTo(HaveOccurred()) }) It("runs the evacuating ActualLRP and unclaims the instance ActualLRP", func() { - keepContainer, err := client.EvacuateRunningActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey, &actual.ActualLRPNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") + keepContainer, err := client.EvacuateRunningActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey, &actual.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") Expect(keepContainer).To(BeTrue()) Expect(err).NotTo(HaveOccurred()) - actualLRPGroup, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ProcessGuid, int(actual.Index)) + actualLRPGroup, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ActualLrpKey.ProcessGuid, int(actual.ActualLrpKey.Index)) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPGroup.Evacuating).NotTo(BeNil()) Expect(actualLRPGroup.Instance).NotTo(BeNil()) @@ -116,31 +116,31 @@ var _ = Describe("Evacuation API", func() { Describe("EvacuateStoppedActualLRP", func() { BeforeEach(func() { - err := client.StartActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey, &actual.ActualLRPNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") + err := client.StartActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey, &actual.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") Expect(err).NotTo(HaveOccurred()) }) It("deletes the container and both actualLRPs", func() { - keepContainer, err := client.EvacuateStoppedActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey) + keepContainer, err := client.EvacuateStoppedActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey) Expect(keepContainer).To(BeFalse()) Expect(err).NotTo(HaveOccurred()) - _, err = client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ProcessGuid, int(actual.Index)) + _, err = client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ActualLrpKey.ProcessGuid, int(actual.ActualLrpKey.Index)) Expect(err).To(Equal(models.ErrResourceNotFound)) }) }) Describe("EvacuateCrashedActualLRP", func() { BeforeEach(func() { - err := client.StartActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey, &actual.ActualLRPNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") + err := client.StartActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey, &actual.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") Expect(err).NotTo(HaveOccurred()) }) It("removes the crashed evacuating LRP and unclaims the instance ActualLRP", func() { - keepContainer, evacuateErr := client.EvacuateCrashedActualLRP(logger, "some-trace-id", &actual.ActualLRPKey, &actual.ActualLRPInstanceKey, "some-reason") + keepContainer, evacuateErr := client.EvacuateCrashedActualLRP(logger, "some-trace-id", &actual.ActualLrpKey, &actual.ActualLrpInstanceKey, "some-reason") Expect(keepContainer).Should(BeFalse()) Expect(evacuateErr).NotTo(HaveOccurred()) - actualLRPGroup, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ProcessGuid, int(actual.Index)) + actualLRPGroup, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", actual.ActualLrpKey.ProcessGuid, int(actual.ActualLrpKey.Index)) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPGroup.Evacuating).To(BeNil()) Expect(actualLRPGroup.Instance).ToNot(BeNil()) diff --git a/cmd/bbs/event_stream_test.go b/cmd/bbs/event_stream_test.go index 3dd562ed..c5cf2947 100644 --- a/cmd/bbs/event_stream_test.go +++ b/cmd/bbs/event_stream_test.go @@ -136,7 +136,7 @@ var _ = Describe("Events API", func() { getEvacuatingLRPFromList := func(lrps []*models.ActualLRP) models.ActualLRPInstanceKey { for _, lrp := range lrps { if lrp.Presence == models.ActualLRP_Evacuating { - return lrp.ActualLRPInstanceKey + return lrp.ActualLrpInstanceKey } } return models.ActualLRPInstanceKey{} @@ -184,7 +184,7 @@ var _ = Describe("Events API", func() { var ce *models.ActualLRPInstanceChangedEvent Eventually(eventChannel).Should(Receive(&ce)) - Expect(ce.ActualLRPInstanceKey).To(Equal(actualLRPGroup[0].ActualLRPInstanceKey)) + Expect(ce.ActualLrpInstanceKey).To(Equal(actualLRPGroup[0].ActualLrpInstanceKey)) Expect(ce.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(ce.After.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(ce.After.PlacementError).ToNot(Equal("")) @@ -197,7 +197,7 @@ var _ = Describe("Events API", func() { Expect(err).NotTo(HaveOccurred()) Eventually(eventChannel).Should(Receive(&ce)) - Expect(ce.ActualLRPInstanceKey).To(Equal(actualLRPGroup[0].ActualLRPInstanceKey)) + Expect(ce.ActualLrpInstanceKey).To(Equal(actualLRPGroup[0].ActualLrpInstanceKey)) Expect(ce.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(ce.After.State).To(Equal(models.ActualLRPStateClaimed)) @@ -217,20 +217,20 @@ var _ = Describe("Events API", func() { evacuatingLRP := getEvacuatingLRPFromList(evacuatingLRPGroup) Eventually(eventChannel).Should(Receive(&ce)) - Expect(ce.ActualLRPInstanceKey).To(Equal(evacuatingLRP)) + Expect(ce.ActualLrpInstanceKey).To(Equal(evacuatingLRP)) Expect(ce.Before.Presence).To(Equal(models.ActualLRP_Ordinary)) Expect(ce.After.Presence).To(Equal(models.ActualLRP_Evacuating)) Eventually(eventChannel).Should(Receive(&created)) - Expect(created.ActualLrp.ActualLRPKey).To(Equal(actualLRPGroup[0].ActualLRPKey)) + Expect(created.ActualLrp.ActualLrpKey).To(Equal(actualLRPGroup[0].ActualLrpKey)) By("starting and then evacuating the ActualLRP on another cell") err = client.StartActualLRP(logger, "some-trace-id", &key, &newInstanceKey, &netInfo, []*models.ActualLRPInternalRoute{}, map[string]string{}, false, "") Expect(err).NotTo(HaveOccurred()) Eventually(eventChannel).Should(Receive(&ce)) - Expect(ce.ActualLRPKey).To(Equal(actualLRPGroup[0].ActualLRPKey)) - Expect(ce.ActualLRPInstanceKey.CellId).To(Equal("other-cell-id")) + Expect(ce.ActualLrpKey).To(Equal(actualLRPGroup[0].ActualLrpKey)) + Expect(ce.ActualLrpInstanceKey.CellId).To(Equal("other-cell-id")) Expect(ce.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(ce.After.State).To(Equal(models.ActualLRPStateRunning)) Expect(ce.After.Presence).To(Equal(models.ActualLRP_Ordinary)) @@ -245,13 +245,13 @@ var _ = Describe("Events API", func() { Expect(request.RequestURI).To(Equal("/v1/lrps")) Eventually(eventChannel).Should(Receive(&ce)) - Expect(ce.ActualLRPKey).To(Equal(actualLRPGroup[0].ActualLRPKey)) - Expect(ce.ActualLRPInstanceKey.CellId).To(Equal("other-cell-id")) + Expect(ce.ActualLrpKey).To(Equal(actualLRPGroup[0].ActualLrpKey)) + Expect(ce.ActualLrpInstanceKey.CellId).To(Equal("other-cell-id")) Expect(ce.After.State).To(Equal(models.ActualLRPStateRunning)) Expect(ce.After.Presence).To(Equal(models.ActualLRP_Evacuating)) Eventually(eventChannel).Should(Receive(&created)) - Expect(ce.ActualLRPKey).To(Equal(actualLRPGroup[0].ActualLRPKey)) + Expect(ce.ActualLrpKey).To(Equal(actualLRPGroup[0].ActualLrpKey)) By("removing the new ActualLRP") actualLRPGroup, err = client.ActualLRPs(logger, "some-trace-id", models.ActualLRPFilter{ProcessGuid: desiredLRP.ProcessGuid, Index: &index0}) @@ -262,8 +262,8 @@ var _ = Describe("Events API", func() { var re *models.ActualLRPInstanceRemovedEvent Eventually(eventChannel).Should(Receive(&re)) - Expect(re.ActualLrp.ActualLRPKey).To(Equal(actualLRPGroup[0].ActualLRPKey)) - Expect(re.ActualLrp.ActualLRPInstanceKey.CellId).To(Equal("")) + Expect(re.ActualLrp.ActualLrpKey).To(Equal(actualLRPGroup[0].ActualLrpKey)) + Expect(re.ActualLrp.ActualLrpInstanceKey.CellId).To(Equal("")) Expect(re.ActualLrp.Presence).To(Equal(models.ActualLRP_Ordinary)) By("removing the evacuating ActualLRP") @@ -271,8 +271,8 @@ var _ = Describe("Events API", func() { Expect(err).NotTo(HaveOccurred()) Eventually(eventChannel).Should(Receive(&re)) - Expect(re.ActualLrp.ActualLRPKey).To(Equal(actualLRPGroup[0].ActualLRPKey)) - Expect(re.ActualLrp.ActualLRPInstanceKey.CellId).To(Equal("other-cell-id")) + Expect(re.ActualLrp.ActualLrpKey).To(Equal(actualLRPGroup[0].ActualLrpKey)) + Expect(re.ActualLrp.ActualLrpInstanceKey.CellId).To(Equal("other-cell-id")) Expect(re.ActualLrp.Presence).To(Equal(models.ActualLRP_Evacuating)) }) }) @@ -316,11 +316,11 @@ var _ = Describe("Events API", func() { var e *models.ActualLRPInstanceChangedEvent Eventually(eventChannel).Should(Receive(&e)) - Expect(e.ActualLRPInstanceKey).To(BeEquivalentTo(actualLRPGroup[0].ActualLRPInstanceKey)) + Expect(e.ActualLrpInstanceKey).To(BeEquivalentTo(actualLRPGroup[0].ActualLrpInstanceKey)) Expect(e.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(e.After.State).To(Equal(models.ActualLRPStateClaimed)) - Expect(actualLRPGroup[0].GetCellId()).To(Equal(cellID)) + Expect(actualLRPGroup[0].ActualLrpInstanceKey.GetCellId()).To(Equal(cellID)) } claimLRP() @@ -345,8 +345,8 @@ var _ = Describe("Events API", func() { Eventually(eventChannel).Should(Receive(&event)) actualLRPRemovedEvent := event.(*models.ActualLRPInstanceRemovedEvent) - Expect(actualLRPRemovedEvent.ActualLrp.ActualLRPInstanceKey).To(Equal(instanceKey)) - Expect(actualLRPRemovedEvent.ActualLrp.ActualLRPInstanceKey.CellId).To(Equal(cellID)) + Expect(actualLRPRemovedEvent.ActualLrp.ActualLrpInstanceKey).To(Equal(instanceKey)) + Expect(actualLRPRemovedEvent.ActualLrp.ActualLrpInstanceKey.CellId).To(Equal(cellID)) }) It("does not receive events from the other cells", func() { diff --git a/cmd/bbs/lrp_convergence_test.go b/cmd/bbs/lrp_convergence_test.go index 2a008885..647f3dc8 100644 --- a/cmd/bbs/lrp_convergence_test.go +++ b/cmd/bbs/lrp_convergence_test.go @@ -186,7 +186,7 @@ var _ = Describe("Convergence API", func() { group, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", processGuid, 0) Expect(err).NotTo(HaveOccurred()) lrp = group.Instance - return lrp.InstanceGuid + return lrp.ActualLrpInstanceKey.InstanceGuid }).Should(Equal("ig-2")) Expect(lrp.Presence).To(Equal(models.ActualLRP_Ordinary)) }) @@ -196,7 +196,7 @@ var _ = Describe("Convergence API", func() { var changedEvent *models.ActualLRPInstanceChangedEvent Eventually(eventCh).Should(Receive(&changedEvent)) - Expect(changedEvent.ActualLRPInstanceKey.InstanceGuid).To(Equal("ig-1")) + Expect(changedEvent.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-1")) Expect(changedEvent.Before.State).To(Equal(models.ActualLRPStateRunning)) Expect(changedEvent.Before.Presence).To(Equal(models.ActualLRP_Ordinary)) Expect(changedEvent.After.State).To(Equal(models.ActualLRPStateRunning)) @@ -205,8 +205,8 @@ var _ = Describe("Convergence API", func() { var createdEvent *models.ActualLRPInstanceCreatedEvent Eventually(eventCh).Should(Receive(&createdEvent)) - Expect(createdEvent.ActualLrp.Index).To(Equal(changedEvent.ActualLRPKey.Index)) - Expect(createdEvent.ActualLrp.InstanceGuid).To(Equal("")) + Expect(createdEvent.ActualLrp.ActualLrpKey.Index).To(Equal(changedEvent.ActualLrpKey.Index)) + Expect(createdEvent.ActualLrp.ActualLrpInstanceKey.InstanceGuid).To(Equal("")) Expect(createdEvent.ActualLrp.Presence).To(Equal(models.ActualLRP_Ordinary)) Expect(createdEvent.ActualLrp.State).To(Equal(models.ActualLRPStateUnclaimed)) }) @@ -265,7 +265,7 @@ var _ = Describe("Convergence API", func() { var e *models.ActualLRPInstanceChangedEvent Eventually(eventCh).Should(Receive(&e)) - Expect(e.ActualLRPInstanceKey.InstanceGuid).To(Equal("ig-2")) + Expect(e.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-2")) Expect(e.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(e.Before.Presence).To(Equal(models.ActualLRP_Ordinary)) Expect(e.After.State).To(Equal(models.ActualLRPStateClaimed)) @@ -327,7 +327,7 @@ var _ = Describe("Convergence API", func() { eventCh := streamEvents(events) var e *models.ActualLRPInstanceChangedEvent Eventually(eventCh, 5*time.Second).Should(Receive(&e)) - Expect(e.ProcessGuid).To(Equal("some-process-guid")) + Expect(e.ActualLrpKey.ProcessGuid).To(Equal("some-process-guid")) Expect(e.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(e.Before.Presence).To(Equal(models.ActualLRP_Ordinary)) Expect(e.After.State).To(Equal(models.ActualLRPStateUnclaimed)) @@ -353,7 +353,7 @@ var _ = Describe("Convergence API", func() { eventCh := streamEvents(events) var e *models.ActualLRPInstanceChangedEvent Eventually(eventCh, 5*time.Second).Should(Receive(&e)) - Expect(e.ActualLRPInstanceKey.InstanceGuid).To(Equal("ig-2")) + Expect(e.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-2")) Expect(e.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(e.After.State).To(Equal(models.ActualLRPStateClaimed)) }) @@ -385,7 +385,7 @@ var _ = Describe("Convergence API", func() { var e *models.ActualLRPInstanceChangedEvent Eventually(eventCh).Should(Receive(&e)) - Expect(e.ActualLRPInstanceKey.InstanceGuid).To(Equal("ig-2")) + Expect(e.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-2")) Expect(e.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(e.After.State).To(Equal(models.ActualLRPStateRunning)) }) @@ -396,7 +396,7 @@ var _ = Describe("Convergence API", func() { var e *models.ActualLRPInstanceRemovedEvent Eventually(eventCh, 2*time.Second).Should(Receive(&e)) - Expect(e.ActualLrp.InstanceGuid).To(Equal("ig-1")) + Expect(e.ActualLrp.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-1")) Expect(e.ActualLrp.Presence).To(Equal(models.ActualLRP_Suspect)) }) @@ -466,7 +466,7 @@ var _ = Describe("Convergence API", func() { var e *models.ActualLRPInstanceRemovedEvent Eventually(eventCh, 2*time.Second).Should(Receive(&e)) - Expect(e.ActualLrp.InstanceGuid).To(Equal("ig-1")) + Expect(e.ActualLrp.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-1")) Expect(e.ActualLrp.Presence).To(Equal(models.ActualLRP_Suspect)) }) @@ -511,7 +511,7 @@ var _ = Describe("Convergence API", func() { group, err := client.ActualLRPGroupByProcessGuidAndIndex(logger, "some-trace-id", processGuid, 0) Expect(err).NotTo(HaveOccurred()) Expect(group.Evacuating.Presence).To(Equal(models.ActualLRP_Evacuating)) - Expect(group.Evacuating.ActualLRPInstanceKey).To(Equal(*suspectLRPInstanceKey)) + Expect(group.Evacuating.ActualLrpInstanceKey).To(Equal(*suspectLRPInstanceKey)) }) It("removes the suspect LRP", func() { @@ -526,7 +526,7 @@ var _ = Describe("Convergence API", func() { var ce *models.ActualLRPInstanceChangedEvent Eventually(eventCh, 2*time.Second).Should(Receive(&ce)) - Expect(ce.ActualLRPInstanceKey.InstanceGuid).To(Equal("ig-2")) + Expect(ce.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-2")) Expect(ce.Before.State).To(Equal(models.ActualLRPStateUnclaimed)) Expect(ce.After.State).To(Equal(models.ActualLRPStateClaimed)) Expect(ce.Before.Presence).To(Equal(models.ActualLRP_Ordinary)) @@ -535,7 +535,7 @@ var _ = Describe("Convergence API", func() { var ce2 *models.ActualLRPInstanceChangedEvent Eventually(eventCh, 2*time.Second).Should(Receive(&ce2)) - Expect(ce2.ActualLRPInstanceKey.InstanceGuid).To(Equal("ig-1")) + Expect(ce2.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-1")) Expect(ce2.Before.State).To(Equal(models.ActualLRPStateRunning)) Expect(ce2.After.State).To(Equal(models.ActualLRPStateRunning)) Expect(ce2.Before.Presence).To(Equal(models.ActualLRP_Suspect)) @@ -575,7 +575,7 @@ var _ = Describe("Convergence API", func() { var e *models.ActualLRPInstanceRemovedEvent Eventually(eventCh).Should(Receive(&e)) - Expect(e.ActualLrp.ActualLRPInstanceKey).ToNot(Equal(replacementLRPInstanceKey)) + Expect(e.ActualLrp.ActualLrpInstanceKey).ToNot(Equal(replacementLRPInstanceKey)) }) }) @@ -597,7 +597,7 @@ var _ = Describe("Convergence API", func() { var re *models.ActualLRPInstanceRemovedEvent Eventually(eventCh, 2*time.Second).Should(Receive(&re)) - Expect(re.ActualLrp.InstanceGuid).To(Equal("ig-1")) + Expect(re.ActualLrp.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-1")) Expect(re.ActualLrp.Presence).To(Equal(models.ActualLRP_Suspect)) }) }) @@ -620,7 +620,7 @@ var _ = Describe("Convergence API", func() { var re *models.ActualLRPInstanceRemovedEvent Eventually(eventCh, 2*time.Second).Should(Receive(&re)) - Expect(re.ActualLrp.InstanceGuid).To(Equal("ig-1")) + Expect(re.ActualLrp.ActualLrpInstanceKey.InstanceGuid).To(Equal("ig-1")) Expect(re.ActualLrp.Presence).To(Equal(models.ActualLRP_Suspect)) }) }) diff --git a/db/sqldb/actual_lrp_db.go b/db/sqldb/actual_lrp_db.go index 64d9012e..6fe476ac 100644 --- a/db/sqldb/actual_lrp_db.go +++ b/db/sqldb/actual_lrp_db.go @@ -113,7 +113,7 @@ func (db *SQLDB) CreateUnclaimedActualLRP(ctx context.Context, logger lager.Logg return nil, models.ErrGUIDGeneration } - netInfoData, err := db.serializeModel(logger, &models.ActualLRPNetInfo{}) + netInfoData, err := db.serializeModel(logger, &models.ProtoActualLRPNetInfo{}) if err != nil { logger.Error("failed-to-serialize-net-info", err) return nil, err @@ -157,14 +157,15 @@ func (db *SQLDB) CreateUnclaimedActualLRP(ctx context.Context, logger lager.Logg return nil, err } lrp := &models.ActualLRP{ - ActualLRPKey: *key, + ActualLrpKey: *key, State: models.ActualLRPStateUnclaimed, Since: now, ModificationTag: models.ModificationTag{Epoch: guid, Index: 0}, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, } - lrp.SetRoutable(false) + routable := false + lrp.SetRoutable(&routable) return lrp, nil } @@ -195,11 +196,11 @@ func (db *SQLDB) UnclaimActualLRP(ctx context.Context, logger lager.Logger, key now := db.clock.Now().UnixNano() actualLRP.ModificationTag.Increment() actualLRP.State = models.ActualLRPStateUnclaimed - actualLRP.ActualLRPInstanceKey.CellId = "" - actualLRP.ActualLRPInstanceKey.InstanceGuid = "" + actualLRP.ActualLrpInstanceKey.CellId = "" + actualLRP.ActualLrpInstanceKey.InstanceGuid = "" actualLRP.Since = now - actualLRP.ActualLRPNetInfo = models.ActualLRPNetInfo{} - netInfoData, err := db.serializeModel(logger, &models.ActualLRPNetInfo{}) + actualLRP.ActualLrpNetInfo = models.ActualLRPNetInfo{} + netInfoData, err := db.serializeModel(logger, &models.ProtoActualLRPNetInfo{}) if err != nil { logger.Error("failed-to-serialize-net-info", err) return err @@ -208,8 +209,8 @@ func (db *SQLDB) UnclaimActualLRP(ctx context.Context, logger lager.Logger, key _, err = db.update(ctx, logger, tx, actualLRPsTable, helpers.SQLAttributes{ "state": actualLRP.State, - "cell_id": actualLRP.CellId, - "instance_guid": actualLRP.InstanceGuid, + "cell_id": actualLRP.ActualLrpInstanceKey.CellId, + "instance_guid": actualLRP.ActualLrpInstanceKey.InstanceGuid, "modification_tag_index": actualLRP.ModificationTag.Index, "since": actualLRP.Since, "net_info": netInfoData, @@ -244,22 +245,22 @@ func (db *SQLDB) ClaimActualLRP(ctx context.Context, logger lager.Logger, proces } beforeActualLRP = *actualLRP - if !actualLRP.AllowsTransitionTo(&actualLRP.ActualLRPKey, instanceKey, models.ActualLRPStateClaimed) { - logger.Error("cannot-transition-to-claimed", nil, lager.Data{"from_state": actualLRP.State, "same_instance_key": actualLRP.ActualLRPInstanceKey.Equal(instanceKey)}) + if !actualLRP.AllowsTransitionTo(&actualLRP.ActualLrpKey, instanceKey, models.ActualLRPStateClaimed) { + logger.Error("cannot-transition-to-claimed", nil, lager.Data{"from_state": actualLRP.State, "same_instance_key": actualLRP.ActualLrpInstanceKey.Equal(instanceKey)}) return models.ErrActualLRPCannotBeClaimed } - if actualLRP.State == models.ActualLRPStateClaimed && actualLRP.ActualLRPInstanceKey.Equal(instanceKey) { + if actualLRP.State == models.ActualLRPStateClaimed && actualLRP.ActualLrpInstanceKey.Equal(instanceKey) { return nil } actualLRP.ModificationTag.Increment() actualLRP.State = models.ActualLRPStateClaimed - actualLRP.ActualLRPInstanceKey = *instanceKey + actualLRP.ActualLrpInstanceKey = *instanceKey actualLRP.PlacementError = "" - actualLRP.ActualLRPNetInfo = models.ActualLRPNetInfo{} + actualLRP.ActualLrpNetInfo = models.ActualLRPNetInfo{} actualLRP.Since = db.clock.Now().UnixNano() - netInfoData, err := db.serializeModel(logger, &models.ActualLRPNetInfo{}) + netInfoData, err := db.serializeModel(logger, &models.ProtoActualLRPNetInfo{}) if err != nil { logger.Error("failed-to-serialize-net-info", err) return err @@ -268,8 +269,8 @@ func (db *SQLDB) ClaimActualLRP(ctx context.Context, logger lager.Logger, proces _, err = db.update(ctx, logger, tx, actualLRPsTable, helpers.SQLAttributes{ "state": actualLRP.State, - "cell_id": actualLRP.CellId, - "instance_guid": actualLRP.InstanceGuid, + "cell_id": actualLRP.ActualLrpInstanceKey.CellId, + "instance_guid": actualLRP.ActualLrpInstanceKey.InstanceGuid, "modification_tag_index": actualLRP.ModificationTag.Index, "placement_error": actualLRP.PlacementError, "since": actualLRP.Since, @@ -322,12 +323,12 @@ func (db *SQLDB) StartActualLRP( beforeActualLRP = *actualLRP - if actualLRP.ActualLRPKey.Equal(key) && - actualLRP.ActualLRPInstanceKey.Equal(instanceKey) && - actualLRP.ActualLRPNetInfo.Equal(netInfo) && + if actualLRP.ActualLrpKey.Equal(key) && + actualLRP.ActualLrpInstanceKey.Equal(instanceKey) && + actualLRP.ActualLrpNetInfo.Equal(netInfo) && reflect.DeepEqual(actualLRP.ActualLrpInternalRoutes, internalRoutes) && reflect.DeepEqual(actualLRP.MetricTags, metricTags) && - actualLRP.GetRoutable() == routable && + *actualLRP.GetRoutable() == routable && actualLRP.AvailabilityZone == availabilityZone && actualLRP.State == models.ActualLRPStateRunning { logger.Debug("nothing-to-change") @@ -341,8 +342,8 @@ func (db *SQLDB) StartActualLRP( now := db.clock.Now().UnixNano() - actualLRP.ActualLRPInstanceKey = *instanceKey - actualLRP.ActualLRPNetInfo = *netInfo + actualLRP.ActualLrpInstanceKey = *instanceKey + actualLRP.ActualLrpNetInfo = *netInfo actualLRP.ActualLrpInternalRoutes = internalRoutes actualLRP.MetricTags = metricTags actualLRP.AvailabilityZone = availabilityZone @@ -350,9 +351,9 @@ func (db *SQLDB) StartActualLRP( actualLRP.Since = now actualLRP.ModificationTag.Increment() actualLRP.PlacementError = "" - actualLRP.SetRoutable(routable) + actualLRP.SetRoutable(&routable) - netInfoData, err := db.serializeModel(logger, &actualLRP.ActualLRPNetInfo) + netInfoData, err := db.serializeModel(logger, actualLRP.ActualLrpNetInfo.ToProto()) if err != nil { logger.Error("failed-to-serialize-net-info", err) return err @@ -373,8 +374,8 @@ func (db *SQLDB) StartActualLRP( _, err = db.update(ctx, logger, tx, actualLRPsTable, helpers.SQLAttributes{ "state": actualLRP.State, - "cell_id": actualLRP.CellId, - "instance_guid": actualLRP.InstanceGuid, + "cell_id": actualLRP.ActualLrpInstanceKey.CellId, + "instance_guid": actualLRP.ActualLrpInstanceKey.InstanceGuid, "modification_tag_index": actualLRP.ModificationTag.Index, "placement_error": actualLRP.PlacementError, "since": actualLRP.Since, @@ -433,20 +434,20 @@ func (db *SQLDB) CrashActualLRP(ctx context.Context, logger lager.Logger, key *m newCrashCount = actualLRP.CrashCount + 1 } - if !actualLRP.AllowsTransitionTo(&actualLRP.ActualLRPKey, instanceKey, models.ActualLRPStateCrashed) { - logger.Error("failed-to-transition-to-crashed", nil, lager.Data{"from_state": actualLRP.State, "same_instance_key": actualLRP.ActualLRPInstanceKey.Equal(instanceKey)}) + if !actualLRP.AllowsTransitionTo(&actualLRP.ActualLrpKey, instanceKey, models.ActualLRPStateCrashed) { + logger.Error("failed-to-transition-to-crashed", nil, lager.Data{"from_state": actualLRP.State, "same_instance_key": actualLRP.ActualLrpInstanceKey.Equal(instanceKey)}) return models.ErrActualLRPCannotBeCrashed } actualLRP.ModificationTag.Increment() actualLRP.State = models.ActualLRPStateCrashed - actualLRP.ActualLRPInstanceKey.InstanceGuid = "" - actualLRP.ActualLRPInstanceKey.CellId = "" - actualLRP.ActualLRPNetInfo = models.ActualLRPNetInfo{} + actualLRP.ActualLrpInstanceKey.InstanceGuid = "" + actualLRP.ActualLrpInstanceKey.CellId = "" + actualLRP.ActualLrpNetInfo = models.ActualLRPNetInfo{} actualLRP.CrashCount = newCrashCount actualLRP.CrashReason = crashReason - netInfoData, err := db.serializeModel(logger, &actualLRP.ActualLRPNetInfo) + netInfoData, err := db.serializeModel(logger, actualLRP.ActualLrpNetInfo.ToProto()) if err != nil { logger.Error("failed-to-serialize-net-info", err) return err @@ -463,8 +464,8 @@ func (db *SQLDB) CrashActualLRP(ctx context.Context, logger lager.Logger, key *m _, err = db.update(ctx, logger, tx, actualLRPsTable, helpers.SQLAttributes{ "state": actualLRP.State, - "cell_id": actualLRP.CellId, - "instance_guid": actualLRP.InstanceGuid, + "cell_id": actualLRP.ActualLrpInstanceKey.CellId, + "instance_guid": actualLRP.ActualLrpInstanceKey.InstanceGuid, "modification_tag_index": actualLRP.ModificationTag.Index, "crash_count": actualLRP.CrashCount, "crash_reason": truncateString(actualLRP.CrashReason, 1024), @@ -579,17 +580,17 @@ func (db *SQLDB) createRunningActualLRP(ctx context.Context, logger lager.Logger actualLRP := &models.ActualLRP{} actualLRP.ModificationTag = models.NewModificationTag(guid, 0) - actualLRP.ActualLRPKey = *key - actualLRP.ActualLRPInstanceKey = *instanceKey - actualLRP.ActualLRPNetInfo = *netInfo + actualLRP.ActualLrpKey = *key + actualLRP.ActualLrpInstanceKey = *instanceKey + actualLRP.ActualLrpNetInfo = *netInfo actualLRP.ActualLrpInternalRoutes = internalRoutes actualLRP.MetricTags = metricTags actualLRP.State = models.ActualLRPStateRunning actualLRP.Since = now - actualLRP.SetRoutable(routable) + actualLRP.SetRoutable(&routable) actualLRP.AvailabilityZone = availabilityZone - netInfoData, err := db.serializeModel(logger, &actualLRP.ActualLRPNetInfo) + netInfoData, err := db.serializeModel(logger, actualLRP.ActualLrpNetInfo.ToProto()) if err != nil { return nil, err } @@ -608,11 +609,11 @@ func (db *SQLDB) createRunningActualLRP(ctx context.Context, logger lager.Logger _, err = db.insert(ctx, logger, tx, actualLRPsTable, helpers.SQLAttributes{ - "process_guid": actualLRP.ActualLRPKey.ProcessGuid, - "instance_index": actualLRP.ActualLRPKey.Index, - "domain": actualLRP.ActualLRPKey.Domain, - "instance_guid": actualLRP.ActualLRPInstanceKey.InstanceGuid, - "cell_id": actualLRP.ActualLRPInstanceKey.CellId, + "process_guid": actualLRP.ActualLrpKey.ProcessGuid, + "instance_index": actualLRP.ActualLrpKey.Index, + "domain": actualLRP.ActualLrpKey.Domain, + "instance_guid": actualLRP.ActualLrpInstanceKey.InstanceGuid, + "cell_id": actualLRP.ActualLrpInstanceKey.CellId, "state": actualLRP.State, "net_info": netInfoData, "internal_routes": internalRoutesData, @@ -639,13 +640,13 @@ func (db *SQLDB) scanToActualLRP(logger lager.Logger, row helpers.RowScanner) (* var actualLRP models.ActualLRP err := row.Scan( - &actualLRP.ProcessGuid, - &actualLRP.Index, + &actualLRP.ActualLrpKey.ProcessGuid, + &actualLRP.ActualLrpKey.Index, &actualLRP.Presence, - &actualLRP.Domain, + &actualLRP.ActualLrpKey.Domain, &actualLRP.State, - &actualLRP.InstanceGuid, - &actualLRP.CellId, + &actualLRP.ActualLrpInstanceKey.InstanceGuid, + &actualLRP.ActualLrpInstanceKey.CellId, &actualLRP.PlacementError, &actualLRP.Since, &netInfoData, @@ -664,7 +665,7 @@ func (db *SQLDB) scanToActualLRP(logger lager.Logger, row helpers.RowScanner) (* } if len(netInfoData) > 0 { - err = db.deserializeModel(logger, netInfoData, &actualLRP.ActualLRPNetInfo) + err = db.deserializeModel(logger, netInfoData, actualLRP.ActualLrpNetInfo.ToProto()) if err != nil { logger.Error("failed-unmarshaling-net-info-data", err) return &actualLRP, models.ErrDeserialize @@ -700,7 +701,7 @@ func (db *SQLDB) scanToActualLRP(logger lager.Logger, row helpers.RowScanner) (* } } actualLRP.MetricTags = metricTags - actualLRP.SetRoutable(routable) + actualLRP.SetRoutable(&routable) return &actualLRP, nil } @@ -755,7 +756,7 @@ func (db *SQLDB) scanAndCleanupActualLRPs(ctx context.Context, logger lager.Logg for _, actual := range actualsToDelete { _, err := db.delete(ctx, logger, q, actualLRPsTable, "process_guid = ? AND instance_index = ? AND presence = ?", - actual.ProcessGuid, actual.Index, actual.Presence, + actual.ActualLrpKey.ProcessGuid, actual.ActualLrpKey.Index, actual.Presence, ) if err != nil { logger.Error("failed-cleaning-up-invalid-actual-lrp", err) diff --git a/db/sqldb/actual_lrp_db_test.go b/db/sqldb/actual_lrp_db_test.go index 52f434e8..cb79dbfe 100644 --- a/db/sqldb/actual_lrp_db_test.go +++ b/db/sqldb/actual_lrp_db_test.go @@ -117,7 +117,8 @@ var _ = Describe("ActualLRPDB", func() { expectedActualLRP.ModificationTag.Index = 0 expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: key.ProcessGuid, Index: &key.Index}) Expect(err).NotTo(HaveOccurred()) @@ -176,9 +177,10 @@ var _ = Describe("ActualLRPDB", func() { _, _, err = sqlDB.ClaimActualLRP(ctx, logger, actualLRPKey1.ProcessGuid, actualLRPKey1.Index, instanceKey1) Expect(err).NotTo(HaveOccurred()) + routableFalse := false allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *actualLRPKey1, - ActualLRPInstanceKey: *instanceKey1, + ActualLrpKey: *actualLRPKey1, + ActualLrpInstanceKey: *instanceKey1, State: models.ActualLRPStateClaimed, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -187,7 +189,7 @@ var _ = Describe("ActualLRPDB", func() { }, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, }) actualLRPKey2 := &models.ActualLRPKey{ @@ -206,8 +208,8 @@ var _ = Describe("ActualLRPDB", func() { _, _, err = sqlDB.ClaimActualLRP(ctx, logger, actualLRPKey2.ProcessGuid, actualLRPKey2.Index, instanceKey2) Expect(err).NotTo(HaveOccurred()) allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *actualLRPKey2, - ActualLRPInstanceKey: *instanceKey2, + ActualLrpKey: *actualLRPKey2, + ActualLrpInstanceKey: *instanceKey2, State: models.ActualLRPStateClaimed, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -216,7 +218,7 @@ var _ = Describe("ActualLRPDB", func() { }, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, }) actualLRPKey3 := &models.ActualLRPKey{ @@ -234,8 +236,8 @@ var _ = Describe("ActualLRPDB", func() { _, _, err = sqlDB.ClaimActualLRP(ctx, logger, actualLRPKey3.ProcessGuid, actualLRPKey3.Index, instanceKey3) Expect(err).NotTo(HaveOccurred()) allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *actualLRPKey3, - ActualLRPInstanceKey: *instanceKey3, + ActualLrpKey: *actualLRPKey3, + ActualLrpInstanceKey: *instanceKey3, State: models.ActualLRPStateClaimed, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -244,7 +246,7 @@ var _ = Describe("ActualLRPDB", func() { }, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, }) actualLRPKey4 := &models.ActualLRPKey{ @@ -255,7 +257,7 @@ var _ = Describe("ActualLRPDB", func() { _, err = sqlDB.CreateUnclaimedActualLRP(ctx, logger, actualLRPKey4) Expect(err).NotTo(HaveOccurred()) allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *actualLRPKey4, + ActualLrpKey: *actualLRPKey4, State: models.ActualLRPStateUnclaimed, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -264,7 +266,7 @@ var _ = Describe("ActualLRPDB", func() { }, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, }) actualLRPKey5 := &models.ActualLRPKey{ @@ -288,8 +290,8 @@ var _ = Describe("ActualLRPDB", func() { _, err = db.ExecContext(ctx, queryStr, models.ActualLRP_Evacuating, actualLRPKey5.ProcessGuid, actualLRPKey5.Index, models.ActualLRP_Ordinary) Expect(err).NotTo(HaveOccurred()) allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *actualLRPKey5, - ActualLRPInstanceKey: *instanceKey5, + ActualLrpKey: *actualLRPKey5, + ActualLrpInstanceKey: *instanceKey5, State: models.ActualLRPStateClaimed, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -299,7 +301,7 @@ var _ = Describe("ActualLRPDB", func() { Presence: models.ActualLRP_Evacuating, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, }) actualLRPKey6 := &models.ActualLRPKey{ @@ -339,9 +341,9 @@ var _ = Describe("ActualLRPDB", func() { Expect(err).NotTo(HaveOccurred()) allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *actualLRPKey6, - ActualLRPInstanceKey: *instanceKey6, - ActualLRPNetInfo: netInfo, + ActualLrpKey: *actualLRPKey6, + ActualLrpInstanceKey: *instanceKey6, + ActualLrpNetInfo: netInfo, State: models.ActualLRPStateRunning, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -351,12 +353,12 @@ var _ = Describe("ActualLRPDB", func() { Presence: models.ActualLRP_Suspect, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, AvailabilityZone: availabilityZone6, }) allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *actualLRPKey6, - ActualLRPInstanceKey: *instanceKey6, + ActualLrpKey: *actualLRPKey6, + ActualLrpInstanceKey: *instanceKey6, State: models.ActualLRPStateClaimed, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -365,7 +367,7 @@ var _ = Describe("ActualLRPDB", func() { }, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, }) nullInternalRoutesActualLRPKey := &models.ActualLRPKey{ @@ -390,9 +392,9 @@ var _ = Describe("ActualLRPDB", func() { Expect(err).NotTo(HaveOccurred()) allActualLRPs = append(allActualLRPs, &models.ActualLRP{ - ActualLRPKey: *nullInternalRoutesActualLRPKey, - ActualLRPInstanceKey: *nullInteralRoutesInstanceKey, - ActualLRPNetInfo: models.ActualLRPNetInfo{}, + ActualLrpKey: *nullInternalRoutesActualLRPKey, + ActualLrpInstanceKey: *nullInteralRoutesInstanceKey, + ActualLrpNetInfo: models.ActualLRPNetInfo{}, State: models.ActualLRPStateClaimed, Since: fakeClock.Now().UnixNano(), ModificationTag: models.ModificationTag{ @@ -402,7 +404,7 @@ var _ = Describe("ActualLRPDB", func() { Presence: models.ActualLRP_Ordinary, ActualLrpInternalRoutes: []*models.ActualLRPInternalRoute{}, MetricTags: map[string]string{}, - OptionalRoutable: &models.ActualLRP_Routable{Routable: false}, + Routable: &routableFalse, }) }) @@ -419,8 +421,8 @@ var _ = Describe("ActualLRPDB", func() { actualLRPWithInvalidData = model_helpers.NewValidActualLRP("invalid", 0) internalRoutes := model_helpers.NewActualLRPInternalRoutes() metricTags := model_helpers.NewActualLRPMetricTags() - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRPWithInvalidData.ActualLRPKey, - &actualLRPWithInvalidData.ActualLRPInstanceKey, &actualLRPWithInvalidData.ActualLRPNetInfo, internalRoutes, metricTags, false, "some-zone") + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRPWithInvalidData.ActualLrpKey, + &actualLRPWithInvalidData.ActualLrpInstanceKey, &actualLRPWithInvalidData.ActualLrpNetInfo, internalRoutes, metricTags, false, "some-zone") Expect(err).NotTo(HaveOccurred()) queryStr := `UPDATE actual_lrps SET net_info = 'garbage' WHERE process_guid = 'invalid'` if test_helpers.UsePostgres() { @@ -445,8 +447,8 @@ var _ = Describe("ActualLRPDB", func() { actualLRPWithInvalidData = model_helpers.NewValidActualLRP("invalid", 0) internalRoutes := model_helpers.NewActualLRPInternalRoutes() metricTags := model_helpers.NewActualLRPMetricTags() - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRPWithInvalidData.ActualLRPKey, - &actualLRPWithInvalidData.ActualLRPInstanceKey, &actualLRPWithInvalidData.ActualLRPNetInfo, internalRoutes, metricTags, false, "some-zone") + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRPWithInvalidData.ActualLrpKey, + &actualLRPWithInvalidData.ActualLrpInstanceKey, &actualLRPWithInvalidData.ActualLrpNetInfo, internalRoutes, metricTags, false, "some-zone") Expect(err).NotTo(HaveOccurred()) queryStr := `UPDATE actual_lrps SET internal_routes = 'garbage' WHERE process_guid = 'invalid'` if test_helpers.UsePostgres() { @@ -470,8 +472,8 @@ var _ = Describe("ActualLRPDB", func() { actualLRPWithInvalidData = model_helpers.NewValidActualLRP("invalid", 0) internalRoutes := model_helpers.NewActualLRPInternalRoutes() metricTags := model_helpers.NewActualLRPMetricTags() - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRPWithInvalidData.ActualLRPKey, - &actualLRPWithInvalidData.ActualLRPInstanceKey, &actualLRPWithInvalidData.ActualLRPNetInfo, internalRoutes, metricTags, false, "some-zone") + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRPWithInvalidData.ActualLrpKey, + &actualLRPWithInvalidData.ActualLrpInstanceKey, &actualLRPWithInvalidData.ActualLrpNetInfo, internalRoutes, metricTags, false, "some-zone") Expect(err).NotTo(HaveOccurred()) queryStr := `UPDATE actual_lrps SET metric_tags = 'garbage' WHERE process_guid = 'invalid'` if test_helpers.UsePostgres() { @@ -604,7 +606,7 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { expectedActualLRP = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "the-guid", Index: 1, Domain: "the-domain", @@ -614,7 +616,7 @@ var _ = Describe("ActualLRPDB", func() { Index: 0, }, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &expectedActualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &expectedActualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) lrpCreationTime = fakeClock.Now() fakeClock.Increment(time.Hour) @@ -622,35 +624,37 @@ var _ = Describe("ActualLRPDB", func() { Context("and the actual lrp is UNCLAIMED", func() { It("claims the actual lrp", func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) expectedActualLRP.State = models.ActualLRPStateClaimed - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.ModificationTag.Increment() expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) }) It("returns the existing actual lrp", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + beforeActualLRP, afterActualLRP, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) expectedActualLRP.State = models.ActualLRPStateUnclaimed expectedActualLRP.Since = lrpCreationTime.UnixNano() expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(beforeActualLRP).To(Equal(expectedActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) @@ -666,25 +670,26 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, "i am placement errror, how are you?", - expectedActualLRP.ProcessGuid, - expectedActualLRP.Index, + expectedActualLRP.ActualLrpKey.ProcessGuid, + expectedActualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("clears the placement error", func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) expectedActualLRP.State = models.ActualLRPStateClaimed - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.ModificationTag.Increment() expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) }) @@ -694,28 +699,29 @@ var _ = Describe("ActualLRPDB", func() { Context("and the actual lrp is CLAIMED", func() { Context("when the actual lrp is already claimed with the same instance key", func() { BeforeEach(func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) expectedActualLRP.ModificationTag.Increment() }) It("does not update the actual lrp", func() { expectedActualLRP.State = models.ActualLRPStateClaimed - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) fakeClock.Increment(time.Hour) - beforeActualLRP, afterActualLRP, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + beforeActualLRP, afterActualLRP, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) Expect(beforeActualLRP).To(Equal(afterActualLRP)) Expect(afterActualLRP).To(Equal(expectedActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) }) @@ -723,10 +729,10 @@ var _ = Describe("ActualLRPDB", func() { Context("when the actual lrp is claimed by another cell", func() { BeforeEach(func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(HaveLen(1)) expectedActualLRP = actualLRPs[0] @@ -738,10 +744,10 @@ var _ = Describe("ActualLRPDB", func() { CellId: "different-cell", } - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).To(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) }) @@ -765,9 +771,9 @@ var _ = Describe("ActualLRPDB", func() { _, _, err := sqlDB.StartActualLRP(ctx, logger, &models.ActualLRPKey{ - ProcessGuid: expectedActualLRP.ProcessGuid, - Index: expectedActualLRP.Index, - Domain: expectedActualLRP.Domain, + ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, + Index: expectedActualLRP.ActualLrpKey.Index, + Domain: expectedActualLRP.ActualLrpKey.Domain, }, &models.ActualLRPInstanceKey{ InstanceGuid: instanceKey.InstanceGuid, @@ -779,19 +785,20 @@ var _ = Describe("ActualLRPDB", func() { Context("with the same cell and instance guid", func() { It("reverts the RUNNING actual lrp to the CLAIMED state", func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.State = models.ActualLRPStateClaimed expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ModificationTag.Increment() expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) @@ -802,17 +809,17 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { instanceKey.CellId = "another-cell" - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(HaveLen(1)) expectedActualLRP = actualLRPs[0] }) It("returns an error", func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).To(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) }) @@ -822,17 +829,17 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { instanceKey.InstanceGuid = "another-instance-guid" - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(HaveLen(1)) expectedActualLRP = actualLRPs[0] }) It("returns an error", func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).To(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) }) @@ -849,17 +856,17 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, models.ActualLRPStateCrashed, - expectedActualLRP.ProcessGuid, - expectedActualLRP.Index, + expectedActualLRP.ActualLrpKey.ProcessGuid, + expectedActualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("returns an error", func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).To(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(HaveLen(1)) Expect(actualLRPs[0].State).To(Equal(models.ActualLRPStateCrashed)) @@ -874,8 +881,8 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Evacuating, - expectedActualLRP.ActualLRPKey.ProcessGuid, - expectedActualLRP.ActualLRPKey.Index, + expectedActualLRP.ActualLrpKey.ProcessGuid, + expectedActualLRP.ActualLrpKey.Index, models.ActualLRP_Ordinary, ) Expect(err).NotTo(HaveOccurred()) @@ -885,15 +892,16 @@ var _ = Describe("ActualLRPDB", func() { expectedActualLRP.Presence = models.ActualLRP_Evacuating expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) }) It("returns an error", func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ProcessGuid, expectedActualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, expectedActualLRP.ActualLrpKey.ProcessGuid, expectedActualLRP.ActualLrpKey.Index, instanceKey) Expect(err).To(HaveOccurred()) Expect(err).To(Equal(models.ErrResourceNotFound)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ProcessGuid, Index: &expectedActualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: expectedActualLRP.ActualLrpKey.ProcessGuid, Index: &expectedActualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(expectedActualLRP)) }) @@ -951,29 +959,29 @@ var _ = Describe("ActualLRPDB", func() { internalRoutes = model_helpers.NewActualLRPInternalRoutes() metricTags = model_helpers.NewActualLRPMetricTags() actualLRP = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "the-guid", Index: 1, Domain: "the-domain", }, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) fakeClock.Increment(time.Hour) }) Context("and the actual lrp is UNCLAIMED", func() { It("transitions the state to RUNNING", func() { - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.State = models.ActualLRPStateRunning - expectedActualLRP.ActualLRPNetInfo = *netInfo + expectedActualLRP.ActualLrpNetInfo = *netInfo expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ModificationTag = models.ModificationTag{ Epoch: "my-awesome-guid", @@ -981,14 +989,15 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(true) + routable := true + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) }) It("returns the existing actual lrp", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP expectedActualLRP.State = models.ActualLRPStateUnclaimed @@ -999,11 +1008,12 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(beforeActualLRP).To(Equal(&expectedActualLRP)) expectedActualLRP.AvailabilityZone = availabilityZone - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) }) @@ -1011,22 +1021,22 @@ var _ = Describe("ActualLRPDB", func() { Context("and the actual lrp has been CLAIMED", func() { BeforeEach(func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) fakeClock.Increment(time.Hour) }) It("transitions the state to RUNNING", func() { - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.State = models.ActualLRPStateRunning - expectedActualLRP.ActualLRPNetInfo = *netInfo + expectedActualLRP.ActualLrpNetInfo = *netInfo expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ModificationTag = models.ModificationTag{ Epoch: "my-awesome-guid", @@ -1034,18 +1044,19 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(true) + routable := true + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) }) It("returns the existing actual lrp", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.State = models.ActualLRPStateClaimed // claim doesn't set since expectedActualLRP.Since = fakeClock.Now().Add(-time.Hour).UnixNano() @@ -1055,10 +1066,11 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = "" - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(beforeActualLRP).To(Equal(&expectedActualLRP)) @@ -1068,16 +1080,16 @@ var _ = Describe("ActualLRPDB", func() { Context("and the instance key is different", func() { It("transitions the state to RUNNING, updating the instance key", func() { otherInstanceKey := &models.ActualLRPInstanceKey{CellId: "some-other-cell", InstanceGuid: "some-other-instance-guid"} - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, otherInstanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, otherInstanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP - expectedActualLRP.ActualLRPInstanceKey = *otherInstanceKey + expectedActualLRP.ActualLrpInstanceKey = *otherInstanceKey expectedActualLRP.State = models.ActualLRPStateRunning - expectedActualLRP.ActualLRPNetInfo = *netInfo + expectedActualLRP.ActualLrpNetInfo = *netInfo expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ModificationTag = models.ModificationTag{ Epoch: "my-awesome-guid", @@ -1085,7 +1097,8 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(true) + routable := true + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) @@ -1094,27 +1107,27 @@ var _ = Describe("ActualLRPDB", func() { Context("and the actual lrp is RUNNING", func() { BeforeEach(func() { - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) }) Context("and the instance key is the same", func() { Context("and the attributes are the same", func() { It("does nothing", func() { - beforeActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + beforeActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) - afterActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + afterActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(beforeActualLRPs).To(Equal(afterActualLRPs)) }) It("returns the same actual lrp group for before and after", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(beforeActualLRP).To(Equal(afterActualLRP)) }) @@ -1128,24 +1141,24 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { var err error - expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) newNetInfo = &models.ActualLRPNetInfo{Address: "some-other-address"} }) It("updates the net info", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, newNetInfo, internalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, newNetInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(expectedActualLRPs).To(ConsistOf(beforeActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) Expect(actualLRPs).NotTo(Equal(expectedActualLRPs)) - expectedActualLRPs[0].ActualLRPNetInfo = *newNetInfo + expectedActualLRPs[0].ActualLrpNetInfo = *newNetInfo expectedActualLRPs[0].ModificationTag.Increment() Expect(actualLRPs).To(Equal(expectedActualLRPs)) }) @@ -1159,18 +1172,18 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { var err error - expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) newInternalRoutes = []*models.ActualLRPInternalRoute{{Hostname: "some-new-internalroute"}} }) It("updates the internal routes", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, newInternalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, newInternalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(expectedActualLRPs).To(ConsistOf(beforeActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) @@ -1190,7 +1203,7 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { var err error - expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) newMetricTags = map[string]string{ "app_name": "new-app-name", @@ -1198,12 +1211,12 @@ var _ = Describe("ActualLRPDB", func() { }) It("updates the metric tags", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, newMetricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, newMetricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(expectedActualLRPs).To(ConsistOf(beforeActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) @@ -1222,23 +1235,24 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { var err error - expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) }) It("updates the routable", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, true, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(expectedActualLRPs).To(ConsistOf(beforeActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) Expect(actualLRPs).NotTo(Equal(expectedActualLRPs)) - expectedActualLRPs[0].SetRoutable(true) + routable := true + expectedActualLRPs[0].SetRoutable(&routable) expectedActualLRPs[0].ModificationTag.Increment() Expect(actualLRPs).To(Equal(expectedActualLRPs)) }) @@ -1251,17 +1265,17 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { var err error - expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + expectedActualLRPs, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) }) It("updates the availability_zone", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, "some-other-zone") + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, "some-other-zone") Expect(err).NotTo(HaveOccurred()) Expect(expectedActualLRPs).To(ConsistOf(beforeActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) @@ -1276,7 +1290,7 @@ var _ = Describe("ActualLRPDB", func() { Context("and the instance key is not the same", func() { It("returns an ErrActualLRPCannotBeStarted", func() { - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &models.ActualLRPInstanceKey{CellId: "some-other-cell", InstanceGuid: "some-other-instance-guid"}, netInfo, internalRoutes, metricTags, false, availabilityZone) + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &models.ActualLRPInstanceKey{CellId: "some-other-cell", InstanceGuid: "some-other-instance-guid"}, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).To(Equal(models.ErrActualLRPCannotBeStarted)) }) }) @@ -1292,19 +1306,19 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, models.ActualLRPStateCrashed, - actualLRP.ProcessGuid, - actualLRP.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("transitions the state to RUNNING", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred()) expectedBeforeActualLRP := *actualLRP - expectedBeforeActualLRP.ActualLRPInstanceKey = *instanceKey + expectedBeforeActualLRP.ActualLrpInstanceKey = *instanceKey expectedBeforeActualLRP.State = models.ActualLRPStateCrashed // we crash directly in the DB, so no since expectedBeforeActualLRP.Since = fakeClock.Now().Add(-time.Hour).UnixNano() @@ -1314,16 +1328,17 @@ var _ = Describe("ActualLRPDB", func() { } expectedBeforeActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedBeforeActualLRP.MetricTags = map[string]string{} - expectedBeforeActualLRP.SetRoutable(false) + routable := false + expectedBeforeActualLRP.SetRoutable(&routable) Expect(beforeActualLRP).To(Equal(&expectedBeforeActualLRP)) - fetchedActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + fetchedActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedAfterActualLRP := *actualLRP - expectedAfterActualLRP.ActualLRPInstanceKey = *instanceKey + expectedAfterActualLRP.ActualLrpInstanceKey = *instanceKey expectedAfterActualLRP.State = models.ActualLRPStateRunning - expectedAfterActualLRP.ActualLRPNetInfo = *netInfo + expectedAfterActualLRP.ActualLrpNetInfo = *netInfo expectedAfterActualLRP.Since = fakeClock.Now().UnixNano() expectedAfterActualLRP.ModificationTag = models.ModificationTag{ Epoch: "my-awesome-guid", @@ -1331,7 +1346,7 @@ var _ = Describe("ActualLRPDB", func() { } expectedAfterActualLRP.ActualLrpInternalRoutes = internalRoutes expectedAfterActualLRP.MetricTags = metricTags - expectedAfterActualLRP.SetRoutable(false) + expectedAfterActualLRP.SetRoutable(&routable) expectedAfterActualLRP.AvailabilityZone = availabilityZone Expect(fetchedActualLRPs).To(ContainElement(afterActualLRP)) @@ -1364,7 +1379,7 @@ var _ = Describe("ActualLRPDB", func() { internalRoutes = model_helpers.NewActualLRPInternalRoutes() metricTags = model_helpers.NewActualLRPMetricTags() actualLRP = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "the-guid", Index: 1, Domain: "the-domain", @@ -1377,21 +1392,22 @@ var _ = Describe("ActualLRPDB", func() { }) It("creates the actual lrp", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(beforeActualLRP).To(Equal(&models.ActualLRP{})) - fetchedActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + fetchedActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP expectedActualLRP.State = models.ActualLRPStateRunning - expectedActualLRP.ActualLRPNetInfo = *netInfo + expectedActualLRP.ActualLrpNetInfo = *netInfo expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.Since = fakeClock.Now().UnixNano() Expect(fetchedActualLRPs).To(ContainElement(afterActualLRP)) @@ -1400,7 +1416,7 @@ var _ = Describe("ActualLRPDB", func() { Context("when there is only an evacuating actual LRP", func() { BeforeEach(func() { - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) queryStr := "UPDATE actual_lrps SET presence = ? WHERE process_guid = ? AND instance_index = ? AND presence = ?" if test_helpers.UsePostgres() { @@ -1408,29 +1424,30 @@ var _ = Describe("ActualLRPDB", func() { } _, err = db.ExecContext(ctx, queryStr, models.ActualLRP_Evacuating, - actualLRP.ActualLRPKey.ProcessGuid, - actualLRP.ActualLRPKey.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, models.ActualLRP_Ordinary, ) Expect(err).NotTo(HaveOccurred()) }) It("creates a new actual LRP", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + beforeActualLRP, afterActualLRP, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) Expect(beforeActualLRP).To(Equal(&models.ActualLRP{})) - fetchedActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + fetchedActualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP expectedActualLRP.State = models.ActualLRPStateRunning - expectedActualLRP.ActualLRPNetInfo = *netInfo + expectedActualLRP.ActualLrpNetInfo = *netInfo expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.Since = fakeClock.Now().UnixNano() Expect(fetchedActualLRPs).To(ContainElement(afterActualLRP)) @@ -1465,13 +1482,13 @@ var _ = Describe("ActualLRPDB", func() { metricTags = model_helpers.NewActualLRPMetricTags() actualLRP = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "the-guid", Index: 1, Domain: "the-domain", }, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) actualLRP.ModificationTag.Epoch = "my-awesome-guid" fakeClock.Increment(time.Hour) @@ -1479,28 +1496,29 @@ var _ = Describe("ActualLRPDB", func() { Context("and it is RUNNING", func() { BeforeEach(func() { - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) actualLRP.ModificationTag.Increment() }) It("returns the before and after actual lrps", func() { - beforeActualLRP, afterActualLRP, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + beforeActualLRP, afterActualLRP, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP expectedActualLRP.State = models.ActualLRPStateRunning - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.Since = fakeClock.Now().UnixNano() - expectedActualLRP.ActualLRPNetInfo = *netInfo + expectedActualLRP.ActualLrpNetInfo = *netInfo expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(beforeActualLRP).To(Equal(&expectedActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) @@ -1509,10 +1527,10 @@ var _ = Describe("ActualLRPDB", func() { Context("and the crash reason is larger than 1K", func() { It("truncates the crash reason", func() { crashReason := strings.Repeat("x", 2*1024) - _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, crashReason) + _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, crashReason) Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1523,7 +1541,8 @@ var _ = Describe("ActualLRPDB", func() { expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) @@ -1532,11 +1551,11 @@ var _ = Describe("ActualLRPDB", func() { Context("and it should be restarted", func() { It("updates the lrp and sets its state to UNCLAIMED", func() { - _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).NotTo(HaveOccurred()) Expect(shouldRestart).To(BeTrue()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1547,7 +1566,8 @@ var _ = Describe("ActualLRPDB", func() { expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) @@ -1564,18 +1584,18 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, models.DefaultImmediateRestarts+1, - actualLRP.ProcessGuid, - actualLRP.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("updates the lrp and sets its state to CRASHED", func() { - _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).NotTo(HaveOccurred()) Expect(shouldRestart).To(BeFalse()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1586,7 +1606,8 @@ var _ = Describe("ActualLRPDB", func() { expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = internalRoutes expectedActualLRP.MetricTags = metricTags - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) expectedActualLRP.AvailabilityZone = availabilityZone Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) @@ -1602,18 +1623,18 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, fakeClock.Now().Add(-(models.CrashResetTimeout + 1*time.Second)).UnixNano(), - actualLRP.ProcessGuid, - actualLRP.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("resets the crash count to 1", func() { - _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).NotTo(HaveOccurred()) Expect(shouldRestart).To(BeTrue()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(HaveLen(1)) @@ -1625,27 +1646,28 @@ var _ = Describe("ActualLRPDB", func() { Context("and it's CLAIMED", func() { BeforeEach(func() { - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) fakeClock.Increment(time.Hour) actualLRP.ModificationTag.Increment() }) It("returns the previous and current actual lrp", func() { - beforeActualLRP, afterActualLRP, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + beforeActualLRP, afterActualLRP, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP expectedActualLRP.State = models.ActualLRPStateClaimed - expectedActualLRP.ActualLRPInstanceKey = *instanceKey + expectedActualLRP.ActualLrpInstanceKey = *instanceKey expectedActualLRP.Since = fakeClock.Now().Add(-time.Hour).UnixNano() expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(beforeActualLRP).To(Equal(&expectedActualLRP)) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) }) @@ -1660,18 +1682,18 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, models.DefaultImmediateRestarts-2, - actualLRP.ProcessGuid, - actualLRP.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("updates the lrp and sets its state to UNCLAIMED", func() { - _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).NotTo(HaveOccurred()) Expect(shouldRestart).To(BeTrue()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1682,7 +1704,8 @@ var _ = Describe("ActualLRPDB", func() { expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) }) @@ -1698,18 +1721,18 @@ var _ = Describe("ActualLRPDB", func() { } _, err := db.ExecContext(ctx, queryStr, models.DefaultImmediateRestarts+2, - actualLRP.ProcessGuid, - actualLRP.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("updates the lrp and sets its state to CRASHED", func() { - _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "some other failure reason") + _, _, shouldRestart, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "some other failure reason") Expect(err).NotTo(HaveOccurred()) Expect(shouldRestart).To(BeFalse()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1720,7 +1743,8 @@ var _ = Describe("ActualLRPDB", func() { expectedActualLRP.Since = fakeClock.Now().UnixNano() expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) }) @@ -1729,17 +1753,17 @@ var _ = Describe("ActualLRPDB", func() { Context("and it's already CRASHED", func() { BeforeEach(func() { - _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + _, _, err := sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) actualLRP.ModificationTag.Increment() - _, _, _, err = sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, _, err = sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).NotTo(HaveOccurred()) actualLRP.ModificationTag.Increment() }) It("returns a cannot crash error", func() { - _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).To(HaveOccurred()) Expect(err).To(Equal(models.ErrActualLRPCannotBeCrashed)) }) @@ -1747,7 +1771,7 @@ var _ = Describe("ActualLRPDB", func() { Context("and it's UNCLAIMED", func() { It("returns a cannot crash error", func() { - _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).To(HaveOccurred()) Expect(err).To(Equal(models.ErrActualLRPCannotBeCrashed)) }) @@ -1763,14 +1787,14 @@ var _ = Describe("ActualLRPDB", func() { _, err := db.ExecContext(ctx, queryStr, models.DefaultImmediateRestarts+2, models.ActualLRP_Evacuating, - actualLRP.ProcessGuid, - actualLRP.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) }) It("returns a cannot crash error", func() { - _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, _, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).To(HaveOccurred()) Expect(err).To(Equal(models.ErrResourceNotFound)) }) @@ -1793,18 +1817,18 @@ var _ = Describe("ActualLRPDB", func() { CellId: "evac-cell-id", } evacuatingLRP := &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "the-unclaimed-guid", Index: 1, Domain: "the-domain", }, Presence: models.ActualLRP_Evacuating, - ActualLRPInstanceKey: *instanceKey, + ActualLrpInstanceKey: *instanceKey, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &evacuatingLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &evacuatingLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.StartActualLRP(ctx, logger, &evacuatingLRP.ActualLRPKey, evacuatingInstanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + _, _, err = sqlDB.StartActualLRP(ctx, logger, &evacuatingLRP.ActualLrpKey, evacuatingInstanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) queryStr := ` UPDATE actual_lrps SET presence = ? @@ -1816,30 +1840,30 @@ var _ = Describe("ActualLRPDB", func() { _, err = db.ExecContext(ctx, queryStr, models.ActualLRP_Evacuating, - evacuatingLRP.ProcessGuid, - evacuatingLRP.Index, + evacuatingLRP.ActualLrpKey.ProcessGuid, + evacuatingLRP.ActualLrpKey.Index, ) Expect(err).NotTo(HaveOccurred()) actualLRP = &models.ActualLRP{ - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: "the-unclaimed-guid", Index: 1, Domain: "the-domain", }, Presence: models.ActualLRP_Ordinary, - ActualLRPInstanceKey: *instanceKey, + ActualLrpInstanceKey: *instanceKey, } - _, err = sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err = sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) + _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, netInfo, internalRoutes, metricTags, false, availabilityZone) Expect(err).NotTo(HaveOccurred()) }) It("only update the non evacuating one", func() { - _, crashedActualLRP, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLRPKey, instanceKey, "because it didn't go well") + _, crashedActualLRP, _, err := sqlDB.CrashActualLRP(ctx, logger, &actualLRP.ActualLrpKey, instanceKey, "because it didn't go well") Expect(err).ToNot(HaveOccurred()) Expect(crashedActualLRP.CrashCount).To(Equal(actualLRP.CrashCount + 1)) }) @@ -1878,19 +1902,19 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { actualLRP = &models.ActualLRP{ - ActualLRPKey: *actualLRPKey, + ActualLrpKey: *actualLRPKey, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) fakeClock.Increment(time.Hour) }) Context("and the state is UNCLAIMED", func() { It("fails the LRP", func() { - _, _, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLRPKey, "failing the LRP") + _, _, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLrpKey, "failing the LRP") Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1903,7 +1927,8 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) }) @@ -1911,10 +1936,10 @@ var _ = Describe("ActualLRPDB", func() { Context("and the placement error is longer than 1K", func() { It("truncates the placement_error", func() { value := strings.Repeat("x", 2*1024) - _, _, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLRPKey, value) + _, _, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLrpKey, value) Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1927,17 +1952,18 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(actualLRPs).To(ConsistOf(&expectedActualLRP)) }) }) It("returns the previous and current actual lrp", func() { - beforeActualLRP, afterActualLRP, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLRPKey, "failing the LRP") + beforeActualLRP, afterActualLRP, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLrpKey, "failing the LRP") Expect(err).NotTo(HaveOccurred()) - actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) expectedActualLRP := *actualLRP @@ -1949,7 +1975,8 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(beforeActualLRP).To(Equal(&expectedActualLRP)) Expect(actualLRPs).To(ConsistOf(afterActualLRP)) @@ -1962,13 +1989,13 @@ var _ = Describe("ActualLRPDB", func() { InstanceGuid: "the-instance-guid", CellId: "the-cell-id", } - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, instanceKey) Expect(err).NotTo(HaveOccurred()) fakeClock.Increment(time.Hour) }) It("returns a cannot be failed error", func() { - _, _, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLRPKey, "failing the LRP") + _, _, err := sqlDB.FailActualLRP(ctx, logger, &actualLRP.ActualLrpKey, "failing the LRP") Expect(err).To(HaveOccurred()) Expect(err).To(Equal(models.ErrActualLRPCannotBeFailed)) }) @@ -2001,9 +2028,9 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { actualLRP = &models.ActualLRP{ - ActualLRPKey: *actualLRPKey, + ActualLrpKey: *actualLRPKey, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) _, err = sqlDB.CreateUnclaimedActualLRP(ctx, logger, otherActualLRPKey) @@ -2012,16 +2039,16 @@ var _ = Describe("ActualLRPDB", func() { }) It("removes the actual lrp", func() { - err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, nil) + err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, nil) Expect(err).NotTo(HaveOccurred()) - lrps, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + lrps, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(lrps).To(BeEmpty()) }) It("keeps the other lrps around", func() { - err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, nil) + err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, nil) Expect(err).NotTo(HaveOccurred()) _, err = sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: otherActualLRPKey.ProcessGuid, Index: &otherActualLRPKey.Index}) @@ -2034,16 +2061,16 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { instanceKey = models.NewActualLRPInstanceKey("instance-guid", "cell-id") - _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, &instanceKey) + _, _, err := sqlDB.ClaimActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, &instanceKey) Expect(err).NotTo(HaveOccurred()) }) Context("and it matches the existing actual lrp", func() { It("removes the actual lrp", func() { - err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, &instanceKey) + err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, &instanceKey) Expect(err).NotTo(HaveOccurred()) - lrps, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ProcessGuid, Index: &actualLRP.Index}) + lrps, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: actualLRP.ActualLrpKey.ProcessGuid, Index: &actualLRP.ActualLrpKey.Index}) Expect(err).NotTo(HaveOccurred()) Expect(lrps).To(BeEmpty()) }) @@ -2052,7 +2079,7 @@ var _ = Describe("ActualLRPDB", func() { Context("and it does not match the existing actual lrp", func() { It("returns an error", func() { instanceKey.CellId = "not the right cell id" - err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index, &instanceKey) + err := sqlDB.RemoveActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, &instanceKey) Expect(err).To(HaveOccurred()) }) }) @@ -2087,12 +2114,12 @@ var _ = Describe("ActualLRPDB", func() { BeforeEach(func() { actualLRP = &models.ActualLRP{ - ActualLRPKey: *actualLRPKey, + ActualLrpKey: *actualLRPKey, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &actualLRP.ActualLRPInstanceKey) + _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &actualLRP.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) }) @@ -2113,7 +2140,7 @@ var _ = Describe("ActualLRPDB", func() { actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) Expect(err).ToNot(HaveOccurred()) Expect(actualLRPs).To(HaveLen(1)) - Expect(actualLRPs[0].ActualLRPNetInfo).To(Equal(models.ActualLRPNetInfo{})) + Expect(actualLRPs[0].ActualLrpNetInfo).To(Equal(models.ActualLRPNetInfo{})) }) It("it increments the modification tag on the actualLRP", func() { @@ -2128,7 +2155,7 @@ var _ = Describe("ActualLRPDB", func() { actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) Expect(err).ToNot(HaveOccurred()) Expect(actualLRPs).To(HaveLen(1)) - Expect(actualLRPs[0].ActualLRPInstanceKey).To(Equal(models.ActualLRPInstanceKey{})) + Expect(actualLRPs[0].ActualLrpInstanceKey).To(Equal(models.ActualLRPInstanceKey{})) }) It("it updates the actualLRP's update at timestamp", func() { @@ -2148,7 +2175,8 @@ var _ = Describe("ActualLRPDB", func() { } expectedActualLRP.ActualLrpInternalRoutes = []*models.ActualLRPInternalRoute{} expectedActualLRP.MetricTags = map[string]string{} - expectedActualLRP.SetRoutable(false) + routable := false + expectedActualLRP.SetRoutable(&routable) Expect(beforeActualLRP).To(BeEquivalentTo(&expectedActualLRP)) @@ -2161,10 +2189,10 @@ var _ = Describe("ActualLRPDB", func() { Context("When the actual LRP is unclaimed", func() { BeforeEach(func() { actualLRP = &models.ActualLRP{ - ActualLRPKey: *actualLRPKey, + ActualLrpKey: *actualLRPKey, } - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) }) diff --git a/db/sqldb/desired_lrp_db.go b/db/sqldb/desired_lrp_db.go index 5907d2fd..18110584 100644 --- a/db/sqldb/desired_lrp_db.go +++ b/db/sqldb/desired_lrp_db.go @@ -31,7 +31,8 @@ func (db *SQLDB) DesireLRP(ctx context.Context, logger lager.Logger, desiredLRP runInfo := desiredLRP.DesiredLRPRunInfo(db.clock.Now()) - runInfoData, err := db.serializeModel(logger, &runInfo) + protoRunInfo := runInfo.ToProto() + runInfoData, err := db.serializeModel(logger, protoRunInfo) if err != nil { logger.Error("failed-to-serialize-model", err) return err @@ -43,7 +44,8 @@ func (db *SQLDB) DesireLRP(ctx context.Context, logger lager.Logger, desiredLRP volumePlacement.DriverNames = append(volumePlacement.DriverNames, mount.Driver) } - volumePlacementData, err := db.serializeModel(logger, volumePlacement) + protoVolumePlacement := volumePlacement.ToProto() + volumePlacementData, err := db.serializeModel(logger, protoVolumePlacement) if err != nil { logger.Error("failed-to-serialize-model", err) return err @@ -393,15 +395,15 @@ func (db *SQLDB) fetchDesiredLRPSchedulingInfoAndMore(logger lager.Logger, scann schedulingInfo := &models.DesiredLRPSchedulingInfo{} var routeData, volumePlacementData, placementTagData []byte values := []interface{}{ - &schedulingInfo.ProcessGuid, - &schedulingInfo.Domain, - &schedulingInfo.LogGuid, + &schedulingInfo.DesiredLrpKey.ProcessGuid, + &schedulingInfo.DesiredLrpKey.Domain, + &schedulingInfo.DesiredLrpKey.LogGuid, &schedulingInfo.Annotation, &schedulingInfo.Instances, - &schedulingInfo.MemoryMb, - &schedulingInfo.DiskMb, - &schedulingInfo.MaxPids, - &schedulingInfo.RootFs, + &schedulingInfo.DesiredLrpResource.MemoryMb, + &schedulingInfo.DesiredLrpResource.DiskMb, + &schedulingInfo.DesiredLrpResource.MaxPids, + &schedulingInfo.DesiredLrpResource.RootFs, &routeData, &volumePlacementData, &schedulingInfo.ModificationTag.Epoch, @@ -434,11 +436,13 @@ func (db *SQLDB) fetchDesiredLRPSchedulingInfoAndMore(logger lager.Logger, scann schedulingInfo.Routes = routes var volumePlacement models.VolumePlacement - err = db.deserializeModel(logger, volumePlacementData, &volumePlacement) + var protoVolumePlacement models.ProtoVolumePlacement + err = db.deserializeModel(logger, volumePlacementData, &protoVolumePlacement) if err != nil { logger.Error("failed-parsing-volume-placement", err) return nil, err } + volumePlacement = *protoVolumePlacement.FromProto() schedulingInfo.VolumePlacement = &volumePlacement if placementTagData != nil { err = json.Unmarshal(placementTagData, &schedulingInfo.PlacementTags) @@ -489,18 +493,29 @@ func (db *SQLDB) fetchDesiredLRPRoutingInfo(logger lager.Logger, scanner helpers } routingInfo.Routes = &routes +<<<<<<< HEAD var metricTags map[string]*models.MetricTagValue decodedDesiredData, err := db.encoder.Decode(metricTagsData) +======= + var runInfo models.DesiredLRPRunInfo + var protoRunInfo models.ProtoDesiredLRPRunInfo + err = db.deserializeModel(logger, runInfoData, &protoRunInfo) +>>>>>>> 0576c2d9 (Struct and naming changes due to new protobuf) if err != nil { logger.Error("failed-decrypting-metric-tags", err) return nil, err } +<<<<<<< HEAD err = json.Unmarshal(decodedDesiredData, &metricTags) if err != nil { logger.Error("failed-parsing-metric-tags", err) return nil, err } routingInfo.MetricTags = metricTags +======= + runInfo = *protoRunInfo.FromProto() + routingInfo.MetricTags = runInfo.MetricTags +>>>>>>> 0576c2d9 (Struct and naming changes due to new protobuf) routingInfo.ModificationTag = &models.ModificationTag{Epoch: modificationTagEpoch, Index: modificationTagIndex} return routingInfo, nil @@ -567,10 +582,12 @@ func (db *SQLDB) fetchDesiredLRPInternal(logger lager.Logger, scanner helpers.Ro } var runInfo models.DesiredLRPRunInfo - err = db.deserializeModel(logger, runInfoData, &runInfo) + var protoRunInfo models.ProtoDesiredLRPRunInfo + err = db.deserializeModel(logger, runInfoData, &protoRunInfo) if err != nil { - return nil, schedulingInfo.ProcessGuid, models.ErrDeserialize + return nil, schedulingInfo.DesiredLrpKey.ProcessGuid, models.ErrDeserialize } + runInfo = *protoRunInfo.FromProto() // dedup the ports runInfo.Ports = dedupSlice(runInfo.Ports) diff --git a/db/sqldb/desired_lrp_db_test.go b/db/sqldb/desired_lrp_db_test.go index 951d5e5f..14f677bc 100644 --- a/db/sqldb/desired_lrp_db_test.go +++ b/db/sqldb/desired_lrp_db_test.go @@ -340,7 +340,7 @@ var _ = Describe("DesiredLRPDB", func() { }) It("returns the desired lrp scheduling info", func() { - schedInfo, err := sqlDB.DesiredLRPSchedulingInfoByProcessGuid(ctx, logger, expectedDesiredLRPSchedulingInfo.ProcessGuid) + schedInfo, err := sqlDB.DesiredLRPSchedulingInfoByProcessGuid(ctx, logger, expectedDesiredLRPSchedulingInfo.DesiredLrpKey.ProcessGuid) Expect(err).NotTo(HaveOccurred()) Expect(*schedInfo).To(BeEquivalentTo(expectedDesiredLRPSchedulingInfo)) @@ -366,7 +366,7 @@ var _ = Describe("DesiredLRPDB", func() { queryStr = test_helpers.ReplaceQuestionMarks(queryStr) } - result, err := db.ExecContext(ctx, queryStr, "{{", expectedDesiredLRPSchedulingInfo.ProcessGuid) + result, err := db.ExecContext(ctx, queryStr, "{{", expectedDesiredLRPSchedulingInfo.DesiredLrpKey.ProcessGuid) Expect(err).NotTo(HaveOccurred()) rowsAffected, err := result.RowsAffected() Expect(err).NotTo(HaveOccurred()) @@ -374,7 +374,7 @@ var _ = Describe("DesiredLRPDB", func() { }) It("returns an invalid record error", func() { - schedInfo, err := sqlDB.DesiredLRPSchedulingInfoByProcessGuid(ctx, logger, expectedDesiredLRPSchedulingInfo.ProcessGuid) + schedInfo, err := sqlDB.DesiredLRPSchedulingInfoByProcessGuid(ctx, logger, expectedDesiredLRPSchedulingInfo.DesiredLrpKey.ProcessGuid) Expect(err).To(HaveOccurred()) Expect(schedInfo).To(BeNil()) }) @@ -455,7 +455,8 @@ var _ = Describe("DesiredLRPDB", func() { JustBeforeEach(func() { Expect(sqlDB.DesireLRP(ctx, logger, expectedDesiredLRP)).To(Succeed()) update = &models.DesiredLRPUpdate{} - update.SetInstances(1) + instances := int32(1) + update.SetInstances(&instances) }) It("updates the lrp", func() { @@ -464,8 +465,10 @@ var _ = Describe("DesiredLRPDB", func() { "blah": (*json.RawMessage)(&routeContent), } update = &models.DesiredLRPUpdate{Routes: &routes} - update.SetInstances(123) - update.SetAnnotation("annotated") + instances := int32(123) + update.SetInstances(&instances) + annotation := "annotated" + update.SetAnnotation(&annotation) _, err := sqlDB.UpdateDesiredLRP(ctx, logger, expectedDesiredLRP.ProcessGuid, update) Expect(err).NotTo(HaveOccurred()) @@ -482,7 +485,8 @@ var _ = Describe("DesiredLRPDB", func() { It("returns the desired lrp from before the update", func() { update = &models.DesiredLRPUpdate{} - update.SetInstances(20) + instances := int32(20) + update.SetInstances(&instances) beforeDesiredLRP, err := sqlDB.UpdateDesiredLRP(ctx, logger, expectedDesiredLRP.ProcessGuid, update) Expect(err).NotTo(HaveOccurred()) @@ -491,7 +495,8 @@ var _ = Describe("DesiredLRPDB", func() { It("updates only the fields in the update parameter", func() { update = &models.DesiredLRPUpdate{} - update.SetInstances(20) + instances := int32(20) + update.SetInstances(&instances) _, err := sqlDB.UpdateDesiredLRP(ctx, logger, expectedDesiredLRP.ProcessGuid, update) Expect(err).NotTo(HaveOccurred()) diff --git a/db/sqldb/evacuation_db.go b/db/sqldb/evacuation_db.go index fb4832ae..ea18fa99 100644 --- a/db/sqldb/evacuation_db.go +++ b/db/sqldb/evacuation_db.go @@ -43,25 +43,26 @@ func (db *SQLDB) EvacuateActualLRP( return err } - if actualLRP.ActualLRPKey.Equal(lrpKey) && - actualLRP.ActualLRPInstanceKey.Equal(instanceKey) && - reflect.DeepEqual(actualLRP.ActualLRPNetInfo, *netInfo) { + if actualLRP.ActualLrpKey.Equal(lrpKey) && + actualLRP.ActualLrpInstanceKey.Equal(instanceKey) && + reflect.DeepEqual(actualLRP.ActualLrpNetInfo, *netInfo) { logger.Debug("evacuating-lrp-already-exists") return models.ErrResourceExists } now := db.clock.Now().UnixNano() actualLRP.ModificationTag.Increment() - actualLRP.ActualLRPKey = *lrpKey - actualLRP.ActualLRPInstanceKey = *instanceKey + actualLRP.ActualLrpKey = *lrpKey + actualLRP.ActualLrpInstanceKey = *instanceKey actualLRP.Since = now - actualLRP.ActualLRPNetInfo = *netInfo + actualLRP.ActualLrpNetInfo = *netInfo actualLRP.ActualLrpInternalRoutes = internalRoutes actualLRP.MetricTags = metricTags actualLRP.AvailabilityZone = availabilityZone actualLRP.Presence = models.ActualLRP_Evacuating - netInfoData, err := db.serializeModel(logger, netInfo) + protoNetInfo := netInfo.ToProto() + netInfoData, err := db.serializeModel(logger, protoNetInfo) if err != nil { logger.Error("failed-serializing-net-info", err) return err @@ -81,9 +82,9 @@ func (db *SQLDB) EvacuateActualLRP( _, err = db.update(ctx, logger, tx, "actual_lrps", helpers.SQLAttributes{ - "domain": actualLRP.Domain, - "instance_guid": actualLRP.InstanceGuid, - "cell_id": actualLRP.CellId, + "domain": actualLRP.ActualLrpKey.Domain, + "instance_guid": actualLRP.ActualLrpInstanceKey.InstanceGuid, + "cell_id": actualLRP.ActualLrpInstanceKey.CellId, "net_info": netInfoData, "internal_routes": internalRoutesData, "metric_tags": metricTagsData, @@ -92,7 +93,7 @@ func (db *SQLDB) EvacuateActualLRP( "modification_tag_index": actualLRP.ModificationTag.Index, }, "process_guid = ? AND instance_index = ? AND presence = ?", - actualLRP.ProcessGuid, actualLRP.Index, models.ActualLRP_Evacuating, + actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, models.ActualLRP_Evacuating, ) if err != nil { logger.Error("failed-update-evacuating-lrp", err) @@ -125,8 +126,8 @@ func (db *SQLDB) RemoveEvacuatingActualLRP(ctx context.Context, logger lager.Log return err } - if !lrp.ActualLRPInstanceKey.Equal(instanceKey) { - logger.Debug("actual-lrp-instance-key-mismatch", lager.Data{"instance_key_param": instanceKey, "instance_key_from_db": lrp.ActualLRPInstanceKey}) + if !lrp.ActualLrpInstanceKey.Equal(instanceKey) { + logger.Debug("actual-lrp-instance-key-mismatch", lager.Data{"instance_key_param": instanceKey, "instance_key_from_db": lrp.ActualLrpInstanceKey}) return models.ErrActualLRPCannotBeRemoved } @@ -155,7 +156,8 @@ func (db *SQLDB) createEvacuatingActualLRP( availabilityZone string, tx helpers.Tx, ) (*models.ActualLRP, error) { - netInfoData, err := db.serializeModel(logger, netInfo) + protoNetInfo := netInfo.ToProto() + netInfoData, err := db.serializeModel(logger, protoNetInfo) if err != nil { logger.Error("failed-serializing-net-info", err) return nil, err @@ -180,9 +182,9 @@ func (db *SQLDB) createEvacuatingActualLRP( } actualLRP := &models.ActualLRP{ - ActualLRPKey: *lrpKey, - ActualLRPInstanceKey: *instanceKey, - ActualLRPNetInfo: *netInfo, + ActualLrpKey: *lrpKey, + ActualLrpInstanceKey: *instanceKey, + ActualLrpNetInfo: *netInfo, ActualLrpInternalRoutes: internalRoutes, MetricTags: metricTags, AvailabilityZone: availabilityZone, @@ -191,15 +193,15 @@ func (db *SQLDB) createEvacuatingActualLRP( ModificationTag: models.ModificationTag{Epoch: guid, Index: 0}, Presence: models.ActualLRP_Evacuating, } - actualLRP.SetRoutable(routable) + actualLRP.SetRoutable(&routable) sqlAttributes := helpers.SQLAttributes{ - "process_guid": actualLRP.ProcessGuid, - "instance_index": actualLRP.Index, + "process_guid": actualLRP.ActualLrpKey.ProcessGuid, + "instance_index": actualLRP.ActualLrpKey.Index, "presence": models.ActualLRP_Evacuating, - "domain": actualLRP.Domain, - "instance_guid": actualLRP.InstanceGuid, - "cell_id": actualLRP.CellId, + "domain": actualLRP.ActualLrpKey.Domain, + "instance_guid": actualLRP.ActualLrpInstanceKey.InstanceGuid, + "cell_id": actualLRP.ActualLrpInstanceKey.CellId, "state": actualLRP.State, "net_info": netInfoData, "internal_routes": internalRoutesData, @@ -214,7 +216,7 @@ func (db *SQLDB) createEvacuatingActualLRP( _, err = db.upsert(ctx, logger, tx, "actual_lrps", sqlAttributes, "process_guid = ? AND instance_index = ? AND presence = ?", - actualLRP.ProcessGuid, actualLRP.Index, models.ActualLRP_Evacuating, + actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, models.ActualLRP_Evacuating, ) if err != nil { logger.Error("failed-inserting-evacuating-lrp", err) diff --git a/db/sqldb/evacuation_db_test.go b/db/sqldb/evacuation_db_test.go index 8d614dd5..236db50d 100644 --- a/db/sqldb/evacuation_db_test.go +++ b/db/sqldb/evacuation_db_test.go @@ -26,13 +26,14 @@ var _ = Describe("Evacuation", func() { actualLRP.ModificationTag = models.ModificationTag{} actualLRP.ModificationTag.Increment() actualLRP.ModificationTag.Increment() - actualLRP.SetRoutable(true) + routable := true + actualLRP.SetRoutable(&routable) - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &actualLRP.ActualLRPInstanceKey) + _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &actualLRP.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), actualLRP.GetRoutable(), actualLRP.AvailabilityZone) + _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), *actualLRP.GetRoutable(), actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -45,8 +46,8 @@ var _ = Describe("Evacuation", func() { } _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Evacuating, - actualLRP.ProcessGuid, - actualLRP.Index, + actualLRP.ActualLrpKey.ProcessGuid, + actualLRP.ActualLrpKey.Index, models.ActualLRP_Ordinary, ) Expect(err).NotTo(HaveOccurred()) @@ -63,11 +64,11 @@ var _ = Describe("Evacuation", func() { Context("when the lrp key changes", func() { BeforeEach(func() { - actualLRP.Domain = "some-other-domain" + actualLRP.ActualLrpKey.Domain = "some-other-domain" }) It("persists the evacuating lrp in sqldb", func() { - evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) + evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -79,11 +80,11 @@ var _ = Describe("Evacuation", func() { Context("when the instance key changes", func() { BeforeEach(func() { - actualLRP.ActualLRPInstanceKey.InstanceGuid = "i am different here me roar" + actualLRP.ActualLrpInstanceKey.InstanceGuid = "i am different here me roar" }) It("persists the evacuating lrp", func() { - evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) + evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -95,13 +96,13 @@ var _ = Describe("Evacuation", func() { Context("when the netinfo changes", func() { BeforeEach(func() { - actualLRP.ActualLRPNetInfo.Ports = []*models.PortMapping{ + actualLRP.ActualLrpNetInfo.Ports = []*models.PortMapping{ models.NewPortMapping(6666, 7777), } }) It("persists the evacuating lrp", func() { - evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) + evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -114,7 +115,7 @@ var _ = Describe("Evacuation", func() { Context("when the evacuating actual lrp already exists", func() { It("returns an ErrResourceExists", func() { - _, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) + _, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) Expect(err).To(Equal(models.ErrResourceExists)) }) }) @@ -126,7 +127,7 @@ var _ = Describe("Evacuation", func() { if test_helpers.UsePostgres() { queryStr = test_helpers.ReplaceQuestionMarks(queryStr) } - _, err := db.ExecContext(ctx, queryStr, actualLRP.ProcessGuid, actualLRP.Index, models.ActualLRP_Evacuating) + _, err := db.ExecContext(ctx, queryStr, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, models.ActualLRP_Evacuating) Expect(err).NotTo(HaveOccurred()) actualLRP.CrashCount = 0 @@ -137,7 +138,7 @@ var _ = Describe("Evacuation", func() { It("creates the evacuating actual lrp", func() { internalRoutes := model_helpers.NewActualLRPInternalRoutes() metricTags := model_helpers.NewActualLRPMetricTags() - evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, internalRoutes, metricTags, true, actualLRP.AvailabilityZone) + evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, internalRoutes, metricTags, true, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -165,12 +166,12 @@ var _ = Describe("Evacuation", func() { queryStr = test_helpers.ReplaceQuestionMarks(queryStr) } _, err := db.ExecContext(ctx, queryStr, - "garbage", actualLRP.ProcessGuid, actualLRP.Index, models.ActualLRP_Evacuating) + "garbage", actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, models.ActualLRP_Evacuating) Expect(err).NotTo(HaveOccurred()) }) It("removes the invalid record and inserts a replacement", func() { - evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) + evacuating, err := sqlDB.EvacuateActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), model_helpers.NewActualLRPMetricTags(), true, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) actualLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -194,12 +195,12 @@ var _ = Describe("Evacuation", func() { if test_helpers.UsePostgres() { queryStr = test_helpers.ReplaceQuestionMarks(queryStr) } - _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Evacuating, actualLRP.ProcessGuid, actualLRP.Index, models.ActualLRP_Ordinary) + _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Evacuating, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, models.ActualLRP_Ordinary) Expect(err).NotTo(HaveOccurred()) }) It("removes the evacuating actual LRP", func() { - err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey) + err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey) Expect(err).ToNot(HaveOccurred()) lrps, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -209,18 +210,18 @@ var _ = Describe("Evacuation", func() { Context("when the actual lrp instance key is not the same", func() { BeforeEach(func() { - actualLRP.CellId = "a different cell" + actualLRP.ActualLrpInstanceKey.CellId = "a different cell" }) It("returns a ErrActualLRPCannotBeRemoved error", func() { - err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey) + err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey) Expect(err).To(Equal(models.ErrActualLRPCannotBeRemoved)) }) }) Context("when the actualLRP is expired", func() { It("does not return an error", func() { - err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey) + err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) lrps, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -232,7 +233,7 @@ var _ = Describe("Evacuation", func() { Context("when the actualLRP does not exist", func() { It("does not return an error", func() { - err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey) + err := sqlDB.RemoveEvacuatingActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) }) }) diff --git a/db/sqldb/lrp_convergence.go b/db/sqldb/lrp_convergence.go index 51c50f73..7033e141 100644 --- a/db/sqldb/lrp_convergence.go +++ b/db/sqldb/lrp_convergence.go @@ -106,13 +106,13 @@ func (c *convergence) staleUnclaimedActualLRPs(ctx context.Context, logger lager if err != nil { continue } - key := models.NewActualLRPKey(schedulingInfo.ProcessGuid, int32(index), schedulingInfo.Domain) + key := models.NewActualLRPKey(schedulingInfo.DesiredLrpKey.ProcessGuid, int32(index), schedulingInfo.DesiredLrpKey.Domain) c.unstartedLRPKeys = append(c.unstartedLRPKeys, &models.ActualLRPKeyWithSchedulingInfo{ Key: &key, SchedulingInfo: schedulingInfo, }) logger.Info("creating-start-request", - lager.Data{"reason": "stale-unclaimed-lrp", "process_guid": schedulingInfo.ProcessGuid, "index": index}) + lager.Data{"reason": "stale-unclaimed-lrp", "process_guid": schedulingInfo.DesiredLrpKey.ProcessGuid, "index": index}) } if rows.Err() != nil { @@ -142,16 +142,16 @@ func (c *convergence) crashedActualLRPs(ctx context.Context, logger lager.Logger continue } - actual.ActualLRPKey = models.NewActualLRPKey(schedulingInfo.ProcessGuid, int32(index), schedulingInfo.Domain) + actual.ActualLrpKey = models.NewActualLRPKey(schedulingInfo.DesiredLrpKey.ProcessGuid, int32(index), schedulingInfo.DesiredLrpKey.Domain) actual.State = models.ActualLRPStateCrashed if actual.ShouldRestartCrash(now, restartCalculator) { c.unstartedLRPKeys = append(c.unstartedLRPKeys, &models.ActualLRPKeyWithSchedulingInfo{ - Key: &actual.ActualLRPKey, + Key: &actual.ActualLrpKey, SchedulingInfo: schedulingInfo, }) logger.Info("creating-start-request", - lager.Data{"reason": "crashed-instance", "process_guid": actual.ProcessGuid, "index": index}) + lager.Data{"reason": "crashed-instance", "process_guid": actual.ActualLrpKey.ProcessGuid, "index": index}) } } @@ -288,8 +288,8 @@ func (c *convergence) lrpsWithMetricTagChanges(ctx context.Context, logger lager continue } desiredMetricTags, err := models.ConvertMetricTags(metricTags, map[models.MetricTagValue_DynamicValue]interface{}{ - models.MetricTagDynamicValueIndex: actualLRPKey.Index, - models.MetricTagDynamicValueInstanceGuid: actualLRPInstanceKey.InstanceGuid, + models.MetricTagValue_MetricTagDynamicValueIndex: actualLRPKey.Index, + models.MetricTagValue_MetricTagDynamicValueInstanceGuid: actualLRPInstanceKey.InstanceGuid, }) if err != nil { logger.Error("converting-metric-tags-failed", err) @@ -455,14 +455,14 @@ func (c *convergence) lrpInstanceCounts(ctx context.Context, logger lager.Logger index := int32(i) c.missingLRPKeys = append(c.missingLRPKeys, &models.ActualLRPKeyWithSchedulingInfo{ Key: &models.ActualLRPKey{ - ProcessGuid: schedulingInfo.ProcessGuid, - Domain: schedulingInfo.Domain, + ProcessGuid: schedulingInfo.DesiredLrpKey.ProcessGuid, + Domain: schedulingInfo.DesiredLrpKey.Domain, Index: index, }, SchedulingInfo: schedulingInfo, }) logger.Info("creating-start-request", - lager.Data{"reason": "missing-instance", "process_guid": schedulingInfo.ProcessGuid, "index": index}) + lager.Data{"reason": "missing-instance", "process_guid": schedulingInfo.DesiredLrpKey.ProcessGuid, "index": index}) } for index := range existingIndices { @@ -471,11 +471,11 @@ func (c *convergence) lrpInstanceCounts(ctx context.Context, logger lager.Logger } // only take destructive actions for fresh domains - if _, ok := domainSet[schedulingInfo.Domain]; ok { + if _, ok := domainSet[schedulingInfo.DesiredLrpKey.Domain]; ok { c.keysToRetire = append(c.keysToRetire, &models.ActualLRPKey{ - ProcessGuid: schedulingInfo.ProcessGuid, + ProcessGuid: schedulingInfo.DesiredLrpKey.ProcessGuid, Index: int32(index), - Domain: schedulingInfo.Domain, + Domain: schedulingInfo.DesiredLrpKey.Domain, }) } } @@ -526,8 +526,8 @@ func (c *convergence) actualLRPsWithMissingCells(ctx context.Context, logger lag if err == nil && presence == models.ActualLRP_Ordinary { ordinaryKeysWithMissingCells = append(ordinaryKeysWithMissingCells, &models.ActualLRPKeyWithSchedulingInfo{ Key: &models.ActualLRPKey{ - ProcessGuid: schedulingInfo.ProcessGuid, - Domain: schedulingInfo.Domain, + ProcessGuid: schedulingInfo.DesiredLrpKey.ProcessGuid, + Domain: schedulingInfo.DesiredLrpKey.Domain, Index: index, }, SchedulingInfo: schedulingInfo, diff --git a/db/sqldb/lrp_convergence_test.go b/db/sqldb/lrp_convergence_test.go index 31f48fff..d64d9a95 100644 --- a/db/sqldb/lrp_convergence_test.go +++ b/db/sqldb/lrp_convergence_test.go @@ -703,7 +703,7 @@ var _ = Describe("LRPConvergence", func() { expectedSched := desiredLRP.DesiredLRPSchedulingInfo() Expect(actualLRPs).To(HaveLen(1)) Expect(keysWithMissingCells).To(ContainElement(&models.ActualLRPKeyWithSchedulingInfo{ - Key: &actualLRPs[0].ActualLRPKey, + Key: &actualLRPs[0].ActualLrpKey, SchedulingInfo: &expectedSched, })) Expect(missingCellIds).To(Equal([]string{"other-cell"})) @@ -742,7 +742,7 @@ var _ = Describe("LRPConvergence", func() { expectedSched := desiredLRP.DesiredLRPSchedulingInfo() Expect(actualLRPs).To(HaveLen(1)) Expect(keysWithMissingCells).To(ContainElement(&models.ActualLRPKeyWithSchedulingInfo{ - Key: &actualLRPs[0].ActualLRPKey, + Key: &actualLRPs[0].ActualLrpKey, SchedulingInfo: &expectedSched, })) }) diff --git a/db/sqldb/suspect_db_test.go b/db/sqldb/suspect_db_test.go index a9c6abd2..5723d1d8 100644 --- a/db/sqldb/suspect_db_test.go +++ b/db/sqldb/suspect_db_test.go @@ -26,18 +26,18 @@ var _ = Describe("Suspect ActualLRPs", func() { actualLRP.ModificationTag.Increment() actualLRP.ModificationTag.Increment() - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &actualLRP.ActualLRPInstanceKey) + _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &actualLRP.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLRPKey, &actualLRP.ActualLRPInstanceKey, &actualLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), nil, false, actualLRP.AvailabilityZone) + _, _, err = sqlDB.StartActualLRP(ctx, logger, &actualLRP.ActualLrpKey, &actualLRP.ActualLrpInstanceKey, &actualLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), nil, false, actualLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) Describe("PromoteSuspectActualLRP", func() { Context("when gettting suspect LRP fails", func() { It("returns an error", func() { - _, _, _, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index) + _, _, _, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index) Expect(err).To(HaveOccurred()) Expect(err).To(Equal(models.ErrResourceNotFound)) }) @@ -60,12 +60,13 @@ var _ = Describe("Suspect ActualLRPs", func() { replacementLRP.ModificationTag.Increment() replacementLRP.ModificationTag.Increment() replacementLRP.MetricTags = nil - replacementLRP.SetRoutable(false) - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &replacementLRP.ActualLRPKey) + routable := false + replacementLRP.SetRoutable(&routable) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &replacementLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.ClaimActualLRP(ctx, logger, replacementGuid, replacementIndex, &replacementLRP.ActualLRPInstanceKey) + _, _, err = sqlDB.ClaimActualLRP(ctx, logger, replacementGuid, replacementIndex, &replacementLRP.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.StartActualLRP(ctx, logger, &replacementLRP.ActualLRPKey, &replacementLRP.ActualLRPInstanceKey, &replacementLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), nil, replacementLRP.GetRoutable(), replacementLRP.AvailabilityZone) + _, _, err = sqlDB.StartActualLRP(ctx, logger, &replacementLRP.ActualLrpKey, &replacementLRP.ActualLrpInstanceKey, &replacementLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), nil, *replacementLRP.GetRoutable(), replacementLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -74,7 +75,7 @@ var _ = Describe("Suspect ActualLRPs", func() { Expect(err).NotTo(HaveOccurred()) Expect(beforeLRPs).To(ConsistOf(replacementLRP)) - _, _, removedLRP, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, replacementLRP.ProcessGuid, replacementLRP.Index) + _, _, removedLRP, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, replacementLRP.ActualLrpKey.ProcessGuid, replacementLRP.ActualLrpKey.Index) Expect(err).To(HaveOccurred()) Expect(removedLRP).To(BeNil()) @@ -91,18 +92,18 @@ var _ = Describe("Suspect ActualLRPs", func() { if test_helpers.UsePostgres() { queryStr = test_helpers.ReplaceQuestionMarks(queryStr) } - _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Suspect, actualLRP.ProcessGuid, actualLRP.Index, models.ActualLRP_Ordinary) + _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Suspect, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, models.ActualLRP_Ordinary) Expect(err).NotTo(HaveOccurred()) }) Context("when there is an ordinary actualLRP with the same key", func() { BeforeEach(func() { replacementLRP := model_helpers.NewValidActualLRP(guid, index) - _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &replacementLRP.ActualLRPKey) + _, err := sqlDB.CreateUnclaimedActualLRP(ctx, logger, &replacementLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &replacementLRP.ActualLRPInstanceKey) + _, _, err = sqlDB.ClaimActualLRP(ctx, logger, guid, index, &replacementLRP.ActualLrpInstanceKey) Expect(err).NotTo(HaveOccurred()) - _, _, err = sqlDB.StartActualLRP(ctx, logger, &replacementLRP.ActualLRPKey, &replacementLRP.ActualLRPInstanceKey, &replacementLRP.ActualLRPNetInfo, model_helpers.NewActualLRPInternalRoutes(), nil, false, replacementLRP.AvailabilityZone) + _, _, err = sqlDB.StartActualLRP(ctx, logger, &replacementLRP.ActualLrpKey, &replacementLRP.ActualLrpInstanceKey, &replacementLRP.ActualLrpNetInfo, model_helpers.NewActualLRPInternalRoutes(), nil, false, replacementLRP.AvailabilityZone) Expect(err).NotTo(HaveOccurred()) }) @@ -110,7 +111,7 @@ var _ = Describe("Suspect ActualLRPs", func() { beforeLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) Expect(err).NotTo(HaveOccurred()) - beforeLRP, afterLRP, removedLRP, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index) + beforeLRP, afterLRP, removedLRP, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index) Expect(err).NotTo(HaveOccurred()) Expect(beforeLRPs).To(ConsistOf(removedLRP, beforeLRP)) @@ -121,7 +122,7 @@ var _ = Describe("Suspect ActualLRPs", func() { }) It("promotes suspect LRP to ordinary", func() { - _, afterLRP, _, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, actualLRP.ProcessGuid, actualLRP.Index) + _, afterLRP, _, err := sqlDB.PromoteSuspectActualLRP(ctx, logger, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index) Expect(err).NotTo(HaveOccurred()) afterLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) @@ -139,7 +140,7 @@ var _ = Describe("Suspect ActualLRPs", func() { if test_helpers.UsePostgres() { queryStr = test_helpers.ReplaceQuestionMarks(queryStr) } - _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Suspect, actualLRP.ProcessGuid, actualLRP.Index, models.ActualLRP_Ordinary) + _, err := db.ExecContext(ctx, queryStr, models.ActualLRP_Suspect, actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index, models.ActualLRP_Ordinary) Expect(err).NotTo(HaveOccurred()) }) @@ -147,7 +148,7 @@ var _ = Describe("Suspect ActualLRPs", func() { beforeLRPs, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: guid, Index: &index}) Expect(err).NotTo(HaveOccurred()) - lrp, err := sqlDB.RemoveSuspectActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + lrp, err := sqlDB.RemoveSuspectActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).ToNot(HaveOccurred()) Expect(beforeLRPs).To(ConsistOf(lrp)) @@ -164,7 +165,7 @@ var _ = Describe("Suspect ActualLRPs", func() { before, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: "some-guid"}) Expect(err).NotTo(HaveOccurred()) - _, err = sqlDB.RemoveSuspectActualLRP(ctx, logger, &actualLRP.ActualLRPKey) + _, err = sqlDB.RemoveSuspectActualLRP(ctx, logger, &actualLRP.ActualLrpKey) Expect(err).NotTo(HaveOccurred()) after, err := sqlDB.ActualLRPs(ctx, logger, models.ActualLRPFilter{ProcessGuid: "some-guid"}) diff --git a/db/sqldb/task_db.go b/db/sqldb/task_db.go index bbdb7903..49f5b707 100644 --- a/db/sqldb/task_db.go +++ b/db/sqldb/task_db.go @@ -15,7 +15,8 @@ func (db *SQLDB) DesireTask(ctx context.Context, logger lager.Logger, taskDef *m logger.Info("starting") defer logger.Info("complete") - taskDefData, err := db.serializeModel(logger, taskDef) + protoTaskDef := taskDef.ToProto() + taskDefData, err := db.serializeModel(logger, protoTaskDef) if err != nil { logger.Error("failed-serializing-task-definition", err) return nil, err @@ -538,7 +539,9 @@ func (db *SQLDB) fetchTaskInternal(logger lager.Logger, scanner helpers.RowScann } var taskDef models.TaskDefinition - err = db.deserializeModel(logger, taskDefData, &taskDef) + var protoTaskDef models.ProtoTaskDefinition + err = db.deserializeModel(logger, taskDefData, &protoTaskDef) + taskDef = *protoTaskDef.FromProto() if err != nil { return nil, guid, models.ErrDeserialize } diff --git a/db/sqldb/task_db_test.go b/db/sqldb/task_db_test.go index cd3e1fef..6030ac32 100644 --- a/db/sqldb/task_db_test.go +++ b/db/sqldb/task_db_test.go @@ -87,7 +87,9 @@ var _ = Describe("TaskDB", func() { Expect(rejectionReason).To(Equal("")) var actualTaskDef models.TaskDefinition - err = serializer.Unmarshal(logger, taskDefData, &actualTaskDef) + var protoActualTaskDef models.ProtoTaskDefinition + err = serializer.Unmarshal(logger, taskDefData, &protoActualTaskDef) + actualTaskDef = *protoActualTaskDef.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(actualTaskDef).To(Equal(*taskDef)) @@ -1250,7 +1252,8 @@ var _ = Describe("TaskDB", func() { }) func insertTask(ctx context.Context, db helpers.QueryableDB, serializer format.Serializer, task *models.Task, malformedTaskDefinition bool) { - taskDefData, err := serializer.Marshal(logger, task.TaskDefinition) + protoTaskDef := task.TaskDefinition.ToProto() + taskDefData, err := serializer.Marshal(logger, protoTaskDef) Expect(err).NotTo(HaveOccurred()) if malformedTaskDefinition { @@ -1284,7 +1287,8 @@ func insertTask(ctx context.Context, db helpers.QueryableDB, serializer format.S } func updateTaskToInvalid(ctx context.Context, db helpers.QueryableDB, serializer format.Serializer, task *models.Task) { - _, err := serializer.Marshal(logger, task.TaskDefinition) + protoTaskDef := task.TaskDefinition.ToProto() + _, err := serializer.Marshal(logger, protoTaskDef) Expect(err).NotTo(HaveOccurred()) taskDefData := []byte("{{{{{{{{{{") diff --git a/events/calculator/actual_lrp_event_calculator_test.go b/events/calculator/actual_lrp_event_calculator_test.go index 2104a331..3908b81e 100644 --- a/events/calculator/actual_lrp_event_calculator_test.go +++ b/events/calculator/actual_lrp_event_calculator_test.go @@ -232,7 +232,7 @@ var _ = Describe("ActualLrpEventCalculator", func() { Context("from UNCLAIMED", func() { BeforeEach(func() { originalLRP.State = models.ActualLRPStateUnclaimed - originalLRP.ActualLRPInstanceKey = models.ActualLRPInstanceKey{} + originalLRP.ActualLrpInstanceKey = models.ActualLRPInstanceKey{} }) It("emits an ActualLRPChanged event", func() { @@ -407,7 +407,7 @@ var _ = Describe("ActualLrpEventCalculator", func() { suspectLRP.Presence = models.ActualLRP_Suspect replacementLRP = model_helpers.NewValidActualLRP("some-guid-1", 0) - replacementLRP.ActualLRPInstanceKey = models.NewActualLRPInstanceKey( + replacementLRP.ActualLrpInstanceKey = models.NewActualLRPInstanceKey( "replacement", "replacement-cell", ) @@ -476,7 +476,7 @@ var _ = Describe("ActualLrpEventCalculator", func() { BeforeEach(func() { unclaimedLRP = model_helpers.NewValidActualLRP("some-guid-1", 0) - unclaimedLRP.ActualLRPInstanceKey = models.ActualLRPInstanceKey{} + unclaimedLRP.ActualLrpInstanceKey = models.ActualLRPInstanceKey{} unclaimedLRP.State = models.ActualLRPStateUnclaimed originalLRP = model_helpers.NewValidActualLRP("some-guid-1", 0) From 0aadbbb465fefeca3a9fa6a885ea0b709f6710e4 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 5 Jun 2024 19:40:38 +0000 Subject: [PATCH 113/155] Added support for deprecated things to be marked as such in the output files Regen protos --- models/actions_bbs.pb.go | 20 ++++-- models/actual_lrp_bbs.pb.go | 1 + models/actual_lrp_requests_bbs.pb.go | 5 ++ models/desired_lrp_bbs.pb.go | 104 ++++++++++++++++----------- models/events_bbs.pb.go | 3 + models/image_layer_bbs.pb.go | 3 +- models/task_bbs.pb.go | 35 ++++----- models/task_requests_bbs.pb.go | 1 + protoc-gen-go-bbs/bbs.go | 42 +++++++++-- 9 files changed, 140 insertions(+), 74 deletions(-) diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index a2285576..eb6a0196 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -892,10 +892,11 @@ func RunActionFromProtoSlice(values []*ProtoRunAction) []*RunAction { // Prevent copylock errors when using ProtoTimeoutAction directly type TimeoutAction struct { - Action *Action `json:"action,omitempty"` - DeprecatedTimeoutNs int64 `json:"timeout,omitempty"` - LogSource string `json:"log_source,omitempty"` - TimeoutMs int64 `json:"timeout_ms"` + Action *Action `json:"action,omitempty"` + // Deprecated: marked deprecated in actions.proto + DeprecatedTimeoutNs int64 `json:"timeout,omitempty"` + LogSource string `json:"log_source,omitempty"` + TimeoutMs int64 `json:"timeout_ms"` } func (this *TimeoutAction) Equal(that interface{}) bool { @@ -950,7 +951,7 @@ func (m *TimeoutAction) SetAction(value *Action) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in actions.proto func (m *TimeoutAction) GetDeprecatedTimeoutNs() int64 { if m != nil { return m.DeprecatedTimeoutNs @@ -959,6 +960,8 @@ func (m *TimeoutAction) GetDeprecatedTimeoutNs() int64 { defaultValue = 0 return defaultValue } + +// Deprecated: marked deprecated in actions.proto func (m *TimeoutAction) SetDeprecatedTimeoutNs(value int64) { if m != nil { m.DeprecatedTimeoutNs = value @@ -1665,7 +1668,8 @@ func CodependentActionFromProtoSlice(values []*ProtoCodependentAction) []*Codepe // Prevent copylock errors when using ProtoResourceLimits directly type ResourceLimits struct { Nofile *uint64 `json:"nofile,omitempty"` - Nproc *uint64 `json:"nproc,omitempty"` + // Deprecated: marked deprecated in actions.proto + Nproc *uint64 `json:"nproc,omitempty"` } func (this *ResourceLimits) Equal(that interface{}) bool { @@ -1723,7 +1727,7 @@ func (m *ResourceLimits) SetNofile(value *uint64) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in actions.proto func (m *ResourceLimits) NprocExists() bool { return m != nil && m.Nproc != nil } @@ -1735,6 +1739,8 @@ func (m *ResourceLimits) GetNproc() *uint64 { defaultValue = 0 return &defaultValue } + +// Deprecated: marked deprecated in actions.proto func (m *ResourceLimits) SetNproc(value *uint64) { if m != nil { m.Nproc = value diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 3ddafb26..4439074e 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -10,6 +10,7 @@ import ( strconv "strconv" ) +// Deprecated: marked deprecated in actual_lrp.proto // Prevent copylock errors when using ProtoActualLRPGroup directly type ActualLRPGroup struct { Instance *ActualLRP `json:"instance,omitempty"` diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index f33e3ae7..42eb87b3 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -97,6 +97,7 @@ func ActualLRPLifecycleResponseFromProtoSlice(values []*ProtoActualLRPLifecycleR return result } +// Deprecated: marked deprecated in actual_lrp_requests.proto // Prevent copylock errors when using ProtoActualLRPGroupsResponse directly type ActualLRPGroupsResponse struct { Error *Error `json:"error,omitempty"` @@ -214,6 +215,7 @@ func ActualLRPGroupsResponseFromProtoSlice(values []*ProtoActualLRPGroupsRespons return result } +// Deprecated: marked deprecated in actual_lrp_requests.proto // Prevent copylock errors when using ProtoActualLRPGroupResponse directly type ActualLRPGroupResponse struct { Error *Error `json:"error,omitempty"` @@ -326,6 +328,7 @@ func ActualLRPGroupResponseFromProtoSlice(values []*ProtoActualLRPGroupResponse) return result } +// Deprecated: marked deprecated in actual_lrp_requests.proto // Prevent copylock errors when using ProtoActualLRPGroupsRequest directly type ActualLRPGroupsRequest struct { Domain string `json:"domain"` @@ -434,6 +437,7 @@ func ActualLRPGroupsRequestFromProtoSlice(values []*ProtoActualLRPGroupsRequest) return result } +// Deprecated: marked deprecated in actual_lrp_requests.proto // Prevent copylock errors when using ProtoActualLRPGroupsByProcessGuidRequest directly type ActualLRPGroupsByProcessGuidRequest struct { ProcessGuid string `json:"process_guid"` @@ -523,6 +527,7 @@ func ActualLRPGroupsByProcessGuidRequestFromProtoSlice(values []*ProtoActualLRPG return result } +// Deprecated: marked deprecated in actual_lrp_requests.proto // Prevent copylock errors when using ProtoActualLRPGroupByProcessGuidAndIndexRequest directly type ActualLRPGroupByProcessGuidAndIndexRequest struct { ProcessGuid string `json:"process_guid"` diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 168f04d8..fd1e8ea0 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -207,20 +207,23 @@ func DesiredLRPSchedulingInfoFromProtoSlice(values []*ProtoDesiredLRPSchedulingI // Prevent copylock errors when using ProtoDesiredLRPRunInfo directly type DesiredLRPRunInfo struct { - DesiredLrpKey DesiredLRPKey `json:"desired_lrp_key"` - EnvironmentVariables []*EnvironmentVariable `json:"env"` - Setup *Action `json:"setup,omitempty"` - Action *Action `json:"action,omitempty"` - Monitor *Action `json:"monitor,omitempty"` - DeprecatedStartTimeoutS uint32 `json:"start_timeout,omitempty"` - Privileged bool `json:"privileged"` - CpuWeight uint32 `json:"cpu_weight"` - Ports []uint32 `json:"ports,omitempty"` - EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` - LogSource string `json:"log_source"` - MetricsGuid string `json:"metrics_guid"` - CreatedAt int64 `json:"created_at"` - CachedDependencies []*CachedDependency `json:"cachedDependencies,omitempty"` + DesiredLrpKey DesiredLRPKey `json:"desired_lrp_key"` + EnvironmentVariables []*EnvironmentVariable `json:"env"` + Setup *Action `json:"setup,omitempty"` + Action *Action `json:"action,omitempty"` + Monitor *Action `json:"monitor,omitempty"` + // Deprecated: marked deprecated in desired_lrp.proto + DeprecatedStartTimeoutS uint32 `json:"start_timeout,omitempty"` + Privileged bool `json:"privileged"` + CpuWeight uint32 `json:"cpu_weight"` + Ports []uint32 `json:"ports,omitempty"` + EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` + LogSource string `json:"log_source"` + // Deprecated: marked deprecated in desired_lrp.proto + MetricsGuid string `json:"metrics_guid"` + CreatedAt int64 `json:"created_at"` + CachedDependencies []*CachedDependency `json:"cachedDependencies,omitempty"` + // Deprecated: marked deprecated in desired_lrp.proto LegacyDownloadUser string `json:"legacy_download_user,omitempty"` TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` @@ -491,7 +494,7 @@ func (m *DesiredLRPRunInfo) SetMonitor(value *Action) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) GetDeprecatedStartTimeoutS() uint32 { if m != nil { return m.DeprecatedStartTimeoutS @@ -500,6 +503,8 @@ func (m *DesiredLRPRunInfo) GetDeprecatedStartTimeoutS() uint32 { defaultValue = 0 return defaultValue } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) SetDeprecatedStartTimeoutS(value uint32) { if m != nil { m.DeprecatedStartTimeoutS = value @@ -567,7 +572,7 @@ func (m *DesiredLRPRunInfo) SetLogSource(value string) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) GetMetricsGuid() string { if m != nil { return m.MetricsGuid @@ -576,6 +581,8 @@ func (m *DesiredLRPRunInfo) GetMetricsGuid() string { defaultValue = "" return defaultValue } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) SetMetricsGuid(value string) { if m != nil { m.MetricsGuid = value @@ -606,7 +613,7 @@ func (m *DesiredLRPRunInfo) SetCachedDependencies(value []*CachedDependency) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) GetLegacyDownloadUser() string { if m != nil { return m.LegacyDownloadUser @@ -615,6 +622,8 @@ func (m *DesiredLRPRunInfo) GetLegacyDownloadUser() string { defaultValue = "" return defaultValue } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) SetLegacyDownloadUser(value string) { if m != nil { m.LegacyDownloadUser = value @@ -1350,29 +1359,32 @@ func DesiredLRPResourceFromProtoSlice(values []*ProtoDesiredLRPResource) []*Desi // Prevent copylock errors when using ProtoDesiredLRP directly type DesiredLRP struct { - ProcessGuid string `json:"process_guid"` - Domain string `json:"domain"` - RootFs string `json:"rootfs"` - Instances int32 `json:"instances"` - EnvironmentVariables []*EnvironmentVariable `json:"env"` - Setup *Action `json:"setup,omitempty"` - Action *Action `json:"action,omitempty"` - StartTimeoutMs int64 `json:"start_timeout_ms"` - DeprecatedStartTimeoutS uint32 `json:"deprecated_timeout_ns,omitempty"` - Monitor *Action `json:"monitor,omitempty"` - DiskMb int32 `json:"disk_mb"` - MemoryMb int32 `json:"memory_mb"` - CpuWeight uint32 `json:"cpu_weight"` - Privileged bool `json:"privileged"` - Ports []uint32 `json:"ports,omitempty"` - Routes *Routes `json:"routes,omitempty"` - LogSource string `json:"log_source"` - LogGuid string `json:"log_guid"` - MetricsGuid string `json:"metrics_guid"` - Annotation string `json:"annotation"` - EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` - ModificationTag *ModificationTag `json:"modification_tag,omitempty"` - CachedDependencies []*CachedDependency `json:"cached_dependencies,omitempty"` + ProcessGuid string `json:"process_guid"` + Domain string `json:"domain"` + RootFs string `json:"rootfs"` + Instances int32 `json:"instances"` + EnvironmentVariables []*EnvironmentVariable `json:"env"` + Setup *Action `json:"setup,omitempty"` + Action *Action `json:"action,omitempty"` + StartTimeoutMs int64 `json:"start_timeout_ms"` + // Deprecated: marked deprecated in desired_lrp.proto + DeprecatedStartTimeoutS uint32 `json:"deprecated_timeout_ns,omitempty"` + Monitor *Action `json:"monitor,omitempty"` + DiskMb int32 `json:"disk_mb"` + MemoryMb int32 `json:"memory_mb"` + CpuWeight uint32 `json:"cpu_weight"` + Privileged bool `json:"privileged"` + Ports []uint32 `json:"ports,omitempty"` + Routes *Routes `json:"routes,omitempty"` + LogSource string `json:"log_source"` + LogGuid string `json:"log_guid"` + // Deprecated: marked deprecated in desired_lrp.proto + MetricsGuid string `json:"metrics_guid"` + Annotation string `json:"annotation"` + EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` + ModificationTag *ModificationTag `json:"modification_tag,omitempty"` + CachedDependencies []*CachedDependency `json:"cached_dependencies,omitempty"` + // Deprecated: marked deprecated in desired_lrp.proto LegacyDownloadUser string `json:"legacy_download_user,omitempty"` TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` @@ -1740,7 +1752,7 @@ func (m *DesiredLRP) SetStartTimeoutMs(value int64) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRP) GetDeprecatedStartTimeoutS() uint32 { if m != nil { return m.DeprecatedStartTimeoutS @@ -1749,6 +1761,8 @@ func (m *DesiredLRP) GetDeprecatedStartTimeoutS() uint32 { defaultValue = 0 return defaultValue } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRP) SetDeprecatedStartTimeoutS(value uint32) { if m != nil { m.DeprecatedStartTimeoutS = value @@ -1869,7 +1883,7 @@ func (m *DesiredLRP) SetLogGuid(value string) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRP) GetMetricsGuid() string { if m != nil { return m.MetricsGuid @@ -1878,6 +1892,8 @@ func (m *DesiredLRP) GetMetricsGuid() string { defaultValue = "" return defaultValue } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRP) SetMetricsGuid(value string) { if m != nil { m.MetricsGuid = value @@ -1930,7 +1946,7 @@ func (m *DesiredLRP) SetCachedDependencies(value []*CachedDependency) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRP) GetLegacyDownloadUser() string { if m != nil { return m.LegacyDownloadUser @@ -1939,6 +1955,8 @@ func (m *DesiredLRP) GetLegacyDownloadUser() string { defaultValue = "" return defaultValue } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRP) SetLegacyDownloadUser(value string) { if m != nil { m.LegacyDownloadUser = value diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 64b4f0a8..a17557f6 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -6,6 +6,7 @@ package models +// Deprecated: marked deprecated in events.proto // Prevent copylock errors when using ProtoActualLRPCreatedEvent directly type ActualLRPCreatedEvent struct { ActualLrpGroup *ActualLRPGroup `json:"actual_lrp_group,omitempty"` @@ -97,6 +98,7 @@ func ActualLRPCreatedEventFromProtoSlice(values []*ProtoActualLRPCreatedEvent) [ return result } +// Deprecated: marked deprecated in events.proto // Prevent copylock errors when using ProtoActualLRPChangedEvent directly type ActualLRPChangedEvent struct { Before *ActualLRPGroup `json:"before,omitempty"` @@ -209,6 +211,7 @@ func ActualLRPChangedEventFromProtoSlice(values []*ProtoActualLRPChangedEvent) [ return result } +// Deprecated: marked deprecated in events.proto // Prevent copylock errors when using ProtoActualLRPRemovedEvent directly type ActualLRPRemovedEvent struct { ActualLrpGroup *ActualLRPGroup `json:"actual_lrp_group,omitempty"` diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index d3901f34..4fa0eb66 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -15,7 +15,8 @@ type ImageLayer_DigestAlgorithm int32 const ( ImageLayer_DigestAlgorithmInvalid ImageLayer_DigestAlgorithm = 0 ImageLayer_DigestAlgorithmSha256 ImageLayer_DigestAlgorithm = 1 - ImageLayer_DigestAlgorithmSha512 ImageLayer_DigestAlgorithm = 2 + // Deprecated: marked deprecated in proto file + ImageLayer_DigestAlgorithmSha512 ImageLayer_DigestAlgorithm = 2 ) // Enum value maps for ImageLayer_DigestAlgorithm diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 8c5976b7..f97a13cb 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -12,21 +12,22 @@ import ( // Prevent copylock errors when using ProtoTaskDefinition directly type TaskDefinition struct { - RootFs string `json:"rootfs"` - EnvironmentVariables []*EnvironmentVariable `json:"env,omitempty"` - Action *Action `json:"action,omitempty"` - DiskMb int32 `json:"disk_mb"` - MemoryMb int32 `json:"memory_mb"` - CpuWeight uint32 `json:"cpu_weight"` - Privileged bool `json:"privileged"` - LogSource string `json:"log_source"` - LogGuid string `json:"log_guid"` - MetricsGuid string `json:"metrics_guid"` - ResultFile string `json:"result_file"` - CompletionCallbackUrl string `json:"completion_callback_url,omitempty"` - Annotation string `json:"annotation,omitempty"` - EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` - CachedDependencies []*CachedDependency `json:"cached_dependencies,omitempty"` + RootFs string `json:"rootfs"` + EnvironmentVariables []*EnvironmentVariable `json:"env,omitempty"` + Action *Action `json:"action,omitempty"` + DiskMb int32 `json:"disk_mb"` + MemoryMb int32 `json:"memory_mb"` + CpuWeight uint32 `json:"cpu_weight"` + Privileged bool `json:"privileged"` + LogSource string `json:"log_source"` + LogGuid string `json:"log_guid"` + MetricsGuid string `json:"metrics_guid"` + ResultFile string `json:"result_file"` + CompletionCallbackUrl string `json:"completion_callback_url,omitempty"` + Annotation string `json:"annotation,omitempty"` + EgressRules []*SecurityGroupRule `json:"egress_rules,omitempty"` + CachedDependencies []*CachedDependency `json:"cached_dependencies,omitempty"` + // Deprecated: marked deprecated in task.proto LegacyDownloadUser string `json:"legacy_download_user,omitempty"` TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` @@ -413,7 +414,7 @@ func (m *TaskDefinition) SetCachedDependencies(value []*CachedDependency) { } } -// DEPRECATED: DO NOT USE +// Deprecated: marked deprecated in task.proto func (m *TaskDefinition) GetLegacyDownloadUser() string { if m != nil { return m.LegacyDownloadUser @@ -422,6 +423,8 @@ func (m *TaskDefinition) GetLegacyDownloadUser() string { defaultValue = "" return defaultValue } + +// Deprecated: marked deprecated in task.proto func (m *TaskDefinition) SetLegacyDownloadUser(value string) { if m != nil { m.LegacyDownloadUser = value diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 3f5196cd..4bbb04fc 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -444,6 +444,7 @@ func StartTaskResponseFromProtoSlice(values []*ProtoStartTaskResponse) []*StartT return result } +// Deprecated: marked deprecated in task_requests.proto // Prevent copylock errors when using ProtoFailTaskRequest directly type FailTaskRequest struct { TaskGuid string `json:"task_guid"` diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index d511b543..b879ce6a 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -59,13 +59,34 @@ func isAlwaysEmit(field *protogen.Field) bool { return isAlwaysEmit.(bool) } +func isMessageDeprecated(msg *protogen.Message) bool { + options := msg.Desc.Options().(*descriptorpb.MessageOptions) + return options.GetDeprecated() +} + +func isFieldDeprecated(field *protogen.Field) bool { + options := field.Desc.Options().(*descriptorpb.FieldOptions) + return options.GetDeprecated() +} + +func isEnumValueDeprecated(enumValue *protogen.EnumValue) bool { + options := enumValue.Desc.Options().(*descriptorpb.EnumValueOptions) + return options.GetDeprecated() +} + func (bbsGenerateHelper) genCopysafeStruct(g *protogen.GeneratedFile, msg *protogen.Message) { if copysafeName, ok := getCopysafeName(g, msg.GoIdent); ok { + if isMessageDeprecated(msg) { + g.P("// Deprecated: marked deprecated in ", msg.Location.SourceFile) + } g.P("// Prevent copylock errors when using ", msg.GoIdent.GoName, " directly") g.P("type ", copysafeName, " struct {") for _, field := range msg.Fields { - options := field.Desc.Options().(*descriptorpb.FieldOptions) + if isFieldDeprecated(field) { + g.P("// Deprecated: marked deprecated in ", msg.Location.SourceFile) + } if *debug { + options := field.Desc.Options().(*descriptorpb.FieldOptions) log.Printf("New Field Detected: %+v\n\n", field) log.Printf("Field Options: %+v\n\n", options) } @@ -186,17 +207,21 @@ func (bbsGenerateHelper) genAccessors(g *protogen.GeneratedFile, msg *protogen.M for _, field := range msg.Fields { fieldName := getFieldName(field.GoName) fieldType := getActualType(g, field) - options := field.Desc.Options().(*descriptorpb.FieldOptions) + deprecated := isFieldDeprecated(field) if *debug { log.Printf("Generating accessors for %s...\n", fieldName) } - if options.GetDeprecated() { - g.P("// DEPRECATED: DO NOT USE") - } if !isByValueType(field) { - genGetter(g, copysafeName, field) //fieldName, fieldType, defaultValue) + if deprecated { + g.P("// Deprecated: marked deprecated in ", msg.Location.SourceFile) + } + genGetter(g, copysafeName, field) + } + + if deprecated { + g.P("// Deprecated: marked deprecated in ", msg.Location.SourceFile) } genSetter(g, copysafeName, fieldName, fieldType) } @@ -213,7 +238,7 @@ func genExists(g *protogen.GeneratedFile, copysafeName string, field *protogen.F g.P("}") } -func genGetter(g *protogen.GeneratedFile, copysafeName string, field *protogen.Field) { //fieldName string, fieldType string, defaultValue string) { +func genGetter(g *protogen.GeneratedFile, copysafeName string, field *protogen.Field) { if *debug { log.Print("Getter...") } @@ -373,6 +398,9 @@ func genEnumTypeWithValues(g *protogen.GeneratedFile, msg *protogen.Message, eNu g.P("type ", copysafeName, " int32") g.P("const (") for _, enumValue := range eNuM.Values { + if isEnumValueDeprecated(enumValue) { + g.P("// Deprecated: marked deprecated in proto file") + } enumValueName := getEnumValueName(g, msg, enumValue) actualValue := enumValue.Desc.Number() From a4a0f77eb7aec9cca5d61738f6e7c5e11701bef0 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 5 Jun 2024 19:44:13 +0000 Subject: [PATCH 114/155] Struct and naming convention changes; Trueing up lint deprecation --- client_test.go | 3 +- .../actual_lrp_lifecycle_controller_test.go | 68 ++--- controllers/evacuation_controller_test.go | 114 ++++---- .../lrp_convergence_controller_test.go | 16 +- controllers/task_controller_test.go | 6 +- events/event_source.go | 3 + handlers/actual_lrp_handlers.go | 4 +- handlers/actual_lrp_handlers_test.go | 117 +++++--- handlers/actual_lrp_lifecycle_handler_test.go | 94 +++--- handlers/cell_handlers_test.go | 19 +- handlers/context_test.go | 7 +- handlers/desired_lrp_handlers_test.go | 269 +++++++++++------- handlers/domain_handlers_test.go | 57 ++-- handlers/evacuation_handler_test.go | 147 +++++++--- handlers/events_handlers_test.go | 2 +- handlers/task_handlers_test.go | 197 ++++++++----- taskworkpool/taskcallback_test.go | 2 +- 17 files changed, 710 insertions(+), 415 deletions(-) diff --git a/client_test.go b/client_test.go index 13455b55..02456a73 100644 --- a/client_test.go +++ b/client_test.go @@ -352,6 +352,7 @@ var _ = Describe("Client", func() { }) JustBeforeEach(func() { + //lint:ignore SA1019 - testing of deprecated code response := &models.ActualLRPGroupsResponse{ //lint:ignore SA1019 - testing of deprecated code ActualLrpGroups: []*models.ActualLRPGroup{ @@ -369,7 +370,7 @@ var _ = Describe("Client", func() { func(w http.ResponseWriter, req *http.Request) { <-blockCh }, - //lint:ignore SA1019 - testing of deprecated code + // lint:ignore SA1019 - testing of deprecated code ghttp.RespondWithProto(200, response.ToProto()), ), ) diff --git a/controllers/actual_lrp_lifecycle_controller_test.go b/controllers/actual_lrp_lifecycle_controller_test.go index 4b592a5c..0500a73a 100644 --- a/controllers/actual_lrp_lifecycle_controller_test.go +++ b/controllers/actual_lrp_lifecycle_controller_test.go @@ -108,16 +108,16 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { JustBeforeEach(func() { actualLRP = &models.ActualLRP{ - ActualLRPKey: actualLRPKey, - ActualLRPInstanceKey: beforeInstanceKey, + ActualLrpKey: actualLRPKey, + ActualLrpInstanceKey: beforeInstanceKey, State: actualLRPState, Since: 1138, Presence: presence, } afterActualLRP = &models.ActualLRP{ - ActualLRPKey: actualLRPKey, - ActualLRPInstanceKey: afterInstanceKey, + ActualLrpKey: actualLRPKey, + ActualLrpInstanceKey: afterInstanceKey, State: afterActualLRPState, Since: 1140, Presence: afterPresence, @@ -184,8 +184,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { suspect := &models.ActualLRP{ State: models.ActualLRPStateRunning, Presence: models.ActualLRP_Suspect, - ActualLRPKey: actualLRPKey, - ActualLRPInstanceKey: models.ActualLRPInstanceKey{ + ActualLrpKey: actualLRPKey, + ActualLrpInstanceKey: models.ActualLRPInstanceKey{ InstanceGuid: "suspect-ig", CellId: "suspect-cell-id", }, @@ -211,8 +211,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { suspectLRP = &models.ActualLRP{ State: models.ActualLRPStateClaimed, Presence: models.ActualLRP_Suspect, - ActualLRPKey: actualLRPKey, - ActualLRPInstanceKey: afterInstanceKey, + ActualLrpKey: actualLRPKey, + ActualLrpInstanceKey: afterInstanceKey, } fakeActualLRPDB.ActualLRPsReturns([]*models.ActualLRP{suspectLRP}, nil) }) @@ -224,7 +224,7 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { unclaimedActualLRP = &models.ActualLRP{ State: models.ActualLRPStateUnclaimed, Presence: models.ActualLRP_Ordinary, - ActualLRPKey: actualLRPKey, + ActualLrpKey: actualLRPKey, } }) @@ -285,11 +285,11 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { suspect = &models.ActualLRP{ Presence: models.ActualLRP_Suspect, State: models.ActualLRPStateRunning, - ActualLRPInstanceKey: models.ActualLRPInstanceKey{ + ActualLrpInstanceKey: models.ActualLRPInstanceKey{ InstanceGuid: "suspect-instance-guid", CellId: "cell-id-1", }, - ActualLRPKey: models.ActualLRPKey{ + ActualLrpKey: models.ActualLRPKey{ ProcessGuid: processGuid, Index: index, Domain: "domain-0", @@ -458,7 +458,7 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { BeforeEach(func() { evacuating = model_helpers.NewValidEvacuatingActualLRP(processGuid, index) - evacuating.ActualLRPKey = actualLRPKey + evacuating.ActualLrpKey = actualLRPKey evacuating.State = models.ActualLRPStateRunning }) @@ -470,8 +470,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { err = controller.StartActualLRP(ctx, logger, &actualLRPKey, &afterInstanceKey, &netInfo, internalRoutes, metricTags, routable, availabilityZone) Expect(fakeEvacuationDB.RemoveEvacuatingActualLRPCallCount()).To(Equal(1)) _, _, lrpKey, lrpInstanceKey := fakeEvacuationDB.RemoveEvacuatingActualLRPArgsForCall(0) - Expect(*lrpKey).To(Equal(evacuating.ActualLRPKey)) - Expect(*lrpInstanceKey).To(Equal(evacuating.ActualLRPInstanceKey)) + Expect(*lrpKey).To(Equal(evacuating.ActualLrpKey)) + Expect(*lrpInstanceKey).To(Equal(evacuating.ActualLrpInstanceKey)) }) It("should emit an ActualLRPChanged event and an ActualLRPRemoved event", func() { @@ -552,8 +552,10 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { Context("when Routable was updated", func() { JustBeforeEach(func() { *actualLRP = *afterActualLRP - actualLRP.SetRoutable(true) - afterActualLRP.SetRoutable(false) + routableTrue := true + routableFalse := false + actualLRP.SetRoutable(&routableTrue) + afterActualLRP.SetRoutable(&routableFalse) fakeActualLRPDB.StartActualLRPReturns(actualLRP, afterActualLRP, nil) fakeActualLRPDB.ActualLRPsReturns([]*models.ActualLRP{actualLRP}, nil) }) @@ -673,8 +675,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { } Expect(events).To(ConsistOf(&models.ActualLRPCrashedEvent{ - ActualLRPKey: actualLRP.ActualLRPKey, - ActualLRPInstanceKey: actualLRP.ActualLRPInstanceKey, + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, Since: afterActualLRP.Since, CrashCount: 1, CrashReason: errorMessage, @@ -714,8 +716,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { Consistently(actualLRPInstanceHub.EmitCallCount).Should(Equal(3)) Expect(actualLRPInstanceHub.EmitArgsForCall(0)).To(Equal(&models.ActualLRPCrashedEvent{ - ActualLRPKey: actualLRP.ActualLRPKey, - ActualLRPInstanceKey: actualLRP.ActualLRPInstanceKey, + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, Since: afterActualLRP.Since, CrashCount: 1, CrashReason: errorMessage, @@ -750,8 +752,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { Consistently(actualLRPInstanceHub.EmitCallCount).Should(Equal(2)) Expect(actualLRPInstanceHub.EmitArgsForCall(0)).To(Equal(&models.ActualLRPCrashedEvent{ - ActualLRPKey: actualLRP.ActualLRPKey, - ActualLRPInstanceKey: actualLRP.ActualLRPInstanceKey, + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, Since: afterActualLRP.Since, CrashCount: 1, CrashReason: errorMessage, @@ -798,8 +800,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { JustBeforeEach(func() { suspectInstanceKey := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1") suspectLRP = &models.ActualLRP{ - ActualLRPKey: actualLRPKey, - ActualLRPInstanceKey: suspectInstanceKey, + ActualLrpKey: actualLRPKey, + ActualLrpInstanceKey: suspectInstanceKey, State: suspectInstanceState, Presence: models.ActualLRP_Suspect, } @@ -823,8 +825,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { Consistently(actualLRPInstanceHub.EmitCallCount).Should(Equal(3)) Expect(actualLRPInstanceHub.EmitArgsForCall(0)).To(Equal(&models.ActualLRPCrashedEvent{ - ActualLRPKey: actualLRP.ActualLRPKey, - ActualLRPInstanceKey: actualLRP.ActualLRPInstanceKey, + ActualLrpKey: actualLRP.ActualLrpKey, + ActualLrpInstanceKey: actualLRP.ActualLrpInstanceKey, Since: afterActualLRP.Since, CrashCount: 1, CrashReason: errorMessage, @@ -931,7 +933,7 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { BeforeEach(func() { replacementLRP = &models.ActualLRP{ - ActualLRPKey: actualLRPKey, + ActualLrpKey: actualLRPKey, State: models.ActualLRPStateUnclaimed, Presence: models.ActualLRP_Ordinary, } @@ -976,8 +978,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { BeforeEach(func() { ordinaryInstanceKey := models.NewActualLRPInstanceKey("instance-guid-1", "cell-id-1") replacementLRP = &models.ActualLRP{ - ActualLRPKey: actualLRPKey, - ActualLRPInstanceKey: ordinaryInstanceKey, + ActualLrpKey: actualLRPKey, + ActualLrpInstanceKey: ordinaryInstanceKey, State: models.ActualLRPStateClaimed, Presence: models.ActualLRP_Ordinary, } @@ -1105,8 +1107,8 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { Context("when there is a Suspect LRP running", func() { JustBeforeEach(func() { - suspectLRP := model_helpers.NewValidActualLRP(actualLRP.ProcessGuid, actualLRP.Index) - suspectLRP.Domain = actualLRP.Domain + suspectLRP := model_helpers.NewValidActualLRP(actualLRP.ActualLrpKey.ProcessGuid, actualLRP.ActualLrpKey.Index) + suspectLRP.ActualLrpKey.Domain = actualLRP.ActualLrpKey.Domain suspectLRP.Presence = models.ActualLRP_Suspect fakeActualLRPDB.ActualLRPsReturns([]*models.ActualLRP{suspectLRP, actualLRP}, nil) @@ -1388,7 +1390,7 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { _, _, deletedLRPGuid, deletedLRPIndex, deletedLRPInstanceKey := fakeActualLRPDB.RemoveActualLRPArgsForCall(0) Expect(deletedLRPGuid).To(Equal(processGuid)) Expect(deletedLRPIndex).To(Equal(index)) - Expect(deletedLRPInstanceKey).To(Equal(&actualLRP.ActualLRPInstanceKey)) + Expect(deletedLRPInstanceKey).To(Equal(&actualLRP.ActualLrpInstanceKey)) }) It("emits a removed event to the hub", func() { @@ -1451,7 +1453,7 @@ var _ = Describe("ActualLRP Lifecycle Controller", func() { _, _, deletedLRPGuid, deletedLRPIndex, deletedLRPInstanceKey := fakeActualLRPDB.RemoveActualLRPArgsForCall(0) Expect(deletedLRPGuid).To(Equal(processGuid)) Expect(deletedLRPIndex).To(Equal(index)) - Expect(deletedLRPInstanceKey).To(Equal(&actualLRP.ActualLRPInstanceKey)) + Expect(deletedLRPInstanceKey).To(Equal(&actualLRP.ActualLrpInstanceKey)) }) It("emits a removed event to the hub", func() { diff --git a/controllers/evacuation_controller_test.go b/controllers/evacuation_controller_test.go index 47bfd052..d592b124 100644 --- a/controllers/evacuation_controller_test.go +++ b/controllers/evacuation_controller_test.go @@ -86,16 +86,16 @@ var _ = Describe("Evacuation Controller", func() { instanceKey := models.NewActualLRPInstanceKey("instance-guid", "cell-id") evacuatingInstanceKey = models.NewActualLRPInstanceKey("evacuating-instance-guid", "evacuating-cell-id") actual = &models.ActualLRP{ - ActualLRPInstanceKey: instanceKey, + ActualLrpInstanceKey: instanceKey, } evacuatingLRP = &models.ActualLRP{ - ActualLRPInstanceKey: evacuatingInstanceKey, + ActualLrpInstanceKey: evacuatingInstanceKey, Presence: models.ActualLRP_Evacuating, } replacementInstanceKey = models.NewActualLRPInstanceKey("replacement-instance-guid", "replacement-cell-id") replacementActual = &models.ActualLRP{ - ActualLRPInstanceKey: replacementInstanceKey, + ActualLrpInstanceKey: replacementInstanceKey, State: models.ActualLRPStateClaimed, PlacementError: "some-placement-error", } @@ -244,8 +244,8 @@ var _ = Describe("Evacuation Controller", func() { afterActualLRP = model_helpers.NewValidActualLRP("process-guid", 1) afterActualLRP.State = models.ActualLRPStateUnclaimed - lrpKey = &actualLRP.ActualLRPKey - lrpInstanceKey = &actualLRP.ActualLRPInstanceKey + lrpKey = &actualLRP.ActualLrpKey + lrpInstanceKey = &actualLRP.ActualLrpInstanceKey fakeActualLRPDB.UnclaimActualLRPReturns(actualLRP, afterActualLRP, nil) }) @@ -268,7 +268,7 @@ var _ = Describe("Evacuation Controller", func() { _, _, guid := fakeDesiredLRPDB.DesiredLRPSchedulingInfoByProcessGuidArgsForCall(0) Expect(guid).To(Equal("process-guid")) - expectedStartRequest := auctioneer.NewLRPStartRequestFromModel(desiredLRP, int(actualLRP.Index)) + expectedStartRequest := auctioneer.NewLRPStartRequestFromModel(desiredLRP, int(actualLRP.ActualLrpKey.Index)) Expect(fakeAuctioneerClient.RequestLRPAuctionsCallCount()).To(Equal(1)) _, actualTraceId, startRequests := fakeAuctioneerClient.RequestLRPAuctionsArgsForCall(0) Expect(startRequests).To(Equal([]*auctioneer.LRPStartRequest{&expectedStartRequest})) @@ -498,8 +498,8 @@ var _ = Describe("Evacuation Controller", func() { ordinaryActualLRP = model_helpers.NewValidActualLRP("process-guid", 1) ordinaryActualLRP.State = models.ActualLRPStateClaimed ordinaryActualLRP.Presence = models.ActualLRP_Ordinary - ordinaryActualLRP.ActualLRPInstanceKey.InstanceGuid = "another-instance" - ordinaryActualLRP.ActualLRPInstanceKey.CellId = "another-cell" + ordinaryActualLRP.ActualLrpInstanceKey.InstanceGuid = "another-instance" + ordinaryActualLRP.ActualLrpInstanceKey.CellId = "another-cell" fakeActualLRPDB.ActualLRPsReturns([]*models.ActualLRP{actualLRP, ordinaryActualLRP}, nil) }) @@ -553,8 +553,8 @@ var _ = Describe("Evacuation Controller", func() { BeforeEach(func() { actualLRP = model_helpers.NewValidActualLRP("process-guid", 1) - key = actualLRP.ActualLRPKey - instanceKey = actualLRP.ActualLRPInstanceKey + key = actualLRP.ActualLrpKey + instanceKey = actualLRP.ActualLrpInstanceKey fakeActualLRPDB.ActualLRPsReturns([]*models.ActualLRP{actualLRP}, nil) errMessage = "i failed" }) @@ -570,8 +570,8 @@ var _ = Describe("Evacuation Controller", func() { It("crashes the actual lrp instance", func() { Expect(fakeActualLRPDB.CrashActualLRPCallCount()).To(Equal(1)) _, _, key, instanceKey, errorMessage := fakeActualLRPDB.CrashActualLRPArgsForCall(0) - Expect(*key).To(Equal(actualLRP.ActualLRPKey)) - Expect(*instanceKey).To(Equal(actualLRP.ActualLRPInstanceKey)) + Expect(*key).To(Equal(actualLRP.ActualLrpKey)) + Expect(*instanceKey).To(Equal(actualLRP.ActualLrpInstanceKey)) Expect(errorMessage).To(Equal("i failed")) }) @@ -582,7 +582,7 @@ var _ = Describe("Evacuation Controller", func() { Context("when the actual lrp is not in the db", func() { BeforeEach(func() { - actualLRP.ActualLRPInstanceKey.CellId = "some-random-cell" + actualLRP.ActualLrpInstanceKey.CellId = "some-random-cell" fakeActualLRPDB.ActualLRPsReturns([]*models.ActualLRP{actualLRP}, nil) }) @@ -638,8 +638,8 @@ var _ = Describe("Evacuation Controller", func() { It("removes the evacuating actual lrp", func() { Expect(fakeEvacuationDB.RemoveEvacuatingActualLRPCallCount()).To(Equal(1)) _, _, key, instanceKey := fakeEvacuationDB.RemoveEvacuatingActualLRPArgsForCall(0) - Expect(*key).To(Equal(actualLRP.ActualLRPKey)) - Expect(*instanceKey).To(Equal(actualLRP.ActualLRPInstanceKey)) + Expect(*key).To(Equal(actualLRP.ActualLrpKey)) + Expect(*instanceKey).To(Equal(actualLRP.ActualLrpInstanceKey)) }) It("emits events to the hub", func() { @@ -687,8 +687,8 @@ var _ = Describe("Evacuation Controller", func() { It("removes the suspect lrp", func() { Expect(fakeSuspectDB.RemoveSuspectActualLRPCallCount()).To(Equal(1)) _, _, lrpKey := fakeSuspectDB.RemoveSuspectActualLRPArgsForCall(0) - Expect(lrpKey.ProcessGuid).To(Equal(actualLRP.ProcessGuid)) - Expect(lrpKey.Index).To(Equal(actualLRP.Index)) + Expect(lrpKey.ProcessGuid).To(Equal(actualLRP.ActualLrpKey.ProcessGuid)) + Expect(lrpKey.Index).To(Equal(actualLRP.ActualLrpKey.Index)) }) It("emits ActualLRPRemovedEvent", func() { @@ -754,9 +754,9 @@ var _ = Describe("Evacuation Controller", func() { afterActual = model_helpers.NewValidActualLRP("the-guid", 1) afterActual.Presence = models.ActualLRP_Evacuating - targetKey = actual.ActualLRPKey - targetInstanceKey = actual.ActualLRPInstanceKey - netInfo = actual.ActualLRPNetInfo + targetKey = actual.ActualLrpKey + targetInstanceKey = actual.ActualLrpInstanceKey + netInfo = actual.ActualLrpNetInfo internalRoutes = actual.ActualLrpInternalRoutes metricTags = actual.MetricTags availabilityZone = actual.AvailabilityZone @@ -779,7 +779,7 @@ var _ = Describe("Evacuation Controller", func() { Context("when the actual LRP instance is already evacuating", func() { BeforeEach(func() { actualLRPs = []*models.ActualLRP{evacuatingActual} - targetInstanceKey = evacuatingActual.ActualLRPInstanceKey + targetInstanceKey = evacuatingActual.ActualLrpInstanceKey }) It("removes the evacuating lrp and does not keep the container", func() { @@ -788,8 +788,8 @@ var _ = Describe("Evacuation Controller", func() { Expect(fakeEvacuationDB.RemoveEvacuatingActualLRPCallCount()).To(Equal(1)) _, _, actualLRPKey, actualLRPInstanceKey := fakeEvacuationDB.RemoveEvacuatingActualLRPArgsForCall(0) - Expect(*actualLRPKey).To(Equal(evacuatingActual.ActualLRPKey)) - Expect(*actualLRPInstanceKey).To(Equal(evacuatingActual.ActualLRPInstanceKey)) + Expect(*actualLRPKey).To(Equal(evacuatingActual.ActualLrpKey)) + Expect(*actualLRPInstanceKey).To(Equal(evacuatingActual.ActualLrpInstanceKey)) }) It("emits events to the hub", func() { @@ -875,7 +875,7 @@ var _ = Describe("Evacuation Controller", func() { Context("when the instance is unclaimed", func() { BeforeEach(func() { actual.State = models.ActualLRPStateUnclaimed - actual.ActualLRPInstanceKey = models.ActualLRPInstanceKey{} + actual.ActualLrpInstanceKey = models.ActualLRPInstanceKey{} actualLRPs = []*models.ActualLRP{actual} }) @@ -992,7 +992,7 @@ var _ = Describe("Evacuation Controller", func() { Context("when there's an existing evacuating instance on the cell the request came from", func() { BeforeEach(func() { - evacuatingActual.CellId = "some-other-cell" + evacuatingActual.ActualLrpInstanceKey.CellId = "some-other-cell" actualLRPs = []*models.ActualLRP{actual, evacuatingActual} fakeEvacuationDB.EvacuateActualLRPReturns(nil, models.ErrResourceExists) }) @@ -1027,9 +1027,9 @@ var _ = Describe("Evacuation Controller", func() { Expect(fakeEvacuationDB.EvacuateActualLRPCallCount()).To(Equal(1)) _, _, actualLRPKey, actualLRPInstanceKey, actualLrpNetInfo, actualLRPInternalRoutes, actualLRPMetricTags, actualRoutable, actualAvailabilityZone := fakeEvacuationDB.EvacuateActualLRPArgsForCall(0) - Expect(*actualLRPKey).To(Equal(actual.ActualLRPKey)) - Expect(*actualLRPInstanceKey).To(Equal(actual.ActualLRPInstanceKey)) - Expect(*actualLrpNetInfo).To(Equal(actual.ActualLRPNetInfo)) + Expect(*actualLRPKey).To(Equal(actual.ActualLrpKey)) + Expect(*actualLRPInstanceKey).To(Equal(actual.ActualLrpInstanceKey)) + Expect(*actualLrpNetInfo).To(Equal(actual.ActualLrpNetInfo)) Expect(actualLRPInternalRoutes).To(Equal(actual.ActualLrpInternalRoutes)) Expect(actualLRPMetricTags).To(Equal(actual.MetricTags)) Expect(actualRoutable).To(Equal(false)) @@ -1039,16 +1039,16 @@ var _ = Describe("Evacuation Controller", func() { It("unclaims the lrp and requests an auction", func() { Expect(fakeActualLRPDB.UnclaimActualLRPCallCount()).To(Equal(1)) _, _, actualLRPKey, actualLRPInstanceKey, actualLrpNetInfo, actualLRPInternalRoutes, actualLRPMetricTags, actualRoutable, actualAvailabilityZone := fakeEvacuationDB.EvacuateActualLRPArgsForCall(0) - Expect(*actualLRPKey).To(Equal(actual.ActualLRPKey)) - Expect(*actualLRPInstanceKey).To(Equal(actual.ActualLRPInstanceKey)) - Expect(*actualLrpNetInfo).To(Equal(actual.ActualLRPNetInfo)) + Expect(*actualLRPKey).To(Equal(actual.ActualLrpKey)) + Expect(*actualLRPInstanceKey).To(Equal(actual.ActualLrpInstanceKey)) + Expect(*actualLrpNetInfo).To(Equal(actual.ActualLrpNetInfo)) Expect(actualLRPInternalRoutes).To(Equal(actual.ActualLrpInternalRoutes)) Expect(actualLRPMetricTags).To(Equal(actual.MetricTags)) Expect(actualRoutable).To(Equal(false)) Expect(actualAvailabilityZone).To(Equal(actual.AvailabilityZone)) schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() - expectedStartRequest := auctioneer.NewLRPStartRequestFromSchedulingInfo(&schedulingInfo, int(actual.Index)) + expectedStartRequest := auctioneer.NewLRPStartRequestFromSchedulingInfo(&schedulingInfo, int(actual.ActualLrpKey.Index)) Expect(fakeAuctioneerClient.RequestLRPAuctionsCallCount()).To(Equal(1)) _, actualTraceId, startRequests := fakeAuctioneerClient.RequestLRPAuctionsArgsForCall(0) @@ -1132,9 +1132,9 @@ var _ = Describe("Evacuation Controller", func() { Expect(fakeEvacuationDB.EvacuateActualLRPCallCount()).To(Equal(1)) _, _, actualLRPKey, actualLRPInstanceKey, actualLrpNetInfo, actualLRPInternalRoutes, actualLRPMetricTags, actualRoutable, actualAvailabilityZone := fakeEvacuationDB.EvacuateActualLRPArgsForCall(0) - Expect(*actualLRPKey).To(Equal(actual.ActualLRPKey)) - Expect(*actualLRPInstanceKey).To(Equal(actual.ActualLRPInstanceKey)) - Expect(*actualLrpNetInfo).To(Equal(actual.ActualLRPNetInfo)) + Expect(*actualLRPKey).To(Equal(actual.ActualLrpKey)) + Expect(*actualLRPInstanceKey).To(Equal(actual.ActualLrpInstanceKey)) + Expect(*actualLrpNetInfo).To(Equal(actual.ActualLrpNetInfo)) Expect(actualLRPInternalRoutes).To(Equal(actual.ActualLrpInternalRoutes)) Expect(actualLRPMetricTags).To(Equal(actual.MetricTags)) Expect(actualRoutable).To(Equal(false)) @@ -1144,11 +1144,11 @@ var _ = Describe("Evacuation Controller", func() { It("unclaims the lrp and requests an auction", func() { Expect(fakeActualLRPDB.UnclaimActualLRPCallCount()).To(Equal(1)) _, _, lrpKey := fakeActualLRPDB.UnclaimActualLRPArgsForCall(0) - Expect(lrpKey.ProcessGuid).To(Equal(actual.ProcessGuid)) - Expect(lrpKey.Index).To(Equal(actual.Index)) + Expect(lrpKey.ProcessGuid).To(Equal(actual.ActualLrpKey.ProcessGuid)) + Expect(lrpKey.Index).To(Equal(actual.ActualLrpKey.Index)) schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() - expectedStartRequest := auctioneer.NewLRPStartRequestFromSchedulingInfo(&schedulingInfo, int(actual.Index)) + expectedStartRequest := auctioneer.NewLRPStartRequestFromSchedulingInfo(&schedulingInfo, int(actual.ActualLrpKey.Index)) Expect(fakeAuctioneerClient.RequestLRPAuctionsCallCount()).To(Equal(1)) _, actualTraceId, startRequests := fakeAuctioneerClient.RequestLRPAuctionsArgsForCall(0) @@ -1164,7 +1164,7 @@ var _ = Describe("Evacuation Controller", func() { BeforeEach(func() { ordinary = model_helpers.NewValidActualLRP("the-guid", 1) ordinary.State = models.ActualLRPStateUnclaimed - ordinary.ActualLRPInstanceKey = models.ActualLRPInstanceKey{ + ordinary.ActualLrpInstanceKey = models.ActualLRPInstanceKey{ InstanceGuid: "replacement-guid", CellId: "replacement-cell", } @@ -1176,8 +1176,8 @@ var _ = Describe("Evacuation Controller", func() { It("removes the suspect LRP", func() { Expect(fakeSuspectDB.RemoveSuspectActualLRPCallCount()).To(Equal(1)) _, _, lrpKey := fakeSuspectDB.RemoveSuspectActualLRPArgsForCall(0) - Expect(lrpKey.ProcessGuid).To(Equal(actual.ProcessGuid)) - Expect(lrpKey.Index).To(Equal(actual.Index)) + Expect(lrpKey.ProcessGuid).To(Equal(actual.ActualLrpKey.ProcessGuid)) + Expect(lrpKey.Index).To(Equal(actual.ActualLrpKey.Index)) }) It("does not unclaim the LRP", func() { @@ -1221,8 +1221,8 @@ var _ = Describe("Evacuation Controller", func() { BeforeEach(func() { replacementActual = model_helpers.NewValidActualLRP("the-guid", 1) replacementActual.State = models.ActualLRPStateClaimed - replacementActual.CellId = "other-cell" - replacementActual.InstanceGuid = "other-guid" + replacementActual.ActualLrpInstanceKey.CellId = "other-cell" + replacementActual.ActualLrpInstanceKey.InstanceGuid = "other-guid" actualLRPs = append(actualLRPs, replacementActual) }) @@ -1364,8 +1364,8 @@ var _ = Describe("Evacuation Controller", func() { Expect(fakeEvacuationDB.RemoveEvacuatingActualLRPCallCount()).To(Equal(1)) _, _, actualLRPKey, actualLRPInstanceKey := fakeEvacuationDB.RemoveEvacuatingActualLRPArgsForCall(0) - Expect(*actualLRPKey).To(Equal(evacuatingActual.ActualLRPKey)) - Expect(*actualLRPInstanceKey).To(Equal(evacuatingActual.ActualLRPInstanceKey)) + Expect(*actualLRPKey).To(Equal(evacuatingActual.ActualLrpKey)) + Expect(*actualLRPInstanceKey).To(Equal(evacuatingActual.ActualLrpInstanceKey)) }) It("emits events to the hub", func() { @@ -1425,8 +1425,8 @@ var _ = Describe("Evacuation Controller", func() { Context("when the instance is crashed", func() { BeforeEach(func() { actual.State = models.ActualLRPStateCrashed - targetInstanceKey = evacuatingActual.ActualLRPInstanceKey - targetKey = evacuatingActual.ActualLRPKey + targetInstanceKey = evacuatingActual.ActualLrpInstanceKey + targetKey = evacuatingActual.ActualLrpKey actualLRPs = []*models.ActualLRP{actual, evacuatingActual} }) @@ -1436,8 +1436,8 @@ var _ = Describe("Evacuation Controller", func() { Expect(fakeEvacuationDB.RemoveEvacuatingActualLRPCallCount()).To(Equal(1)) _, _, actualLRPKey, actualLRPInstanceKey := fakeEvacuationDB.RemoveEvacuatingActualLRPArgsForCall(0) - Expect(*actualLRPKey).To(Equal(evacuatingActual.ActualLRPKey)) - Expect(*actualLRPInstanceKey).To(Equal(evacuatingActual.ActualLRPInstanceKey)) + Expect(*actualLRPKey).To(Equal(evacuatingActual.ActualLrpKey)) + Expect(*actualLRPInstanceKey).To(Equal(evacuatingActual.ActualLrpInstanceKey)) }) Context("when removing the evacuating LRP fails", func() { @@ -1495,8 +1495,8 @@ var _ = Describe("Evacuation Controller", func() { evacuating, }, nil) - targetInstanceKey = actual.ActualLRPInstanceKey - targetKey = actual.ActualLRPKey + targetInstanceKey = actual.ActualLrpInstanceKey + targetKey = actual.ActualLrpKey }) JustBeforeEach(func() { @@ -1538,7 +1538,7 @@ var _ = Describe("Evacuation Controller", func() { _, _, guid, index, actualLRPInstanceKey := fakeActualLRPDB.RemoveActualLRPArgsForCall(0) Expect(guid).To(Equal("process-guid")) Expect(index).To(BeEquivalentTo(1)) - Expect(actualLRPInstanceKey).To(Equal(&actual.ActualLRPInstanceKey)) + Expect(actualLRPInstanceKey).To(Equal(&actual.ActualLrpInstanceKey)) }) Context("when the LRP Instance is missing", func() { @@ -1564,8 +1564,8 @@ var _ = Describe("Evacuation Controller", func() { Expect(fakeEvacuationDB.RemoveEvacuatingActualLRPCallCount()).To(Equal(0)) _, _, lrpKey := fakeSuspectDB.RemoveSuspectActualLRPArgsForCall(0) - Expect(lrpKey.ProcessGuid).To(Equal(actual.ProcessGuid)) - Expect(lrpKey.Index).To(Equal(actual.Index)) + Expect(lrpKey.ProcessGuid).To(Equal(actual.ActualLrpKey.ProcessGuid)) + Expect(lrpKey.Index).To(Equal(actual.ActualLrpKey.Index)) }) It("emits ActualLRPRemovedEvent", func() { @@ -1614,7 +1614,7 @@ var _ = Describe("Evacuation Controller", func() { Context("when the LRP presence is Evacuating", func() { BeforeEach(func() { - targetInstanceKey = evacuating.ActualLRPInstanceKey + targetInstanceKey = evacuating.ActualLrpInstanceKey }) It("removes the evacuating actual lrp", func() { @@ -1622,8 +1622,8 @@ var _ = Describe("Evacuation Controller", func() { Expect(fakeActualLRPDB.RemoveActualLRPCallCount()).To(Equal(0)) _, _, lrpKey, lrpInstanceKey := fakeEvacuationDB.RemoveEvacuatingActualLRPArgsForCall(0) - Expect(*lrpKey).To(Equal(evacuating.ActualLRPKey)) - Expect(*lrpInstanceKey).To(Equal(evacuating.ActualLRPInstanceKey)) + Expect(*lrpKey).To(Equal(evacuating.ActualLrpKey)) + Expect(*lrpInstanceKey).To(Equal(evacuating.ActualLrpInstanceKey)) }) It("emits a removal event for the evacuating actual LRP", func() { diff --git a/controllers/lrp_convergence_controller_test.go b/controllers/lrp_convergence_controller_test.go index 42024aaf..fa18686e 100644 --- a/controllers/lrp_convergence_controller_test.go +++ b/controllers/lrp_convergence_controller_test.go @@ -425,7 +425,7 @@ var _ = Describe("LRP Convergence Controllers", func() { suspectActualLRP = model_helpers.NewValidActualLRP("to-unclaim-1", 0) keysWithMissingCells = []*models.ActualLRPKeyWithSchedulingInfo{ - {Key: &suspectActualLRP.ActualLRPKey, SchedulingInfo: &desiredLRP1}, + {Key: &suspectActualLRP.ActualLrpKey, SchedulingInfo: &desiredLRP1}, } fakeLRPDB.ConvergeLRPsReturns(db.ConvergenceResult{ KeysWithMissingCells: keysWithMissingCells, @@ -450,14 +450,14 @@ var _ = Describe("LRP Convergence Controllers", func() { _, _, key, from, to := fakeLRPDB.ChangeActualLRPPresenceArgsForCall(0) Expect(from).To(Equal(models.ActualLRP_Ordinary)) Expect(to).To(Equal(models.ActualLRP_Suspect)) - Expect(key).To(Equal(&suspectActualLRP.ActualLRPKey)) + Expect(key).To(Equal(&suspectActualLRP.ActualLrpKey)) }) It("creates a new unclaimed LRP", func() { Expect(fakeLRPDB.CreateUnclaimedActualLRPCallCount()).To(Equal(1)) _, _, lrpKey := fakeLRPDB.CreateUnclaimedActualLRPArgsForCall(0) - Expect(lrpKey).To(Equal(&suspectActualLRP.ActualLRPKey)) + Expect(lrpKey).To(Equal(&suspectActualLRP.ActualLrpKey)) }) It("auctions new lrps", func() { @@ -498,7 +498,7 @@ var _ = Describe("LRP Convergence Controllers", func() { Context("when there already is a Suspect LRP", func() { BeforeEach(func() { suspectLRPKeys := []*models.ActualLRPKey{ - &suspectActualLRP.ActualLRPKey, + &suspectActualLRP.ActualLrpKey, } fakeLRPDB.ConvergeLRPsReturns(db.ConvergenceResult{ KeysWithMissingCells: keysWithMissingCells, @@ -567,7 +567,7 @@ var _ = Describe("LRP Convergence Controllers", func() { removedActualLRP = model_helpers.NewValidActualLRP("removed-1", 0) suspectActualLRP.Presence = models.ActualLRP_Suspect - suspectKeysWithExistingCells = []*models.ActualLRPKey{&suspectActualLRP.ActualLRPKey} + suspectKeysWithExistingCells = []*models.ActualLRPKey{&suspectActualLRP.ActualLrpKey} fakeLRPDB.ActualLRPsReturns([]*models.ActualLRP{ordinaryActualLRP}, nil) fakeLRPDB.ConvergeLRPsReturns(db.ConvergenceResult{ @@ -693,7 +693,7 @@ var _ = Describe("LRP Convergence Controllers", func() { BeforeEach(func() { retiringActualLRP1 = model_helpers.NewValidActualLRP("to-retire-1", 0) retiringActualLRP2 = model_helpers.NewValidActualLRP("to-retire-2", 1) - keysToRetire = []*models.ActualLRPKey{&retiringActualLRP1.ActualLRPKey, &retiringActualLRP2.ActualLRPKey} + keysToRetire = []*models.ActualLRPKey{&retiringActualLRP1.ActualLrpKey, &retiringActualLRP2.ActualLrpKey} result := db.ConvergenceResult{ KeysToRetire: keysToRetire, @@ -721,8 +721,8 @@ var _ = Describe("LRP Convergence Controllers", func() { stoppedKeys[i] = key } - Expect(stoppedKeys).To(ContainElement(&retiringActualLRP1.ActualLRPKey)) - Expect(stoppedKeys).To(ContainElement(&retiringActualLRP2.ActualLRPKey)) + Expect(stoppedKeys).To(ContainElement(&retiringActualLRP1.ActualLrpKey)) + Expect(stoppedKeys).To(ContainElement(&retiringActualLRP2.ActualLrpKey)) }) }) diff --git a/controllers/task_controller_test.go b/controllers/task_controller_test.go index 6e070f46..2b9fa5b1 100644 --- a/controllers/task_controller_test.go +++ b/controllers/task_controller_test.go @@ -438,7 +438,7 @@ var _ = Describe("Task Controller", func() { Context("and the task has a complete URL", func() { BeforeEach(func() { task := model_helpers.NewValidTask("hi-bob") - task.CompletionCallbackUrl = "bogus" + task.TaskDefinition.CompletionCallbackUrl = "bogus" fakeTaskDB.CancelTaskReturns(nil, task, cellID, nil) }) @@ -579,7 +579,7 @@ var _ = Describe("Task Controller", func() { Context("and the task has a complete URL", func() { BeforeEach(func() { task := model_helpers.NewValidTask("hi-bob") - task.CompletionCallbackUrl = "bogus" + task.TaskDefinition.CompletionCallbackUrl = "bogus" fakeTaskDB.FailTaskReturns(nil, task, nil) }) @@ -805,7 +805,7 @@ var _ = Describe("Task Controller", func() { Context("and the task has a complete URL", func() { BeforeEach(func() { task := model_helpers.NewValidTask("hi-bob") - task.CompletionCallbackUrl = "bogus" + task.TaskDefinition.CompletionCallbackUrl = "bogus" fakeTaskDB.CompleteTaskReturns(nil, task, nil) }) diff --git a/events/event_source.go b/events/event_source.go index e54b43d0..8d2a18bd 100644 --- a/events/event_source.go +++ b/events/event_source.go @@ -178,6 +178,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPCreated: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPCreatedEvent) + //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion protoEvent := new(models.ProtoActualLRPCreatedEvent) err := proto.Unmarshal(data, protoEvent) if err != nil { @@ -191,6 +192,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPChanged: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPChangedEvent) + //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion protoEvent := new(models.ProtoActualLRPChangedEvent) err := proto.Unmarshal(data, protoEvent) if err != nil { @@ -204,6 +206,7 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { case models.EventTypeActualLRPRemoved: //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion event := new(models.ActualLRPRemovedEvent) + //lint:ignore SA1019 - need to support this event until the deprecation becomes deletion protoEvent := new(models.ProtoActualLRPRemovedEvent) err := proto.Unmarshal(data, protoEvent) if err != nil { diff --git a/handlers/actual_lrp_handlers.go b/handlers/actual_lrp_handlers.go index d4b3943d..e250fb9e 100644 --- a/handlers/actual_lrp_handlers.go +++ b/handlers/actual_lrp_handlers.go @@ -53,15 +53,15 @@ func (h *ActualLRPHandler) ActualLRPGroups(logger lager.Logger, w http.ResponseW var err error logger = logger.Session("actual-lrp-groups").WithTraceInfo(req) - request := &models.ActualLRPGroupsRequest{} + var request models.ActualLRPGroupsRequest protoRequest := &models.ProtoActualLRPGroupsRequest{} response := &models.ActualLRPGroupsResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() defer writeResponse(w, response.ToProto()) err = parseRequest(logger, req, protoRequest) + request = *protoRequest.FromProto() if err != nil { - request = protoRequest.FromProto() response.Error = models.ConvertError(err) return } diff --git a/handlers/actual_lrp_handlers_test.go b/handlers/actual_lrp_handlers_test.go index 1999fc6b..449ab858 100644 --- a/handlers/actual_lrp_handlers_test.go +++ b/handlers/actual_lrp_handlers_test.go @@ -14,6 +14,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" + "google.golang.org/protobuf/proto" ) var _ = Describe("ActualLRP Handlers", func() { @@ -34,12 +35,12 @@ var _ = Describe("ActualLRP Handlers", func() { BeforeEach(func() { actualLRP1 = models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey( + ActualLrpKey: models.NewActualLRPKey( "process-guid-0", 1, "domain-0", ), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey( + ActualLrpInstanceKey: models.NewActualLRPInstanceKey( "instance-guid-0", "cell-id-0", ), @@ -48,12 +49,12 @@ var _ = Describe("ActualLRP Handlers", func() { } actualLRP2 = models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey( + ActualLrpKey: models.NewActualLRPKey( "process-guid-1", 2, "domain-1", ), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey( + ActualLrpInstanceKey: models.NewActualLRPInstanceKey( "instance-guid-1", "cell-id-1", ), @@ -65,7 +66,7 @@ var _ = Describe("ActualLRP Handlers", func() { evacuatingLRP2.Presence = models.ActualLRP_Evacuating evacuatingLRP2.State = models.ActualLRPStateRunning evacuatingLRP2.Since = 3417 - evacuatingLRP2.ActualLRPInstanceKey = models.NewActualLRPInstanceKey( + evacuatingLRP2.ActualLrpInstanceKey = models.NewActualLRPInstanceKey( "instance-guid-1", "cell-id-0", ) @@ -102,12 +103,12 @@ var _ = Describe("ActualLRP Handlers", func() { actualLRP1.State = models.ActualLRPStateUnclaimed suspectLRP1 = models.ActualLRP{ - ActualLRPKey: models.NewActualLRPKey( + ActualLrpKey: models.NewActualLRPKey( "process-guid-0", 1, "domain-0", ), - ActualLRPInstanceKey: models.NewActualLRPInstanceKey( + ActualLrpInstanceKey: models.NewActualLRPInstanceKey( "instance-guid-0", "cell-id-2", ), @@ -124,8 +125,10 @@ var _ = Describe("ActualLRP Handlers", func() { It("returns a list of actual lrps", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.ActualLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPsResponse + var protoResponse models.ProtoActualLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -179,7 +182,8 @@ var _ = Describe("ActualLRP Handlers", func() { Context("and filtering by instance index", func() { BeforeEach(func() { req := &models.ActualLRPsRequest{} - req.SetIndex(1) + index := int32(1) + req.SetIndex(&index) requestBody = req }) @@ -198,7 +202,8 @@ var _ = Describe("ActualLRP Handlers", func() { CellId: "cellid-1", ProcessGuid: "process-guid-0", } - req.SetIndex(2) + index := int32(2) + req.SetIndex(&index) requestBody = req }) @@ -221,8 +226,10 @@ var _ = Describe("ActualLRP Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPsResponse + var protoResponse models.ProtoActualLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -249,8 +256,10 @@ var _ = Describe("ActualLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPsResponse + var protoResponse models.ProtoActualLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -297,8 +306,11 @@ var _ = Describe("ActualLRP Handlers", func() { It("returns a list of actual lrp groups", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method - response := models.ActualLRPGroupsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPGroupsResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -362,8 +374,11 @@ var _ = Describe("ActualLRP Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method - response := &models.ActualLRPGroupsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPGroupsResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -391,8 +406,11 @@ var _ = Describe("ActualLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method - response := &models.ActualLRPGroupsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPGroupsResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -452,8 +470,11 @@ var _ = Describe("ActualLRP Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method - response := &models.ActualLRPGroupsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPGroupsResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.ActualLrpGroups).To(Equal(actualLRPGroups)) @@ -469,8 +490,11 @@ var _ = Describe("ActualLRP Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method - response := &models.ActualLRPGroupsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPGroupsResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.ActualLrpGroups).To(BeNil()) @@ -498,8 +522,11 @@ var _ = Describe("ActualLRP Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method - response := &models.ActualLRPGroupsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPGroupsResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -551,9 +578,12 @@ var _ = Describe("ActualLRP Handlers", func() { It("returns an actual lrp group", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - //lint:ignore SA1019 - deprecated model used for testing deprecated functionality - response := &models.ActualLRPGroupResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var response models.ActualLRPGroupResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -569,9 +599,12 @@ var _ = Describe("ActualLRP Handlers", func() { }) It("returns both LRPs in the group", func() { - //lint:ignore SA1019 - deprecated model used for testing deprecated functionality - response := &models.ActualLRPGroupResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var response models.ActualLRPGroupResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -587,9 +620,12 @@ var _ = Describe("ActualLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - //lint:ignore SA1019 - deprecated model used for testing deprecated functionality - response := &models.ActualLRPGroupResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var response models.ActualLRPGroupResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrResourceNotFound)) @@ -615,9 +651,12 @@ var _ = Describe("ActualLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - //lint:ignore SA1019 - deprecated model used for testing deprecated functionality - response := &models.ActualLRPGroupResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var response models.ActualLRPGroupResponse + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method + var protoResponse models.ProtoActualLRPGroupResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) diff --git a/handlers/actual_lrp_lifecycle_handler_test.go b/handlers/actual_lrp_lifecycle_handler_test.go index 2acd9942..e78b40af 100644 --- a/handlers/actual_lrp_lifecycle_handler_test.go +++ b/handlers/actual_lrp_lifecycle_handler_test.go @@ -17,6 +17,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" + "google.golang.org/protobuf/proto" ) var _ = Describe("ActualLRP Lifecycle Handlers", func() { @@ -89,8 +90,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("response with no error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -116,8 +119,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -160,7 +165,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { MetricTags: metricTags, AvailabilityZone: "some-availability-zone", } - requestBody.SetRoutable(true) + routable := true + requestBody.SetRoutable(&routable) }) JustBeforeEach(func() { @@ -202,7 +208,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { Context("when routable is provided as false", func() { BeforeEach(func() { - requestBody.SetRoutable(false) + routable := false + requestBody.SetRoutable(&routable) }) It("sets it to false", func() { @@ -214,7 +221,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { Context("when routable is provided as true", func() { BeforeEach(func() { - requestBody.SetRoutable(true) + routable := true + requestBody.SetRoutable(&routable) }) It("sets it to true", func() { @@ -231,8 +239,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with no error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -258,8 +268,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -302,7 +314,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { MetricTags: metricTags, AvailabilityZone: "some-zone", } - requestBody.SetRoutable(true) + routable := true + requestBody.SetRoutable(&routable) }) JustBeforeEach(func() { @@ -343,7 +356,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { Context("when routable is provided as false", func() { BeforeEach(func() { - requestBody.SetRoutable(false) + routable := false + requestBody.SetRoutable(&routable) }) It("sets it to false", func() { @@ -362,8 +376,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) Eventually(logger).Should(gbytes.Say("starting")) Eventually(logger).Should(gbytes.Say(b3RequestIdHeader)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -389,8 +405,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -447,8 +465,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("response with no error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -474,8 +494,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -512,8 +534,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.RetireActualLRP(logger, responseRecorder, request) - response = &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) Expect(err).NotTo(HaveOccurred()) }) @@ -592,8 +614,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("fails the actual lrp by process guid and index", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -619,8 +643,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -672,10 +698,12 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with no error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) + Expect(response.Error).To(BeNil()) }) }) @@ -699,8 +727,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.ActualLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) diff --git a/handlers/cell_handlers_test.go b/handlers/cell_handlers_test.go index 7439197a..e9421db0 100644 --- a/handlers/cell_handlers_test.go +++ b/handlers/cell_handlers_test.go @@ -14,6 +14,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" + "google.golang.org/protobuf/proto" ) var _ = Describe("Cell Handlers", func() { @@ -89,8 +90,10 @@ var _ = Describe("Cell Handlers", func() { It("returns a list of cells", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.CellsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.CellsResponse + var protoResponse models.ProtoCellsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -106,8 +109,10 @@ var _ = Describe("Cell Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.CellsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.CellsResponse + var protoResponse models.ProtoCellsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -135,8 +140,10 @@ var _ = Describe("Cell Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.CellsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.CellsResponse + var protoResponse models.ProtoCellsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) diff --git a/handlers/context_test.go b/handlers/context_test.go index 48f7f71b..1cee425e 100644 --- a/handlers/context_test.go +++ b/handlers/context_test.go @@ -22,6 +22,7 @@ import ( "code.cloudfoundry.org/lager/v3/lagertest" "github.com/tedsuo/ifrit" ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2" + "google.golang.org/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -148,8 +149,10 @@ var _ = Describe("Context", func() { defer GinkgoRecover() handler.ActualLRPs(logger, responseRecorder, request) - response := models.ActualLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.ActualLRPsResponse + var protoResponse models.ProtoActualLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(HaveOccurred()) diff --git a/handlers/desired_lrp_handlers_test.go b/handlers/desired_lrp_handlers_test.go index cae32410..423f204d 100644 --- a/handlers/desired_lrp_handlers_test.go +++ b/handlers/desired_lrp_handlers_test.go @@ -27,6 +27,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" + "google.golang.org/protobuf/proto" ) var _ = Describe("DesiredLRP Handlers", func() { @@ -107,8 +108,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a list of desired lrps", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -125,8 +128,8 @@ var _ = Describe("DesiredLRP Handlers", func() { BeforeEach(func() { desiredLRPsWithImageLayers := []*models.DesiredLRP{ - &models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}}, - &models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}}, + &models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}}, + &models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}}, } fakeDesiredLRPDB.DesiredLRPsReturns(desiredLRPsWithImageLayers, nil) @@ -138,8 +141,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a list of desired lrps downgraded to convert image layers to cached dependencies and download actions", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -165,8 +170,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns desired lrps with populated metrics_guid", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -214,8 +221,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -242,8 +251,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -256,8 +267,8 @@ var _ = Describe("DesiredLRP Handlers", func() { BeforeEach(func() { requestBody = &models.DesiredLRPsRequest{} - desiredLRP1 = models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}} - desiredLRP2 = models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}} + desiredLRP1 = models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}} + desiredLRP2 = models.DesiredLRP{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}} }) JustBeforeEach(func() { @@ -274,8 +285,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a list of desired lrps", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -301,8 +314,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns desired lrps with populated metrics_guid", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -350,8 +365,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -378,8 +395,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -420,8 +439,10 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(actualProcessGuid).To(Equal(processGuid)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -435,7 +456,7 @@ var _ = Describe("DesiredLRP Handlers", func() { BeforeEach(func() { desiredLRP := &models.DesiredLRP{ ProcessGuid: processGuid, - ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}, + ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}, } fakeDesiredLRPDB.DesiredLRPByProcessGuidReturns(desiredLRP.Copy(), nil) @@ -444,8 +465,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a list of desired lrps downgraded to convert image layers to cached dependencies and download actions", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -469,8 +492,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns desired lrps with populated metrics_guid", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -485,8 +510,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a resource not found error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrResourceNotFound)) @@ -512,8 +539,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -546,7 +575,7 @@ var _ = Describe("DesiredLRP Handlers", func() { BeforeEach(func() { desiredLRP = models.DesiredLRP{ ProcessGuid: processGuid, - ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}, + ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}, } fakeDesiredLRPDB.DesiredLRPByProcessGuidReturns(desiredLRP.Copy(), nil) }) @@ -557,8 +586,10 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(actualProcessGuid).To(Equal(processGuid)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -580,8 +611,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns desired lrps with populated metrics_guid", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -596,8 +629,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a resource not found error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrResourceNotFound)) @@ -623,8 +658,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPResponse + var protoResponse models.ProtoDesiredLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -661,8 +698,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a list of desired lrps", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPSchedulingInfosResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPSchedulingInfosResponse + var protoResponse models.ProtoDesiredLRPSchedulingInfosResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -709,8 +748,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPSchedulingInfosResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPSchedulingInfosResponse + var protoResponse models.ProtoDesiredLRPSchedulingInfosResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -737,8 +778,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPSchedulingInfosResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPSchedulingInfosResponse + var protoResponse models.ProtoDesiredLRPSchedulingInfosResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -787,9 +830,11 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(receivedProcessGuid).To(Equal(processGuid)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPSchedulingInfoByProcessGuidResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) - Expect(err).ToNot(HaveOccurred()) + var response models.DesiredLRPSchedulingInfoByProcessGuidResponse + var protoResponse models.ProtoDesiredLRPSchedulingInfoByProcessGuidResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() + Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) responseSchedInfo := response.DesiredLrpSchedulingInfo @@ -804,9 +849,11 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a resource not found error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPSchedulingInfoByProcessGuidResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) - Expect(err).ToNot(HaveOccurred()) + var response models.DesiredLRPSchedulingInfoByProcessGuidResponse + var protoResponse models.ProtoDesiredLRPSchedulingInfoByProcessGuidResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() + Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrResourceNotFound)) }) @@ -831,8 +878,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPSchedulingInfoByProcessGuidResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPSchedulingInfoByProcessGuidResponse + var protoResponse models.ProtoDesiredLRPSchedulingInfoByProcessGuidResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -868,8 +917,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns a list of desired lrps", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -916,8 +967,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -943,8 +996,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPsResponse + var protoResponse models.ProtoDesiredLRPsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -1029,8 +1084,10 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(actualDesiredLRP).To(Equal(desiredLRP)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -1178,8 +1235,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -1210,7 +1269,7 @@ var _ = Describe("DesiredLRP Handlers", func() { afterDesiredLRP.Annotation = someText update = &models.DesiredLRPUpdate{} - update.SetAnnotation(someText) + update.SetAnnotation(&someText) }) JustBeforeEach(func() { @@ -1260,8 +1319,10 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(actualUpdate).To(Equal(update)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) }) @@ -1283,7 +1344,8 @@ var _ = Describe("DesiredLRP Handlers", func() { Context("when the number of instances changes", func() { BeforeEach(func() { - update.SetInstances(3) + instances := int32(3) + update.SetInstances(&instances) desiredLRP := &models.DesiredLRP{ ProcessGuid: "some-guid", @@ -1333,11 +1395,11 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(fakeRepClient.StopLRPInstanceCallCount()).To(Equal(2)) _, key0, instanceKey0 := fakeRepClient.StopLRPInstanceArgsForCall(0) _, key1, instanceKey1 := fakeRepClient.StopLRPInstanceArgsForCall(1) - Expect((key0 == actualLRPs[0].ActualLRPKey && key1 == actualLRPs[1].ActualLRPKey) || - (key1 == actualLRPs[0].ActualLRPKey && key0 == actualLRPs[1].ActualLRPKey)).To(BeTrue()) + Expect((key0 == actualLRPs[0].ActualLrpKey && key1 == actualLRPs[1].ActualLrpKey) || + (key1 == actualLRPs[0].ActualLrpKey && key0 == actualLRPs[1].ActualLrpKey)).To(BeTrue()) - Expect((instanceKey0 == actualLRPs[0].ActualLRPInstanceKey && instanceKey1 == actualLRPs[1].ActualLRPInstanceKey) || - (instanceKey1 == actualLRPs[0].ActualLRPInstanceKey && instanceKey0 == actualLRPs[1].ActualLRPInstanceKey)).To(BeTrue()) + Expect((instanceKey0 == actualLRPs[0].ActualLrpInstanceKey && instanceKey1 == actualLRPs[1].ActualLrpInstanceKey) || + (instanceKey1 == actualLRPs[0].ActualLrpInstanceKey && instanceKey0 == actualLRPs[1].ActualLrpInstanceKey)).To(BeTrue()) }) @@ -1365,8 +1427,10 @@ var _ = Describe("DesiredLRP Handlers", func() { }) It("should return the error", func() { - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -1488,8 +1552,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("does not update the actual lrps", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -1505,8 +1571,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("does not update the actual lrps", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -1656,7 +1724,8 @@ var _ = Describe("DesiredLRP Handlers", func() { } update = &models.DesiredLRPUpdate{MetricTags: expectedTags} - update.SetAnnotation("new-annotation") + annotation := "new-annotation" + update.SetAnnotation(&annotation) requestBody = &models.UpdateDesiredLRPRequest{ ProcessGuid: processGuid, @@ -1671,8 +1740,10 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(actualUpdate).To(Equal(update)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) }) @@ -1834,8 +1905,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -1880,8 +1953,10 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(actualProcessGuid).To(Equal(processGuid)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -1961,11 +2036,11 @@ var _ = Describe("DesiredLRP Handlers", func() { _, key0, instanceKey0 := fakeRepClient.StopLRPInstanceArgsForCall(0) _, key1, instanceKey1 := fakeRepClient.StopLRPInstanceArgsForCall(1) - Expect((key0 == runningActualLRP0.ActualLRPKey && key1 == evacuatingActualLRP1.ActualLRPKey) || - (key1 == runningActualLRP0.ActualLRPKey && key0 == evacuatingActualLRP1.ActualLRPKey)).To(BeTrue()) + Expect((key0 == runningActualLRP0.ActualLrpKey && key1 == evacuatingActualLRP1.ActualLrpKey) || + (key1 == runningActualLRP0.ActualLrpKey && key0 == evacuatingActualLRP1.ActualLrpKey)).To(BeTrue()) - Expect((instanceKey0 == runningActualLRP0.ActualLRPInstanceKey && instanceKey1 == evacuatingActualLRP1.ActualLRPInstanceKey) || - (instanceKey1 == runningActualLRP0.ActualLRPInstanceKey && instanceKey0 == evacuatingActualLRP1.ActualLRPInstanceKey)).To(BeTrue()) + Expect((instanceKey0 == runningActualLRP0.ActualLrpInstanceKey && instanceKey1 == evacuatingActualLRP1.ActualLrpInstanceKey) || + (instanceKey1 == runningActualLRP0.ActualLrpInstanceKey && instanceKey0 == evacuatingActualLRP1.ActualLrpInstanceKey)).To(BeTrue()) }) @@ -2034,8 +2109,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("logs the error but still succeeds", func() { Expect(fakeRepClientFactory.CreateClientCallCount()).To(Equal(0)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -2065,8 +2142,10 @@ var _ = Describe("DesiredLRP Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.DesiredLRPLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DesiredLRPLifecycleResponse + var protoResponse models.ProtoDesiredLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) diff --git a/handlers/domain_handlers_test.go b/handlers/domain_handlers_test.go index 9957b247..85b5507a 100644 --- a/handlers/domain_handlers_test.go +++ b/handlers/domain_handlers_test.go @@ -14,6 +14,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" + "google.golang.org/protobuf/proto" ) var _ = Describe("Domain Handlers", func() { @@ -78,11 +79,13 @@ var _ = Describe("Domain Handlers", func() { }) It("responds with no error", func() { - var upsertDomainResponse models.UpsertDomainResponse - err := upsertDomainResponse.Unmarshal(responseRecorder.Body.Bytes()) + var response models.UpsertDomainResponse + var protoResponse models.ProtoUpsertDomainResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) - Expect(upsertDomainResponse.Error).To(BeNil()) + Expect(response.Error).To(BeNil()) }) }) @@ -94,12 +97,14 @@ var _ = Describe("Domain Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - var upsertDomainResponse models.UpsertDomainResponse - err := upsertDomainResponse.Unmarshal(responseRecorder.Body.Bytes()) + var response models.UpsertDomainResponse + var protoResponse models.ProtoUpsertDomainResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) - Expect(upsertDomainResponse.Error).NotTo(BeNil()) - Expect(upsertDomainResponse.Error.Type).To(Equal(models.Error_InvalidRequest)) + Expect(response.Error).NotTo(BeNil()) + Expect(response.Error.Type).To(Equal(models.Error_InvalidRequest)) }) }) @@ -111,12 +116,14 @@ var _ = Describe("Domain Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - var upsertDomainResponse models.UpsertDomainResponse - err := upsertDomainResponse.Unmarshal(responseRecorder.Body.Bytes()) + var response models.UpsertDomainResponse + var protoResponse models.ProtoUpsertDomainResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) - Expect(upsertDomainResponse.Error).NotTo(BeNil()) - Expect(upsertDomainResponse.Error).To(Equal(models.ErrBadRequest)) + Expect(response.Error).NotTo(BeNil()) + Expect(response.Error).To(Equal(models.ErrBadRequest)) }) }) @@ -140,12 +147,14 @@ var _ = Describe("Domain Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - var upsertDomainResponse models.UpsertDomainResponse - err := upsertDomainResponse.Unmarshal(responseRecorder.Body.Bytes()) + var response models.UpsertDomainResponse + var protoResponse models.ProtoUpsertDomainResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) - Expect(upsertDomainResponse.Error).NotTo(BeNil()) - Expect(upsertDomainResponse.Error).To(Equal(models.ErrUnknownError)) + Expect(response.Error).NotTo(BeNil()) + Expect(response.Error).To(Equal(models.ErrUnknownError)) }) }) }) @@ -175,8 +184,10 @@ var _ = Describe("Domain Handlers", func() { It("returns a list of domains", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.DomainsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DomainsResponse + var protoResponse models.ProtoDomainsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -192,8 +203,10 @@ var _ = Describe("Domain Handlers", func() { It("returns an empty list", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.DomainsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DomainsResponse + var protoResponse models.ProtoDomainsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -221,8 +234,10 @@ var _ = Describe("Domain Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.DomainsResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.DomainsResponse + var protoResponse models.ProtoDomainsResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) diff --git a/handlers/evacuation_handler_test.go b/handlers/evacuation_handler_test.go index 49dab2a6..373e5285 100644 --- a/handlers/evacuation_handler_test.go +++ b/handlers/evacuation_handler_test.go @@ -15,6 +15,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" + "google.golang.org/protobuf/proto" ) var _ = Describe("Evacuation Handlers", func() { @@ -78,7 +79,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should respond without an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.RemoveEvacuatingActualLRPResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoRemoveEvacuatingActualLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) }) @@ -93,7 +96,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.RemoveEvacuatingActualLRPResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoRemoveEvacuatingActualLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -123,7 +128,9 @@ var _ = Describe("Evacuation Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.RemoveEvacuatingActualLRPResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoRemoveEvacuatingActualLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) @@ -140,7 +147,9 @@ var _ = Describe("Evacuation Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.RemoveEvacuatingActualLRPResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoRemoveEvacuatingActualLRPResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) @@ -161,8 +170,8 @@ var _ = Describe("Evacuation Handlers", func() { JustBeforeEach(func() { actual = model_helpers.NewValidActualLRP("process-guid", 1) requestBody = &models.EvacuateClaimedActualLRPRequest{ - ActualLrpKey: &actual.ActualLRPKey, - ActualLrpInstanceKey: &actual.ActualLRPInstanceKey, + ActualLrpKey: &actual.ActualLrpKey, + ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, } request = newTestRequest(requestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) @@ -179,7 +188,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error and keep the container", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeFalse()) @@ -194,7 +205,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error and keep the container", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeTrue()) @@ -211,7 +224,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -227,7 +242,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -258,8 +275,10 @@ var _ = Describe("Evacuation Handlers", func() { }) It("returns an error and keeps the container", func() { - response := models.EvacuationResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.EvacuationResponse + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.KeepContainer).To(BeTrue()) Expect(response.Error).NotTo(BeNil()) @@ -279,8 +298,8 @@ var _ = Describe("Evacuation Handlers", func() { JustBeforeEach(func() { actual = model_helpers.NewValidActualLRP("process-guid", 1) requestBody = &models.EvacuateCrashedActualLRPRequest{ - ActualLrpKey: &actual.ActualLRPKey, - ActualLrpInstanceKey: &actual.ActualLRPInstanceKey, + ActualLrpKey: &actual.ActualLrpKey, + ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, ErrorMessage: "i failed", } request = newTestRequest(requestBody) @@ -297,7 +316,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeFalse()) @@ -313,7 +334,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -344,8 +367,10 @@ var _ = Describe("Evacuation Handlers", func() { }) It("returns an error and keeps the container", func() { - response := models.EvacuationResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.EvacuationResponse + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrBadRequest)) @@ -364,9 +389,9 @@ var _ = Describe("Evacuation Handlers", func() { JustBeforeEach(func() { actual = model_helpers.NewValidActualLRP("process-guid", 1) requestBody = &models.EvacuateRunningActualLRPRequest{ - ActualLrpKey: &actual.ActualLRPKey, - ActualLrpInstanceKey: &actual.ActualLRPInstanceKey, - ActualLrpNetInfo: &actual.ActualLRPNetInfo, + ActualLrpKey: &actual.ActualLrpKey, + ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, + ActualLrpNetInfo: &actual.ActualLrpNetInfo, } request = newTestRequest(requestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) @@ -383,7 +408,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error and keep the container", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeFalse()) @@ -398,7 +425,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error and keep the container", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeTrue()) @@ -415,7 +444,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -431,7 +462,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -462,8 +495,10 @@ var _ = Describe("Evacuation Handlers", func() { }) It("returns an error and keeps the container", func() { - response := models.EvacuationResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.EvacuationResponse + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.KeepContainer).To(BeTrue()) Expect(response.Error).NotTo(BeNil()) @@ -483,9 +518,9 @@ var _ = Describe("Evacuation Handlers", func() { BeforeEach(func() { actual = model_helpers.NewValidActualLRP("process-guid", 1) requestBody = &models.EvacuateRunningActualLRPRequest{ - ActualLrpKey: &actual.ActualLRPKey, - ActualLrpInstanceKey: &actual.ActualLRPInstanceKey, - ActualLrpNetInfo: &actual.ActualLRPNetInfo, + ActualLrpKey: &actual.ActualLrpKey, + ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, + ActualLrpNetInfo: &actual.ActualLrpNetInfo, ActualLrpInternalRoutes: actual.ActualLrpInternalRoutes, MetricTags: actual.MetricTags, AvailabilityZone: actual.AvailabilityZone, @@ -502,9 +537,9 @@ var _ = Describe("Evacuation Handlers", func() { It("calls the controller", func() { Expect(controller.EvacuateRunningActualLRPCallCount()).To(Equal(1)) _, _, actualKey, actualInstanceKey, actualNetInfo, actualInternalRoutes, actualMetricTags, routable, availabilityZone := controller.EvacuateRunningActualLRPArgsForCall(0) - Expect(actualKey).To(Equal(&actual.ActualLRPKey)) - Expect(actualInstanceKey).To(Equal(&actual.ActualLRPInstanceKey)) - Expect(actualNetInfo).To(Equal(&actual.ActualLRPNetInfo)) + Expect(actualKey).To(Equal(&actual.ActualLrpKey)) + Expect(actualInstanceKey).To(Equal(&actual.ActualLrpInstanceKey)) + Expect(actualNetInfo).To(Equal(&actual.ActualLrpNetInfo)) Expect(actualInternalRoutes).To(Equal(actual.ActualLrpInternalRoutes)) Expect(actualMetricTags).To(Equal(actual.MetricTags)) Expect(availabilityZone).To(Equal(actual.AvailabilityZone)) @@ -520,7 +555,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error and keep the container", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeFalse()) @@ -535,7 +572,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error and keep the container", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeTrue()) @@ -552,7 +591,8 @@ var _ = Describe("Evacuation Handlers", func() { Context("when routable is provided as false", func() { BeforeEach(func() { - requestBody.SetRoutable(false) + routable := false + requestBody.SetRoutable(&routable) }) It("sets it to false", func() { @@ -564,7 +604,8 @@ var _ = Describe("Evacuation Handlers", func() { Context("when routable is provided as true", func() { BeforeEach(func() { - requestBody.SetRoutable(true) + routable := true + requestBody.SetRoutable(&routable) }) It("sets it to false", func() { @@ -584,7 +625,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -600,7 +643,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -631,8 +676,10 @@ var _ = Describe("Evacuation Handlers", func() { }) It("returns an error and keeps the container", func() { - response := models.EvacuationResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.EvacuationResponse + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.KeepContainer).To(BeTrue()) Expect(response.Error).NotTo(BeNil()) @@ -652,8 +699,8 @@ var _ = Describe("Evacuation Handlers", func() { JustBeforeEach(func() { actual = model_helpers.NewValidActualLRP("process-guid", 1) requestBody = &models.EvacuateStoppedActualLRPRequest{ - ActualLrpKey: &actual.ActualLRPKey, - ActualLrpInstanceKey: &actual.ActualLRPInstanceKey, + ActualLrpKey: &actual.ActualLrpKey, + ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, } request = newTestRequest(requestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) @@ -669,7 +716,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return no error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) Expect(response.KeepContainer).To(BeFalse()) @@ -685,7 +734,9 @@ var _ = Describe("Evacuation Handlers", func() { It("should return the error in the response", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.EvacuationResponse - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -716,8 +767,10 @@ var _ = Describe("Evacuation Handlers", func() { }) It("returns an error and keeps the container", func() { - response := models.EvacuationResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.EvacuationResponse + var protoResponse models.ProtoEvacuationResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).NotTo(BeNil()) Expect(response.Error).To(Equal(models.ErrBadRequest)) diff --git a/handlers/events_handlers_test.go b/handlers/events_handlers_test.go index 9494b5bf..2a13c507 100644 --- a/handlers/events_handlers_test.go +++ b/handlers/events_handlers_test.go @@ -902,7 +902,7 @@ var _ = Describe("Event Handlers", func() { downgradedTask = task.VersionDownTo(format.V3) Expect(downgradedTask).To(Equal(task)) - Expect(downgradedTask.ImageLayers).NotTo(BeNil()) + Expect(downgradedTask.TaskDefinition.ImageLayers).NotTo(BeNil()) }) JustBeforeEach(func() { diff --git a/handlers/task_handlers_test.go b/handlers/task_handlers_test.go index 349c4107..b6303e69 100644 --- a/handlers/task_handlers_test.go +++ b/handlers/task_handlers_test.go @@ -19,6 +19,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" + "google.golang.org/protobuf/proto" ) var _ = Describe("Task Handlers", func() { @@ -88,8 +89,10 @@ var _ = Describe("Task Handlers", func() { It("returns a list of tasks", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TasksResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TasksResponse + var protoResponse models.ProtoTasksResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -109,8 +112,8 @@ var _ = Describe("Task Handlers", func() { BeforeEach(func() { tasksWithImageLayers := []*models.Task{ - &models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}}}, - &models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}}}, + &models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}}}, + &models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}}}, } controller.TasksReturns(tasksWithImageLayers, nil) @@ -122,8 +125,10 @@ var _ = Describe("Task Handlers", func() { It("returns a list of tasks downgraded to convert image layers to cached dependencies and download actions", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TasksResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TasksResponse + var protoResponse models.ProtoTasksResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -177,8 +182,10 @@ var _ = Describe("Task Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TasksResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TasksResponse + var protoResponse models.ProtoTasksResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -194,8 +201,8 @@ var _ = Describe("Task Handlers", func() { ) BeforeEach(func() { - task1 = models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}}} - task2 = models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.LayerTypeExclusive}, {LayerType: models.LayerTypeShared}}}} + task1 = models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}}} + task2 = models.Task{TaskDefinition: &models.TaskDefinition{ImageLayers: []*models.ImageLayer{{LayerType: models.ImageLayer_LayerTypeExclusive}, {LayerType: models.ImageLayer_LayerTypeShared}}}} requestBody = &models.TasksRequest{} }) @@ -221,8 +228,10 @@ var _ = Describe("Task Handlers", func() { It("returns a list of tasks", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TasksResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TasksResponse + var protoResponse models.ProtoTasksResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -283,8 +292,10 @@ var _ = Describe("Task Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TasksResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TasksResponse + var protoResponse models.ProtoTasksResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -326,8 +337,10 @@ var _ = Describe("Task Handlers", func() { It("returns the task", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskResponse + var protoResponse models.ProtoTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -343,8 +356,8 @@ var _ = Describe("Task Handlers", func() { TaskGuid: taskGuid, TaskDefinition: &models.TaskDefinition{ ImageLayers: []*models.ImageLayer{ - {LayerType: models.LayerTypeExclusive}, - {LayerType: models.LayerTypeShared}, + {LayerType: models.ImageLayer_LayerTypeExclusive}, + {LayerType: models.ImageLayer_LayerTypeShared}, }, }, } @@ -355,12 +368,14 @@ var _ = Describe("Task Handlers", func() { It("returns a list of tasks downgraded to convert image layers to cached dependencies and download actions", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskResponse + var protoResponse models.ProtoTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) - Expect(response.Task.ImageLayers).To(BeNil()) + Expect(response.Task.TaskDefinition.ImageLayers).To(BeNil()) Expect(response.Task).To(Equal(downgradedTask)) }) }) @@ -372,8 +387,10 @@ var _ = Describe("Task Handlers", func() { It("returns a resource not found error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskResponse + var protoResponse models.ProtoTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrResourceNotFound)) @@ -399,8 +416,10 @@ var _ = Describe("Task Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskResponse + var protoResponse models.ProtoTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -431,8 +450,8 @@ var _ = Describe("Task Handlers", func() { TaskGuid: taskGuid, TaskDefinition: &models.TaskDefinition{ ImageLayers: []*models.ImageLayer{ - {LayerType: models.LayerTypeExclusive}, - {LayerType: models.LayerTypeShared}, + {LayerType: models.ImageLayer_LayerTypeExclusive}, + {LayerType: models.ImageLayer_LayerTypeShared}, }, }, } @@ -447,8 +466,10 @@ var _ = Describe("Task Handlers", func() { It("returns the task", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskResponse + var protoResponse models.ProtoTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -463,8 +484,10 @@ var _ = Describe("Task Handlers", func() { It("returns a resource not found error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskResponse + var protoResponse models.ProtoTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrResourceNotFound)) @@ -490,8 +513,10 @@ var _ = Describe("Task Handlers", func() { It("provides relevant error information", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := models.TaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskResponse + var protoResponse models.ProtoTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -530,8 +555,10 @@ var _ = Describe("Task Handlers", func() { Expect(actualDomain).To(Equal(domain)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -557,8 +584,10 @@ var _ = Describe("Task Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -600,8 +629,10 @@ var _ = Describe("Task Handlers", func() { It("responds with true", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.StartTaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.StartTaskResponse + var protoResponse models.ProtoStartTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -616,8 +647,10 @@ var _ = Describe("Task Handlers", func() { It("responds with false", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.StartTaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.StartTaskResponse + var protoResponse models.ProtoStartTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -644,8 +677,10 @@ var _ = Describe("Task Handlers", func() { It("bubbles up the underlying model error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.StartTaskResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.StartTaskResponse + var protoResponse models.ProtoStartTaskResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrResourceExists)) @@ -689,8 +724,10 @@ var _ = Describe("Task Handlers", func() { Expect(taskLogger.SessionName()).To(ContainSubstring("cancel-task")) Expect(taskGuid).To(Equal("task-guid")) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -703,8 +740,10 @@ var _ = Describe("Task Handlers", func() { }) It("responds with an error", func() { - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -729,8 +768,10 @@ var _ = Describe("Task Handlers", func() { }) It("returns an BadRequest error", func() { - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrBadRequest)) @@ -770,8 +811,10 @@ var _ = Describe("Task Handlers", func() { Expect(actualFailureReason).To(Equal(failureReason)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -797,8 +840,10 @@ var _ = Describe("Task Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -833,7 +878,10 @@ var _ = Describe("Task Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.TaskLifecycleResponse - Expect(response.Unmarshal(responseRecorder.Body.Bytes())).To(Succeed()) + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() + Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) }) }) @@ -859,7 +907,10 @@ var _ = Describe("Task Handlers", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) var response models.TaskLifecycleResponse - Expect(response.Unmarshal(responseRecorder.Body.Bytes())).To(Succeed()) + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() + Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) }) }) @@ -909,8 +960,10 @@ var _ = Describe("Task Handlers", func() { Expect(actualResult).To(Equal(result)) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -936,8 +989,10 @@ var _ = Describe("Task Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -966,8 +1021,10 @@ var _ = Describe("Task Handlers", func() { Expect(taskGuid).To(Equal("task-guid")) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -993,8 +1050,10 @@ var _ = Describe("Task Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) @@ -1023,8 +1082,10 @@ var _ = Describe("Task Handlers", func() { Expect(taskGuid).To(Equal("task-guid")) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(BeNil()) @@ -1050,8 +1111,10 @@ var _ = Describe("Task Handlers", func() { It("responds with an error", func() { Expect(responseRecorder.Code).To(Equal(http.StatusOK)) - response := &models.TaskLifecycleResponse{} - err := response.Unmarshal(responseRecorder.Body.Bytes()) + var response models.TaskLifecycleResponse + var protoResponse models.ProtoTaskLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() Expect(err).NotTo(HaveOccurred()) Expect(response.Error).To(Equal(models.ErrUnknownError)) diff --git a/taskworkpool/taskcallback_test.go b/taskworkpool/taskcallback_test.go index 0287ad27..83aa779d 100644 --- a/taskworkpool/taskcallback_test.go +++ b/taskworkpool/taskcallback_test.go @@ -83,7 +83,7 @@ var _ = Describe("TaskWorker", func() { simulateTaskCompleting := func(signals <-chan os.Signal, ready chan<- struct{}) error { close(ready) task = model_helpers.NewValidTask("the-task-guid") - task.CompletionCallbackUrl = callbackURL + task.TaskDefinition.CompletionCallbackUrl = callbackURL taskworkpool.HandleCompletedTask(logger, httpClient, taskDB, taskHub, task) return nil } From cd35f556546624aa29c33fc762f302697ab3afa9 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 14 Jun 2024 21:14:46 +0000 Subject: [PATCH 115/155] Make integration tests use new protobuf --- db/sqldb/desired_lrp_db.go | 2 +- events/event_source.go | 3 + events/event_source_test.go | 2 +- events/hub.go | 3 + handlers/actual_lrp_handlers.go | 10 +-- handlers/actual_lrp_handlers_test.go | 21 +++--- handlers/actual_lrp_lifecycle_handler.go | 70 +++++++++---------- handlers/actual_lrp_lifecycle_handler_test.go | 33 +++++---- handlers/context_test.go | 2 +- handlers/desired_lrp_handlers.go | 41 +++++++---- handlers/desired_lrp_handlers_test.go | 59 ++++++++++------ handlers/domain_handlers_test.go | 4 +- handlers/evacuation_handler.go | 10 +-- handlers/evacuation_handler_test.go | 18 ++--- handlers/events_handlers.go | 3 + handlers/events_handlers_r0.go | 4 ++ handlers/events_handlers_test.go | 11 ++- handlers/handlers_suite_test.go | 2 +- handlers/task_handlers_test.go | 26 +++---- models/desired_lrp.go | 8 +-- models/desired_lrp.pb.go | 2 +- models/desired_lrp.proto | 2 +- models/desired_lrp_bbs.pb.go | 18 +++-- models/routes.go | 2 +- 24 files changed, 212 insertions(+), 144 deletions(-) diff --git a/db/sqldb/desired_lrp_db.go b/db/sqldb/desired_lrp_db.go index 18110584..83113587 100644 --- a/db/sqldb/desired_lrp_db.go +++ b/db/sqldb/desired_lrp_db.go @@ -433,7 +433,7 @@ func (db *SQLDB) fetchDesiredLRPSchedulingInfoAndMore(logger lager.Logger, scann logger.Error("failed-parsing-routes", err) return nil, err } - schedulingInfo.Routes = routes + schedulingInfo.Routes = &routes var volumePlacement models.VolumePlacement var protoVolumePlacement models.ProtoVolumePlacement diff --git a/events/event_source.go b/events/event_source.go index 8d2a18bd..aea920b7 100644 --- a/events/event_source.go +++ b/events/event_source.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "io" + "log" "strconv" "code.cloudfoundry.org/bbs/models" @@ -57,6 +58,8 @@ func (e closeError) Error() string { func NewEventFromModelEvent(eventID int, event models.Event) (sse.Event, error) { payload, err := proto.Marshal(event.ToEventProto()) + log.Printf("event.ToEventProto(): %+v", event.ToEventProto()) + log.Printf("payload: %+v", payload) if err != nil { return sse.Event{}, err } diff --git a/events/event_source_test.go b/events/event_source_test.go index 7ed8c352..2d81d7c4 100644 --- a/events/event_source_test.go +++ b/events/event_source_test.go @@ -9,10 +9,10 @@ import ( "code.cloudfoundry.org/bbs/events/eventfakes" "code.cloudfoundry.org/bbs/models" "code.cloudfoundry.org/bbs/models/test/model_helpers" - "github.com/gogo/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/vito/go-sse/sse" + "google.golang.org/protobuf/proto" ) var _ = Describe("EventSource", func() { diff --git a/events/hub.go b/events/hub.go index 0950825d..6c1aa511 100644 --- a/events/hub.go +++ b/events/hub.go @@ -2,6 +2,7 @@ package events import ( "errors" + "log" "sync" "code.cloudfoundry.org/bbs/models" @@ -82,6 +83,8 @@ func (hub *hub) Subscribe() (EventSource, error) { } func (hub *hub) Emit(event models.Event) { + log.Printf("event: %+v", event) + log.Printf("event.EventType(): %+v", event.EventType()) hub.lock.Lock() size := len(hub.subscribers) diff --git a/handlers/actual_lrp_handlers.go b/handlers/actual_lrp_handlers.go index e250fb9e..21b6cf8f 100644 --- a/handlers/actual_lrp_handlers.go +++ b/handlers/actual_lrp_handlers.go @@ -53,14 +53,14 @@ func (h *ActualLRPHandler) ActualLRPGroups(logger lager.Logger, w http.ResponseW var err error logger = logger.Session("actual-lrp-groups").WithTraceInfo(req) - var request models.ActualLRPGroupsRequest + var request *models.ActualLRPGroupsRequest protoRequest := &models.ProtoActualLRPGroupsRequest{} response := &models.ActualLRPGroupsResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err = parseRequest(logger, req, protoRequest) - request = *protoRequest.FromProto() + request = protoRequest.FromProto() if err != nil { response.Error = models.ConvertError(err) return @@ -84,7 +84,7 @@ func (h *ActualLRPHandler) ActualLRPGroupsByProcessGuid(logger lager.Logger, w h protoRequest := &models.ProtoActualLRPGroupsByProcessGuidRequest{} response := &models.ActualLRPGroupsResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() @@ -110,7 +110,7 @@ func (h *ActualLRPHandler) ActualLRPGroupByProcessGuidAndIndex(logger lager.Logg protoRequest := &models.ProtoActualLRPGroupByProcessGuidAndIndexRequest{} response := &models.ActualLRPGroupResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() diff --git a/handlers/actual_lrp_handlers_test.go b/handlers/actual_lrp_handlers_test.go index 449ab858..e78f4dfb 100644 --- a/handlers/actual_lrp_handlers_test.go +++ b/handlers/actual_lrp_handlers_test.go @@ -84,7 +84,7 @@ var _ = Describe("ActualLRP Handlers", func() { var requestBody interface{} BeforeEach(func() { - requestBody = &models.ActualLRPsRequest{} + requestBody = &models.ProtoActualLRPsRequest{} }) JustBeforeEach(func() { @@ -145,7 +145,7 @@ var _ = Describe("ActualLRP Handlers", func() { Context("and filtering by domain", func() { BeforeEach(func() { - requestBody = &models.ActualLRPsRequest{Domain: "domain-1"} + requestBody = &models.ProtoActualLRPsRequest{Domain: "domain-1"} }) It("calls the DB with the domain filter to retrieve the actual lrps", func() { @@ -157,7 +157,7 @@ var _ = Describe("ActualLRP Handlers", func() { Context("and filtering by cellId", func() { BeforeEach(func() { - requestBody = &models.ActualLRPsRequest{CellId: "cellid-1"} + requestBody = &models.ProtoActualLRPsRequest{CellId: "cellid-1"} }) It("calls the DB with the cell id filter to retrieve the actual lrps ", func() { @@ -169,7 +169,7 @@ var _ = Describe("ActualLRP Handlers", func() { Context("and filtering by processGuid", func() { BeforeEach(func() { - requestBody = &models.ActualLRPsRequest{ProcessGuid: "process-guid-1"} + requestBody = &models.ProtoActualLRPsRequest{ProcessGuid: "process-guid-1"} }) It("calls the DB with the process guid filter to retrieve the actual lrps", func() { @@ -184,7 +184,7 @@ var _ = Describe("ActualLRP Handlers", func() { req := &models.ActualLRPsRequest{} index := int32(1) req.SetIndex(&index) - requestBody = req + requestBody = req.ToProto() }) It("calls the DB with the index filter to retrieve the actual lrps", func() { @@ -204,7 +204,7 @@ var _ = Describe("ActualLRP Handlers", func() { } index := int32(2) req.SetIndex(&index) - requestBody = req + requestBody = req.ToProto() }) It("call the DB with all provided filters to retrieve the actual lrps", func() { @@ -268,7 +268,7 @@ var _ = Describe("ActualLRP Handlers", func() { }) Describe("ActualLRPGroups", func() { - var requestBody interface{} + var requestBody *models.ActualLRPGroupsRequest BeforeEach(func() { //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method @@ -276,7 +276,8 @@ var _ = Describe("ActualLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.ActualLRPGroups(logger, responseRecorder, request) }) @@ -426,7 +427,7 @@ var _ = Describe("ActualLRP Handlers", func() { BeforeEach(func() { //lint:ignore SA1019 - deprecated model used for testing deprecated functionality - requestBody = &models.ActualLRPGroupsByProcessGuidRequest{ + requestBody = &models.ProtoActualLRPGroupsByProcessGuidRequest{ ProcessGuid: processGuid, } }) @@ -544,7 +545,7 @@ var _ = Describe("ActualLRP Handlers", func() { BeforeEach(func() { //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method - requestBody = &models.ActualLRPGroupByProcessGuidAndIndexRequest{ + requestBody = &models.ProtoActualLRPGroupByProcessGuidAndIndexRequest{ ProcessGuid: processGuid, Index: index, } diff --git a/handlers/actual_lrp_lifecycle_handler.go b/handlers/actual_lrp_lifecycle_handler.go index b9d6b53c..7b215f77 100644 --- a/handlers/actual_lrp_lifecycle_handler.go +++ b/handlers/actual_lrp_lifecycle_handler.go @@ -53,19 +53,19 @@ func (h *ActualLRPLifecycleHandler) ClaimActualLRP(logger lager.Logger, w http.R var request *models.ClaimActualLRPRequest protoRequest := &models.ProtoClaimActualLRPRequest{} - response := &models.ActualLRPLifecycleResponse{} - defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + protoResponse := &models.ProtoActualLRPLifecycleResponse{} + defer func() { exitIfUnrecoverable(logger, h.exitChan, protoResponse.Error.FromProto()) }() + defer writeResponse(w, protoResponse) err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err != nil { - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() return } err = h.controller.ClaimActualLRP(req.Context(), logger, request.ProcessGuid, request.Index, request.ActualLrpInstanceKey) - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() } func (h *ActualLRPLifecycleHandler) StartActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -75,15 +75,15 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP(logger lager.Logger, w http.R var request *models.StartActualLRPRequest protoRequest := &models.ProtoStartActualLRPRequest{} - response := &models.ActualLRPLifecycleResponse{} + protoResponse := &models.ProtoActualLRPLifecycleResponse{} - defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { exitIfUnrecoverable(logger, h.exitChan, protoResponse.Error.FromProto()) }() + defer writeResponse(w, protoResponse) err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err != nil { - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() return } routable := true @@ -93,7 +93,7 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP(logger lager.Logger, w http.R } err = h.controller.StartActualLRP(req.Context(), logger, request.ActualLrpKey, request.ActualLrpInstanceKey, request.ActualLrpNetInfo, request.ActualLrpInternalRoutes, request.MetricTags, routable, request.AvailabilityZone) - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() } func (h *ActualLRPLifecycleHandler) StartActualLRP_r0(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -103,15 +103,15 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP_r0(logger lager.Logger, w htt var request *models.StartActualLRPRequest protoRequest := &models.ProtoStartActualLRPRequest{} - response := &models.ActualLRPLifecycleResponse{} + protoResponse := &models.ProtoActualLRPLifecycleResponse{} - defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { exitIfUnrecoverable(logger, h.exitChan, protoResponse.Error.FromProto()) }() + defer writeResponse(w, protoResponse) err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err != nil { - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() return } routable := true @@ -121,7 +121,7 @@ func (h *ActualLRPLifecycleHandler) StartActualLRP_r0(logger lager.Logger, w htt } err = h.controller.StartActualLRP(req.Context(), logger, request.ActualLrpKey, request.ActualLrpInstanceKey, request.ActualLrpNetInfo, []*models.ActualLRPInternalRoute{}, nil, routable, request.AvailabilityZone) - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() } func (h *ActualLRPLifecycleHandler) CrashActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -131,14 +131,14 @@ func (h *ActualLRPLifecycleHandler) CrashActualLRP(logger lager.Logger, w http.R var request *models.CrashActualLRPRequest protoRequest := &models.ProtoCrashActualLRPRequest{} - response := &models.ActualLRPLifecycleResponse{} - defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + protoResponse := &models.ProtoActualLRPLifecycleResponse{} + defer func() { exitIfUnrecoverable(logger, h.exitChan, protoResponse.Error.FromProto()) }() + defer writeResponse(w, protoResponse) err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err != nil { - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() return } @@ -146,7 +146,7 @@ func (h *ActualLRPLifecycleHandler) CrashActualLRP(logger lager.Logger, w http.R actualLRPInstanceKey := request.ActualLrpInstanceKey err = h.controller.CrashActualLRP(req.Context(), logger, actualLRPKey, actualLRPInstanceKey, request.ErrorMessage) - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() } func (h *ActualLRPLifecycleHandler) FailActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -157,20 +157,20 @@ func (h *ActualLRPLifecycleHandler) FailActualLRP(logger lager.Logger, w http.Re var request *models.FailActualLRPRequest protoRequest := &models.ProtoFailActualLRPRequest{} - response := &models.ActualLRPLifecycleResponse{} + protoResponse := &models.ProtoActualLRPLifecycleResponse{} - defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { exitIfUnrecoverable(logger, h.exitChan, protoResponse.Error.FromProto()) }() + defer writeResponse(w, protoResponse) err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err != nil { - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() return } err = h.controller.FailActualLRP(req.Context(), logger, request.ActualLrpKey, request.ErrorMessage) - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() } func (h *ActualLRPLifecycleHandler) RemoveActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -181,20 +181,20 @@ func (h *ActualLRPLifecycleHandler) RemoveActualLRP(logger lager.Logger, w http. var request *models.RemoveActualLRPRequest protoRequest := &models.ProtoRemoveActualLRPRequest{} - response := &models.ActualLRPLifecycleResponse{} + protoResponse := &models.ProtoActualLRPLifecycleResponse{} - defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { exitIfUnrecoverable(logger, h.exitChan, protoResponse.Error.FromProto()) }() + defer writeResponse(w, protoResponse) err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err != nil { - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() return } err = h.controller.RemoveActualLRP(req.Context(), logger, request.ProcessGuid, request.Index, request.ActualLrpInstanceKey) - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() } func (h *ActualLRPLifecycleHandler) RetireActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -204,19 +204,19 @@ func (h *ActualLRPLifecycleHandler) RetireActualLRP(logger lager.Logger, w http. var request *models.RetireActualLRPRequest protoRequest := &models.ProtoRetireActualLRPRequest{} - response := &models.ActualLRPLifecycleResponse{} + protoResponse := &models.ProtoActualLRPLifecycleResponse{} var err error - defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { exitIfUnrecoverable(logger, h.exitChan, protoResponse.Error.FromProto()) }() + defer writeResponse(w, protoResponse) err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err != nil { - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() return } err = h.controller.RetireActualLRP(trace.ContextWithRequestId(req), logger, request.ActualLrpKey) - response.Error = models.ConvertError(err) + protoResponse.Error = models.ConvertError(err).ToProto() } diff --git a/handlers/actual_lrp_lifecycle_handler_test.go b/handlers/actual_lrp_lifecycle_handler_test.go index e78b40af..da20b7bf 100644 --- a/handlers/actual_lrp_lifecycle_handler_test.go +++ b/handlers/actual_lrp_lifecycle_handler_test.go @@ -62,10 +62,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { "cell-id-0", ) requestBody = &instanceKey - requestBody = &models.ClaimActualLRPRequest{ + requestBody = &models.ProtoClaimActualLRPRequest{ ProcessGuid: processGuid, Index: index, - ActualLrpInstanceKey: &instanceKey, + ActualLrpInstanceKey: instanceKey.ToProto(), } }) @@ -170,7 +170,7 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(&requestBody) + request := newTestRequest(requestBody.ToProto()) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.StartActualLRP(logger, responseRecorder, request) }) @@ -319,7 +319,7 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(&requestBody) + request := newTestRequest(requestBody.ToProto()) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.StartActualLRP_r0(logger, responseRecorder, request) }) @@ -437,9 +437,9 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { ) instanceKey = models.NewActualLRPInstanceKey(instanceGuid, cellId) errorMessage = "something went wrong" - requestBody = &models.CrashActualLRPRequest{ - ActualLrpKey: &key, - ActualLrpInstanceKey: &instanceKey, + requestBody = &models.ProtoCrashActualLRPRequest{ + ActualLrpKey: key.ToProto(), + ActualLrpInstanceKey: instanceKey.ToProto(), ErrorMessage: errorMessage, } }) @@ -508,7 +508,6 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { Describe("RetireActualLRP", func() { var ( request *http.Request - response *models.ActualLRPLifecycleResponse processGuid = "process-guid" index = int32(1) @@ -524,8 +523,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { "domain-0", ) - requestBody = &models.RetireActualLRPRequest{ - ActualLrpKey: &key, + requestBody = &models.ProtoRetireActualLRPRequest{ + ActualLrpKey: key.ToProto(), } }) @@ -563,6 +562,12 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { }) It("returns an error and does not retry", func() { + Expect(responseRecorder.Code).To(Equal(http.StatusOK)) + var response models.ActualLRPLifecycleResponse + var protoResponse models.ProtoActualLRPLifecycleResponse + err := proto.Unmarshal(responseRecorder.Body.Bytes(), &protoResponse) + response = *protoResponse.FromProto() + Expect(err).NotTo(HaveOccurred()) Expect(response.Error.Message).To(Equal("could not find lrp")) }) }) @@ -587,8 +592,8 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { "domain-0", ) errorMessage = "something went wrong" - requestBody = &models.FailActualLRPRequest{ - ActualLrpKey: &key, + requestBody = &models.ProtoFailActualLRPRequest{ + ActualLrpKey: key.ToProto(), ErrorMessage: errorMessage, } }) @@ -670,10 +675,10 @@ var _ = Describe("ActualLRP Lifecycle Handlers", func() { "cell-id-0", ) - requestBody = &models.RemoveActualLRPRequest{ + requestBody = &models.ProtoRemoveActualLRPRequest{ ProcessGuid: processGuid, Index: index, - ActualLrpInstanceKey: &instanceKey, + ActualLrpInstanceKey: instanceKey.ToProto(), } }) diff --git a/handlers/context_test.go b/handlers/context_test.go index 1cee425e..59158002 100644 --- a/handlers/context_test.go +++ b/handlers/context_test.go @@ -140,7 +140,7 @@ var _ = Describe("Context", func() { <-sleepStarting ctxWithCancel, cancelFn := context.WithCancel(context.Background()) - requestBody := &models.ActualLRPsRequest{} + requestBody := &models.ProtoActualLRPsRequest{} request := newTestRequest(requestBody).WithContext(ctxWithCancel) responseRecorder := httptest.NewRecorder() finishedRequest := make(chan struct{}, 1) diff --git a/handlers/desired_lrp_handlers.go b/handlers/desired_lrp_handlers.go index 631efbc7..6cfb32e2 100644 --- a/handlers/desired_lrp_handlers.go +++ b/handlers/desired_lrp_handlers.go @@ -74,6 +74,9 @@ func (h *DesiredLRPHandler) commonDesiredLRPs(logger lager.Logger, targetVersion protoRequest := &models.ProtoDesiredLRPsRequest{} response := &models.DesiredLRPsResponse{} + defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() + defer func() { writeResponse(w, response.ToProto()) }() + err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err == nil { @@ -92,8 +95,8 @@ func (h *DesiredLRPHandler) commonDesiredLRPs(logger lager.Logger, targetVersion } response.Error = models.ConvertError(err) - writeResponse(w, response.ToProto()) - exitIfUnrecoverable(logger, h.exitChan, response.Error) + // writeResponse(w, response.ToProto()) + // exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -113,6 +116,9 @@ func (h *DesiredLRPHandler) commonDesiredLRPByProcessGuid(logger lager.Logger, t protoRequest := &models.ProtoDesiredLRPByProcessGuidRequest{} response := &models.DesiredLRPResponse{} + defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() + defer func() { writeResponse(w, response.ToProto()) }() + err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err == nil { @@ -125,8 +131,8 @@ func (h *DesiredLRPHandler) commonDesiredLRPByProcessGuid(logger lager.Logger, t } response.Error = models.ConvertError(err) - writeResponse(w, response.ToProto()) - exitIfUnrecoverable(logger, h.exitChan, response.Error) + // writeResponse(w, response.ToProto()) + // exitIfUnrecoverable(logger, h.exitChan, response.Error) } @@ -148,6 +154,9 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfos(logger lager.Logger, w htt protoRequest := &models.ProtoDesiredLRPsRequest{} response := &models.DesiredLRPSchedulingInfosResponse{} + defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() + defer func() { writeResponse(w, response.ToProto()) }() + err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err == nil { @@ -159,8 +168,8 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfos(logger lager.Logger, w htt } response.Error = models.ConvertError(err) - writeResponse(w, response.ToProto()) - exitIfUnrecoverable(logger, h.exitChan, response.Error) + // writeResponse(w, response.ToProto()) + // exitIfUnrecoverable(logger, h.exitChan, response.Error) } func (h *DesiredLRPHandler) DesiredLRPSchedulingInfoByProcessGuid(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -173,6 +182,9 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfoByProcessGuid(logger lager.L protoRequest := &models.ProtoDesiredLRPByProcessGuidRequest{} response := &models.DesiredLRPSchedulingInfoByProcessGuidResponse{} + defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() + defer func() { writeResponse(w, response.ToProto()) }() + err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err == nil { @@ -180,8 +192,8 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfoByProcessGuid(logger lager.L } response.Error = models.ConvertError(err) - writeResponse(w, response.ToProto()) - exitIfUnrecoverable(logger, h.exitChan, response.Error) + // writeResponse(w, response.ToProto()) + // exitIfUnrecoverable(logger, h.exitChan, response.Error) } func (h *DesiredLRPHandler) DesiredLRPRoutingInfos(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -194,6 +206,9 @@ func (h *DesiredLRPHandler) DesiredLRPRoutingInfos(logger lager.Logger, w http.R protoRequest := &models.ProtoDesiredLRPsRequest{} response := &models.DesiredLRPsResponse{} + defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() + defer func() { writeResponse(w, response.ToProto()) }() + err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() if err == nil { @@ -205,8 +220,8 @@ func (h *DesiredLRPHandler) DesiredLRPRoutingInfos(logger lager.Logger, w http.R } response.Error = models.ConvertError(err) - writeResponse(w, response.ToProto()) - exitIfUnrecoverable(logger, h.exitChan, response.Error) + // writeResponse(w, response.ToProto()) + // exitIfUnrecoverable(logger, h.exitChan, response.Error) } func (h *DesiredLRPHandler) DesireDesiredLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -216,7 +231,7 @@ func (h *DesiredLRPHandler) DesireDesiredLRP(logger lager.Logger, w http.Respons protoRequest := &models.ProtoDesireLRPRequest{} response := &models.DesiredLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() @@ -256,7 +271,7 @@ func (h *DesiredLRPHandler) UpdateDesiredLRP(logger lager.Logger, w http.Respons protoRequest := &models.ProtoUpdateDesiredLRPRequest{} response := &models.DesiredLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() @@ -323,7 +338,7 @@ func (h *DesiredLRPHandler) RemoveDesiredLRP(logger lager.Logger, w http.Respons protoRequest := &models.ProtoRemoveDesiredLRPRequest{} response := &models.DesiredLRPLifecycleResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() diff --git a/handlers/desired_lrp_handlers_test.go b/handlers/desired_lrp_handlers_test.go index 423f204d..865a87ec 100644 --- a/handlers/desired_lrp_handlers_test.go +++ b/handlers/desired_lrp_handlers_test.go @@ -84,7 +84,7 @@ var _ = Describe("DesiredLRP Handlers", func() { }) Describe("DesiredLRPs_r2", func() { - var requestBody interface{} + var requestBody *models.DesiredLRPsRequest BeforeEach(func() { requestBody = &models.DesiredLRPsRequest{} @@ -93,7 +93,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.DesiredLRPs_r2(logger, responseRecorder, request) }) @@ -263,7 +264,7 @@ var _ = Describe("DesiredLRP Handlers", func() { }) Describe("DesiredLRPs", func() { - var requestBody interface{} + var requestBody *models.DesiredLRPsRequest BeforeEach(func() { requestBody = &models.DesiredLRPsRequest{} @@ -272,7 +273,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.DesiredLRPs(logger, responseRecorder, request) }) @@ -410,7 +412,7 @@ var _ = Describe("DesiredLRP Handlers", func() { var ( processGuid = "process-guid" - requestBody interface{} + requestBody *models.DesiredLRPByProcessGuidRequest ) BeforeEach(func() { @@ -420,7 +422,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.DesiredLRPByProcessGuid_r2(logger, responseRecorder, request) }) @@ -554,7 +557,7 @@ var _ = Describe("DesiredLRP Handlers", func() { var ( processGuid = "process-guid" - requestBody interface{} + requestBody *models.DesiredLRPByProcessGuidRequest ) BeforeEach(func() { @@ -564,7 +567,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.DesiredLRPByProcessGuid(logger, responseRecorder, request) }) @@ -671,7 +675,7 @@ var _ = Describe("DesiredLRP Handlers", func() { Describe("DesiredLRPSchedulingInfos", func() { var ( - requestBody interface{} + requestBody *models.DesiredLRPsRequest schedulingInfo1 models.DesiredLRPSchedulingInfo schedulingInfo2 models.DesiredLRPSchedulingInfo ) @@ -683,7 +687,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.DesiredLRPSchedulingInfos(logger, responseRecorder, request) }) @@ -793,7 +798,7 @@ var _ = Describe("DesiredLRP Handlers", func() { var ( processGuid = "process-guid" - requestBody interface{} + requestBody *models.DesiredLRPByProcessGuidRequest ) BeforeEach(func() { @@ -803,7 +808,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.DesiredLRPSchedulingInfoByProcessGuid(logger, responseRecorder, request) }) @@ -838,6 +844,7 @@ var _ = Describe("DesiredLRP Handlers", func() { Expect(response.Error).To(BeNil()) responseSchedInfo := response.DesiredLrpSchedulingInfo + Expect(*responseSchedInfo).To(Equal(schedInfo)) Expect(*responseSchedInfo).To(DeepEqual(schedInfo)) }) }) @@ -891,7 +898,7 @@ var _ = Describe("DesiredLRP Handlers", func() { Describe("DesiredLRPRoutingInfos", func() { var ( - requestBody interface{} + requestBody *models.DesiredLRPsRequest routingInfo1 models.DesiredLRP routingInfo2 models.DesiredLRP ) @@ -903,7 +910,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) handler.DesiredLRPRoutingInfos(logger, responseRecorder, request) }) @@ -1011,7 +1019,7 @@ var _ = Describe("DesiredLRP Handlers", func() { var ( desiredLRP *models.DesiredLRP - requestBody interface{} + requestBody *models.DesireLRPRequest ) BeforeEach(func() { @@ -1023,7 +1031,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.DesireDesiredLRP(logger, responseRecorder, request) }) @@ -1257,9 +1266,17 @@ var _ = Describe("DesiredLRP Handlers", func() { beforeDesiredLRP *models.DesiredLRP afterDesiredLRP *models.DesiredLRP - requestBody interface{} + requestBody *models.UpdateDesiredLRPRequest ) + JustBeforeEach(func() { + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) + request.Header.Set(lager.RequestIdHeader, requestIdHeader) + handler.UpdateDesiredLRP(logger, responseRecorder, request) + time.Sleep(100 * time.Millisecond) + }) + BeforeEach(func() { processGuid = "some-guid" someText := "some-text" @@ -1278,7 +1295,8 @@ var _ = Describe("DesiredLRP Handlers", func() { Update: update, } - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.UpdateDesiredLRP(logger, responseRecorder, request) time.Sleep(100 * time.Millisecond) @@ -1920,7 +1938,7 @@ var _ = Describe("DesiredLRP Handlers", func() { var ( processGuid string - requestBody interface{} + requestBody *models.RemoveDesiredLRPRequest ) BeforeEach(func() { @@ -1932,7 +1950,8 @@ var _ = Describe("DesiredLRP Handlers", func() { }) JustBeforeEach(func() { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.RemoveDesiredLRP(logger, responseRecorder, request) time.Sleep(100 * time.Millisecond) diff --git a/handlers/domain_handlers_test.go b/handlers/domain_handlers_test.go index 85b5507a..6b482897 100644 --- a/handlers/domain_handlers_test.go +++ b/handlers/domain_handlers_test.go @@ -50,7 +50,7 @@ var _ = Describe("Domain Handlers", func() { domain = "domain-to-add" ttl = 12345 - requestBody = &models.UpsertDomainRequest{ + requestBody = &models.ProtoUpsertDomainRequest{ Domain: domain, Ttl: ttl, } @@ -91,7 +91,7 @@ var _ = Describe("Domain Handlers", func() { Context("when the request is invalid", func() { BeforeEach(func() { - requestBody = &models.UpsertDomainRequest{} + requestBody = &models.ProtoUpsertDomainRequest{} }) It("responds with an error", func() { diff --git a/handlers/evacuation_handler.go b/handlers/evacuation_handler.go index 599aaa25..2e75f8f5 100644 --- a/handlers/evacuation_handler.go +++ b/handlers/evacuation_handler.go @@ -50,7 +50,7 @@ func (h *EvacuationHandler) RemoveEvacuatingActualLRP(logger lager.Logger, w htt response := &models.RemoveEvacuatingActualLRPResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err = parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() @@ -72,7 +72,7 @@ func (h *EvacuationHandler) EvacuateClaimedActualLRP(logger lager.Logger, w http protoRequest := &models.ProtoEvacuateClaimedActualLRPRequest{} response := &models.EvacuationResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() @@ -97,7 +97,7 @@ func (h *EvacuationHandler) EvacuateCrashedActualLRP(logger lager.Logger, w http protoRequest := &models.ProtoEvacuateCrashedActualLRPRequest{} response := &models.EvacuationResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() @@ -121,7 +121,7 @@ func (h *EvacuationHandler) commonEvacuateRunningActualLRP(logger lager.Logger, response := &models.EvacuationResponse{} response.KeepContainer = true defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() @@ -166,7 +166,7 @@ func (h *EvacuationHandler) EvacuateStoppedActualLRP(logger lager.Logger, w http response := &models.EvacuationResponse{} defer func() { exitIfUnrecoverable(logger, h.exitChan, response.Error) }() - defer writeResponse(w, response.ToProto()) + defer func() { writeResponse(w, response.ToProto()) }() err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() diff --git a/handlers/evacuation_handler_test.go b/handlers/evacuation_handler_test.go index 373e5285..edc88304 100644 --- a/handlers/evacuation_handler_test.go +++ b/handlers/evacuation_handler_test.go @@ -62,9 +62,9 @@ var _ = Describe("Evacuation Handlers", func() { ) BeforeEach(func() { - requestBody = &models.RemoveEvacuatingActualLRPRequest{ - ActualLrpKey: &key, - ActualLrpInstanceKey: &instanceKey, + requestBody = &models.ProtoRemoveEvacuatingActualLRPRequest{ + ActualLrpKey: key.ToProto(), + ActualLrpInstanceKey: instanceKey.ToProto(), } }) @@ -121,7 +121,7 @@ var _ = Describe("Evacuation Handlers", func() { Context("when the request is invalid", func() { BeforeEach(func() { - requestBody = &models.RemoveEvacuatingActualLRPRequest{} + requestBody = &models.ProtoRemoveEvacuatingActualLRPRequest{} }) It("responds with an error", func() { @@ -173,7 +173,7 @@ var _ = Describe("Evacuation Handlers", func() { ActualLrpKey: &actual.ActualLrpKey, ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, } - request = newTestRequest(requestBody) + request = newTestRequest(requestBody.ToProto()) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.EvacuateClaimedActualLRP(logger, responseRecorder, request) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) @@ -302,7 +302,7 @@ var _ = Describe("Evacuation Handlers", func() { ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, ErrorMessage: "i failed", } - request = newTestRequest(requestBody) + request = newTestRequest(requestBody.ToProto()) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.EvacuateCrashedActualLRP(logger, responseRecorder, request) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) @@ -393,7 +393,7 @@ var _ = Describe("Evacuation Handlers", func() { ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, ActualLrpNetInfo: &actual.ActualLrpNetInfo, } - request = newTestRequest(requestBody) + request = newTestRequest(requestBody.ToProto()) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.EvacuateRunningActualLRP_r0(logger, responseRecorder, request) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) @@ -528,7 +528,7 @@ var _ = Describe("Evacuation Handlers", func() { }) JustBeforeEach(func() { - request = newTestRequest(requestBody) + request = newTestRequest(requestBody.ToProto()) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.EvacuateRunningActualLRP(logger, responseRecorder, request) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) @@ -702,7 +702,7 @@ var _ = Describe("Evacuation Handlers", func() { ActualLrpKey: &actual.ActualLrpKey, ActualLrpInstanceKey: &actual.ActualLrpInstanceKey, } - request = newTestRequest(requestBody) + request = newTestRequest(requestBody.ToProto()) request.Header.Set(lager.RequestIdHeader, requestIdHeader) handler.EvacuateStoppedActualLRP(logger, responseRecorder, request) Expect(responseRecorder.Code).To(Equal(http.StatusOK)) diff --git a/handlers/events_handlers.go b/handlers/events_handlers.go index 929eba81..a2b96fc1 100644 --- a/handlers/events_handlers.go +++ b/handlers/events_handlers.go @@ -3,6 +3,7 @@ package handlers import ( "bytes" "fmt" + "log" "net/http" "code.cloudfoundry.org/bbs/events" @@ -96,7 +97,9 @@ func streamEventsToResponse(logger lager.Logger, w http.ResponseWriter, eventCha return } + log.Printf("streamEventsToResponse event: %+v", event) sseEvent, err := events.NewEventFromModelEvent(eventID, event) + log.Printf("sseEvent: %+v", sseEvent) if err != nil { logger.Error("failed-to-marshal-event", err) return diff --git a/handlers/events_handlers_r0.go b/handlers/events_handlers_r0.go index d84a035c..849ce13a 100644 --- a/handlers/events_handlers_r0.go +++ b/handlers/events_handlers_r0.go @@ -1,6 +1,7 @@ package handlers import ( + "log" "net/http" "code.cloudfoundry.org/bbs/format" @@ -91,6 +92,9 @@ func (h *LRPInstanceEventHandler) commonSubscribe(logger lager.Logger, w http.Re var request *models.EventsByCellId protoRequest := &models.ProtoEventsByCellId{} err := parseRequest(logger, req, protoRequest) + request = protoRequest.FromProto() + log.Printf("protoRequest: %+v", protoRequest) + log.Printf("request: %+v", request) if err != nil { logger.Error("failed-parsing-request", err) w.WriteHeader(http.StatusInternalServerError) diff --git a/handlers/events_handlers_test.go b/handlers/events_handlers_test.go index 2a13c507..c0916269 100644 --- a/handlers/events_handlers_test.go +++ b/handlers/events_handlers_test.go @@ -4,6 +4,7 @@ import ( "encoding/base64" "fmt" "io" + "log" "net/http" "net/http/httptest" "strings" @@ -23,7 +24,7 @@ import ( "github.com/vito/go-sse/sse" ) -var _ = Describe("Event Handlers", func() { +var _ = FDescribe("Event Handlers", func() { var ( logger lager.Logger handler handlers.EventController @@ -114,13 +115,17 @@ var _ = Describe("Event Handlers", func() { }) Context("when successfully subscribing to the event hub", func() { - It("emits events from the hub to the connection", func() { + FIt("emits events from the hub to the connection", func() { + log.Printf("response.Body: %+v", response.Body) reader := sse.NewReadCloser(response.Body) hub.Emit(&eventfakes.FakeEvent{Token: "A"}) encodedPayload := base64.StdEncoding.EncodeToString([]byte("A")) - Expect(reader.Next()).To(Equal(sse.Event{ + tokenA, _ := reader.Next() + log.Printf("tokenA: %+v", tokenA) + + Expect(tokenA).To(Equal(sse.Event{ ID: "0", Name: "fake", Data: []byte(encodedPayload), diff --git a/handlers/handlers_suite_test.go b/handlers/handlers_suite_test.go index b346a92a..045f43a0 100644 --- a/handlers/handlers_suite_test.go +++ b/handlers/handlers_suite_test.go @@ -8,9 +8,9 @@ import ( "code.cloudfoundry.org/bbs/serviceclient/serviceclientfakes" "code.cloudfoundry.org/rep/repfakes" - "github.com/gogo/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "google.golang.org/protobuf/proto" "testing" ) diff --git a/handlers/task_handlers_test.go b/handlers/task_handlers_test.go index b6303e69..3c8fd835 100644 --- a/handlers/task_handlers_test.go +++ b/handlers/task_handlers_test.go @@ -69,7 +69,7 @@ var _ = Describe("Task Handlers", func() { }) JustBeforeEach(func() { - requestBody = &models.TasksRequest{ + requestBody = &models.ProtoTasksRequest{ Domain: domain, CellId: cellId, } @@ -208,7 +208,7 @@ var _ = Describe("Task Handlers", func() { }) JustBeforeEach(func() { - requestBody = &models.TasksRequest{ + requestBody = &models.ProtoTasksRequest{ Domain: domain, CellId: cellId, } @@ -307,7 +307,7 @@ var _ = Describe("Task Handlers", func() { var taskGuid = "task-guid" BeforeEach(func() { - requestBody = &models.TaskByGuidRequest{ + requestBody = &models.ProtoTaskByGuidRequest{ TaskGuid: taskGuid, } }) @@ -431,7 +431,7 @@ var _ = Describe("Task Handlers", func() { var taskGuid = "task-guid" BeforeEach(func() { - requestBody = &models.TaskByGuidRequest{ + requestBody = &models.ProtoTaskByGuidRequest{ TaskGuid: taskGuid, } }) @@ -533,10 +533,10 @@ var _ = Describe("Task Handlers", func() { BeforeEach(func() { taskDef = model_helpers.NewValidTaskDefinition() - requestBody = &models.DesireTaskRequest{ + requestBody = &models.ProtoDesireTaskRequest{ TaskGuid: taskGuid, Domain: domain, - TaskDefinition: taskDef, + TaskDefinition: taskDef.ToProto(), } }) @@ -600,7 +600,7 @@ var _ = Describe("Task Handlers", func() { var ctx context.Context BeforeEach(func() { - requestBody = &models.StartTaskRequest{ + requestBody = &models.ProtoStartTaskRequest{ TaskGuid: "task-guid", CellId: "cell-id", } @@ -695,7 +695,7 @@ var _ = Describe("Task Handlers", func() { ) BeforeEach(func() { - requestBody = &models.TaskGuidRequest{ + requestBody = &models.ProtoTaskGuidRequest{ TaskGuid: "task-guid", } @@ -792,7 +792,7 @@ var _ = Describe("Task Handlers", func() { controller.FailTaskReturns(nil) //lint:ignore SA1019 - testing deprecated code - requestBody = &models.FailTaskRequest{ + requestBody = &models.ProtoFailTaskRequest{ TaskGuid: taskGuid, FailureReason: failureReason, } @@ -857,7 +857,7 @@ var _ = Describe("Task Handlers", func() { BeforeEach(func() { controller.RejectTaskReturns(nil) - requestBody = &models.RejectTaskRequest{ + requestBody = &models.ProtoRejectTaskRequest{ TaskGuid: taskGuid, RejectionReason: rejectionReason, } @@ -934,7 +934,7 @@ var _ = Describe("Task Handlers", func() { controller.CompleteTaskReturns(nil) - requestBody = &models.CompleteTaskRequest{ + requestBody = &models.ProtoCompleteTaskRequest{ TaskGuid: taskGuid, CellId: cellId, Failed: failed, @@ -1003,7 +1003,7 @@ var _ = Describe("Task Handlers", func() { Describe("ResolvingTask", func() { Context("when the resolving request is normal", func() { BeforeEach(func() { - requestBody = &models.TaskGuidRequest{ + requestBody = &models.ProtoTaskGuidRequest{ TaskGuid: "task-guid", } }) @@ -1065,7 +1065,7 @@ var _ = Describe("Task Handlers", func() { Describe("DeleteTask", func() { Context("when the delete request is normal", func() { BeforeEach(func() { - requestBody = &models.TaskGuidRequest{ + requestBody = &models.ProtoTaskGuidRequest{ TaskGuid: "task-guid", } }) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index a02e9b82..26f1f7dd 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -52,7 +52,7 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo RootFs: desiredLrpResource.RootFs, Instances: schedInfo.Instances, Annotation: schedInfo.Annotation, - Routes: &schedInfo.Routes, + Routes: schedInfo.Routes, ModificationTag: &schedInfo.ModificationTag, EnvironmentVariables: environmentVariables, CachedDependencies: runInfo.CachedDependencies, @@ -228,7 +228,7 @@ func (d *DesiredLRP) DesiredLRPSchedulingInfo() DesiredLRPSchedulingInfo { d.Annotation, d.Instances, d.DesiredLRPResource(), - routes, + &routes, modificationTag, &volumePlacement, d.PlacementTags, @@ -517,7 +517,7 @@ func NewDesiredLRPSchedulingInfo( annotation string, instances int32, resource DesiredLRPResource, - routes Routes, + routes *Routes, modTag ModificationTag, volumePlacement *VolumePlacement, placementTags []string, @@ -557,7 +557,7 @@ func (s *DesiredLRPSchedulingInfo) ApplyUpdate(update *DesiredLRPUpdate) { s.Instances = *update.GetInstances() } if update.Routes != nil { - s.Routes = *update.Routes + s.Routes = update.Routes } if update.AnnotationExists() { s.Annotation = *update.GetAnnotation() diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index f19d9078..b0e37808 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1020,7 +1020,7 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x01, 0x52, 0x06, 0x72, 0x6f, + 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 7eb52f4c..9133fe63 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -26,7 +26,7 @@ message ProtoDesiredLRPSchedulingInfo { ProtoDesiredLRPResource desired_lrp_resource = 4 [(bbs.bbs_by_value) = true, json_name = "desired_lrp_resource", (bbs.bbs_json_always_emit) = true]; - ProtoRoutes routes = 5 [(bbs.bbs_by_value) = true]; + ProtoRoutes routes = 5 [(bbs.bbs_by_value) = false]; ProtoModificationTag modification_tag = 6 [(bbs.bbs_by_value) = true, json_name = "modification_tag", (bbs.bbs_json_always_emit) = true]; ProtoVolumePlacement volume_placement = 7 [json_name = "volume_placement"]; repeated string PlacementTags = 8 [json_name ="placement_tags"]; diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index fd1e8ea0..4477da5c 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -12,7 +12,7 @@ type DesiredLRPSchedulingInfo struct { Annotation string `json:"annotation"` Instances int32 `json:"instances"` DesiredLrpResource DesiredLRPResource `json:"desired_lrp_resource"` - Routes Routes `json:"routes,omitempty"` + Routes *Routes `json:"routes,omitempty"` ModificationTag ModificationTag `json:"modification_tag"` VolumePlacement *VolumePlacement `json:"volume_placement,omitempty"` PlacementTags []string `json:"placement_tags,omitempty"` @@ -52,7 +52,11 @@ func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { if !this.DesiredLrpResource.Equal(that1.DesiredLrpResource) { return false } - if !this.Routes.Equal(that1.Routes) { + if this.Routes == nil { + if that1.Routes != nil { + return false + } + } else if !this.Routes.Equal(*that1.Routes) { return false } if !this.ModificationTag.Equal(that1.ModificationTag) { @@ -115,7 +119,13 @@ func (m *DesiredLRPSchedulingInfo) SetDesiredLrpResource(value DesiredLRPResourc m.DesiredLrpResource = value } } -func (m *DesiredLRPSchedulingInfo) SetRoutes(value Routes) { +func (m *DesiredLRPSchedulingInfo) GetRoutes() *Routes { + if m != nil { + return m.Routes + } + return nil +} +func (m *DesiredLRPSchedulingInfo) SetRoutes(value *Routes) { if m != nil { m.Routes = value } @@ -175,7 +185,7 @@ func (x *ProtoDesiredLRPSchedulingInfo) FromProto() *DesiredLRPSchedulingInfo { Annotation: x.Annotation, Instances: x.Instances, DesiredLrpResource: *x.DesiredLrpResource.FromProto(), - Routes: *x.Routes.FromProto(), + Routes: x.Routes.FromProto(), ModificationTag: *x.ModificationTag.FromProto(), VolumePlacement: x.VolumePlacement.FromProto(), PlacementTags: x.PlacementTags, diff --git a/models/routes.go b/models/routes.go index 267d9f09..5fa8fd8f 100644 --- a/models/routes.go +++ b/models/routes.go @@ -38,7 +38,7 @@ func (r *Routes) ToProto() *ProtoRoutes { } func (pr *ProtoRoutes) FromProto() *Routes { - if pr == nil { + if pr == nil || pr.Routes == nil || len(pr.Routes) == 0 { return nil } From 434b8d49cb04b7bb68f0ffe46fd426874f2b7eff Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 10 Jul 2024 17:25:52 +0000 Subject: [PATCH 116/155] Ginkgo unfocus + lint ignore for deprecated method testing --- handlers/actual_lrp_handlers_test.go | 1 + handlers/events_handlers_test.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/handlers/actual_lrp_handlers_test.go b/handlers/actual_lrp_handlers_test.go index e78f4dfb..4af98269 100644 --- a/handlers/actual_lrp_handlers_test.go +++ b/handlers/actual_lrp_handlers_test.go @@ -268,6 +268,7 @@ var _ = Describe("ActualLRP Handlers", func() { }) Describe("ActualLRPGroups", func() { + //lint:ignore SA1019 - calling deprecated model while unit testing deprecated method var requestBody *models.ActualLRPGroupsRequest BeforeEach(func() { diff --git a/handlers/events_handlers_test.go b/handlers/events_handlers_test.go index c0916269..d0179d5b 100644 --- a/handlers/events_handlers_test.go +++ b/handlers/events_handlers_test.go @@ -24,7 +24,7 @@ import ( "github.com/vito/go-sse/sse" ) -var _ = FDescribe("Event Handlers", func() { +var _ = Describe("Event Handlers", func() { var ( logger lager.Logger handler handlers.EventController @@ -115,7 +115,7 @@ var _ = FDescribe("Event Handlers", func() { }) Context("when successfully subscribing to the event hub", func() { - FIt("emits events from the hub to the connection", func() { + It("emits events from the hub to the connection", func() { log.Printf("response.Body: %+v", response.Body) reader := sse.NewReadCloser(response.Body) From e9e1604acdc5791877cee8d6ec9322dceac63b69 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 10 Jul 2024 17:26:30 +0000 Subject: [PATCH 117/155] Lint ignore for unnecessary nil check Change routes to use pointers --- models/actions.go | 9 ++++++--- models/desired_lrp_test.go | 16 ++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/models/actions.go b/models/actions.go index 37c57d1c..ac6caa06 100644 --- a/models/actions.go +++ b/models/actions.go @@ -292,7 +292,8 @@ func (a *ParallelAction) ActionType() string { func (a ParallelAction) Validate() error { var validationError ValidationError - if len(a.Actions) == 0 { + //lint:ignore S1009 - preserve nil check + if a.Actions == nil || len(a.Actions) == 0 { validationError = validationError.Append(ErrInvalidField{"actions"}) } else { for index, action := range a.Actions { @@ -322,7 +323,8 @@ func (a *CodependentAction) ActionType() string { func (a CodependentAction) Validate() error { var validationError ValidationError - if len(a.Actions) == 0 { + //lint:ignore S1009 - preserve nil check + if a.Actions == nil || len(a.Actions) == 0 { validationError = validationError.Append(ErrInvalidField{"actions"}) } else { for index, action := range a.Actions { @@ -360,7 +362,8 @@ func (a *SerialAction) ActionType() string { func (a SerialAction) Validate() error { var validationError ValidationError - if len(a.Actions) == 0 { + //lint:ignore S1009 - preserve nil check + if a.Actions == nil || len(a.Actions) == 0 { validationError = validationError.Append(ErrInvalidField{"actions"}) } else { for index, action := range a.Actions { diff --git a/models/desired_lrp_test.go b/models/desired_lrp_test.go index 7bd25bd1..4409a76f 100644 --- a/models/desired_lrp_test.go +++ b/models/desired_lrp_test.go @@ -394,7 +394,7 @@ var _ = Describe("DesiredLRP", func() { schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = models.Routes{} + expectedSchedulingInfo.Routes = &models.Routes{} expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -443,7 +443,7 @@ var _ = Describe("DesiredLRP", func() { schedulingInfo := desiredLRP.DesiredLRPSchedulingInfo() expectedSchedulingInfo := schedulingInfo - expectedSchedulingInfo.Routes = *routes + expectedSchedulingInfo.Routes = routes expectedSchedulingInfo.ModificationTag.Increment() schedulingInfo.ApplyUpdate(update) @@ -1551,12 +1551,12 @@ var _ = Describe("DesiredLRPSchedulingInfo", func() { Expect(err.Error()).To(ContainSubstring(expectedErr)) } }, - Entry("valid scheduling info", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, instances, newValidResource(), routes, tag, nil, nil), ""), - Entry("invalid annotation", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), largeString, instances, newValidResource(), routes, tag, nil, nil), "annotation"), - Entry("invalid instances", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, -2, newValidResource(), routes, tag, nil, nil), "instances"), - Entry("invalid key", models.NewDesiredLRPSchedulingInfo(models.DesiredLRPKey{}, annotation, instances, newValidResource(), routes, tag, nil, nil), "process_guid"), - Entry("invalid resource", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, instances, models.DesiredLRPResource{}, routes, tag, nil, nil), "rootfs"), - Entry("invalid routes", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, instances, newValidResource(), largeRoutes, tag, nil, nil), "routes"), + Entry("valid scheduling info", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, instances, newValidResource(), &routes, tag, nil, nil), ""), + Entry("invalid annotation", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), largeString, instances, newValidResource(), &routes, tag, nil, nil), "annotation"), + Entry("invalid instances", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, -2, newValidResource(), &routes, tag, nil, nil), "instances"), + Entry("invalid key", models.NewDesiredLRPSchedulingInfo(models.DesiredLRPKey{}, annotation, instances, newValidResource(), &routes, tag, nil, nil), "process_guid"), + Entry("invalid resource", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, instances, models.DesiredLRPResource{}, &routes, tag, nil, nil), "rootfs"), + Entry("invalid routes", models.NewDesiredLRPSchedulingInfo(newValidLRPKey(), annotation, instances, newValidResource(), &largeRoutes, tag, nil, nil), "routes"), ) }) From 47c81fc8730947061fe02ca6b7e26df9755c42d9 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 10 Jul 2024 17:27:04 +0000 Subject: [PATCH 118/155] Change responses to use pointers so we can use them after the method calls --- client.go | 162 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 100 insertions(+), 62 deletions(-) diff --git a/client.go b/client.go index 298a0102..72e1099e 100644 --- a/client.go +++ b/client.go @@ -326,20 +326,21 @@ type client struct { } func (c *client) Ping(logger lager.Logger, traceID string) bool { - response := models.PingResponse{} - err := c.doRequest(logger, traceID, PingRoute_r0, nil, nil, nil, response.ToProto()) + protoResponse := models.ProtoPingResponse{} + err := c.doRequest(logger, traceID, PingRoute_r0, nil, nil, nil, &protoResponse) if err != nil { return false } - return response.Available + return protoResponse.Available } func (c *client) Domains(logger lager.Logger, traceID string) ([]string, error) { - response := models.DomainsResponse{} - err := c.doRequest(logger, traceID, DomainsRoute_r0, nil, nil, nil, response.ToProto()) + protoResponse := models.ProtoDomainsResponse{} + err := c.doRequest(logger, traceID, DomainsRoute_r0, nil, nil, nil, &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.Domains, response.Error.ToError() } @@ -348,11 +349,12 @@ func (c *client) UpsertDomain(logger lager.Logger, traceID string, domain string Domain: domain, Ttl: uint32(ttl.Seconds()), } - response := models.UpsertDomainResponse{} - err := c.doRequest(logger, traceID, UpsertDomainRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoUpsertDomainResponse{} + err := c.doRequest(logger, traceID, UpsertDomainRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return err } + response := protoResponse.FromProto() return response.Error.ToError() } @@ -365,12 +367,13 @@ func (c *client) ActualLRPs(logger lager.Logger, traceID string, filter models.A if filter.Index != nil { request.SetIndex(filter.Index) } - response := models.ActualLRPsResponse{} - err := c.doRequest(logger, traceID, ActualLRPsRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPsResponse{} + err := c.doRequest(logger, traceID, ActualLRPsRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.ActualLrps, response.Error.ToError() } @@ -380,14 +383,14 @@ func (c *client) ActualLRPGroups(logger lager.Logger, traceID string, filter mod Domain: filter.Domain, CellId: filter.CellID, } - response := models.ProtoActualLRPGroupsResponse{} - err := c.doRequest(logger, traceID, ActualLRPGroupsRoute_r0, nil, nil, request.ToProto(), &response) + protoResponse := models.ProtoActualLRPGroupsResponse{} + err := c.doRequest(logger, traceID, ActualLRPGroupsRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } - nonProtoResponse := response.FromProto() - return nonProtoResponse.ActualLrpGroups, nonProtoResponse.Error.ToError() + response := protoResponse.FromProto() + return response.ActualLrpGroups, response.Error.ToError() } // Deprecated: use ActaulLRPs instead @@ -395,12 +398,13 @@ func (c *client) ActualLRPGroupsByProcessGuid(logger lager.Logger, traceID strin request := models.ActualLRPGroupsByProcessGuidRequest{ ProcessGuid: processGuid, } - response := models.ActualLRPGroupsResponse{} - err := c.doRequest(logger, traceID, ActualLRPGroupsByProcessGuidRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPGroupsResponse{} + err := c.doRequest(logger, traceID, ActualLRPGroupsByProcessGuidRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.ActualLrpGroups, response.Error.ToError() } @@ -410,12 +414,13 @@ func (c *client) ActualLRPGroupByProcessGuidAndIndex(logger lager.Logger, traceI ProcessGuid: processGuid, Index: int32(index), } - response := models.ActualLRPGroupResponse{} - err := c.doRequest(logger, traceID, ActualLRPGroupByProcessGuidAndIndexRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPGroupResponse{} + err := c.doRequest(logger, traceID, ActualLRPGroupByProcessGuidAndIndexRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.ActualLrpGroup, response.Error.ToError() } @@ -425,11 +430,13 @@ func (c *client) ClaimActualLRP(logger lager.Logger, traceID string, key *models Index: key.Index, ActualLrpInstanceKey: instanceKey, } - response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, ClaimActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPLifecycleResponse{} + err := c.doRequest(logger, traceID, ClaimActualLRPRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -443,7 +450,7 @@ func (c *client) StartActualLRP(logger lager.Logger, routable bool, availabilityZone string, ) error { - response := models.ActualLRPLifecycleResponse{} + protoResponse := models.ProtoActualLRPLifecycleResponse{} request := &models.StartActualLRPRequest{ ActualLrpKey: key, ActualLrpInstanceKey: instanceKey, @@ -453,19 +460,21 @@ func (c *client) StartActualLRP(logger lager.Logger, AvailabilityZone: availabilityZone, } request.SetRoutable(&routable) - err := c.doRequest(logger, traceID, StartActualLRPRoute_r1, nil, nil, request.ToProto(), response.ToProto()) + err := c.doRequest(logger, traceID, StartActualLRPRoute_r1, nil, nil, request.ToProto(), &protoResponse) if err != nil && err == EndpointNotFoundErr { startActualLrpRequest := &models.StartActualLRPRequest{ ActualLrpKey: key, ActualLrpInstanceKey: instanceKey, ActualLrpNetInfo: netInfo, } - err = c.doRequest(logger, traceID, StartActualLRPRoute_r0, nil, nil, startActualLrpRequest.ToProto(), response.ToProto()) + err = c.doRequest(logger, traceID, StartActualLRPRoute_r0, nil, nil, startActualLrpRequest.ToProto(), &protoResponse) } if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -475,12 +484,14 @@ func (c *client) CrashActualLRP(logger lager.Logger, traceID string, key *models ActualLrpInstanceKey: instanceKey, ErrorMessage: errorMessage, } - response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, CrashActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPLifecycleResponse{} + err := c.doRequest(logger, traceID, CrashActualLRPRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -489,12 +500,14 @@ func (c *client) FailActualLRP(logger lager.Logger, traceID string, key *models. ActualLrpKey: key, ErrorMessage: errorMessage, } - response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, FailActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPLifecycleResponse{} + err := c.doRequest(logger, traceID, FailActualLRPRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -502,12 +515,14 @@ func (c *client) RetireActualLRP(logger lager.Logger, traceID string, key *model request := models.RetireActualLRPRequest{ ActualLrpKey: key, } - response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, RetireActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPLifecycleResponse{} + err := c.doRequest(logger, traceID, RetireActualLRPRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -518,11 +533,13 @@ func (c *client) RemoveActualLRP(logger lager.Logger, traceID string, key *model ActualLrpInstanceKey: instanceKey, } - response := models.ActualLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, RemoveActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoActualLRPLifecycleResponse{} + err := c.doRequest(logger, traceID, RemoveActualLRPRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -589,23 +606,25 @@ func (c *client) RemoveEvacuatingActualLRP(logger lager.Logger, traceID string, ActualLrpInstanceKey: instanceKey, } - response := models.RemoveEvacuatingActualLRPResponse{} - err := c.doRequest(logger, traceID, RemoveEvacuatingActualLRPRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoRemoveEvacuatingActualLRPResponse{} + err := c.doRequest(logger, traceID, RemoveEvacuatingActualLRPRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return err } + response := protoResponse.FromProto() return response.Error.ToError() } func (c *client) DesiredLRPs(logger lager.Logger, traceID string, filter models.DesiredLRPFilter) ([]*models.DesiredLRP, error) { request := models.DesiredLRPsRequest(filter) - response := models.DesiredLRPsResponse{} - err := c.doRequest(logger, traceID, DesiredLRPsRoute_r3, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoDesiredLRPsResponse{} + err := c.doRequest(logger, traceID, DesiredLRPsRoute_r3, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.DesiredLrps, response.Error.ToError() } @@ -613,23 +632,25 @@ func (c *client) DesiredLRPByProcessGuid(logger lager.Logger, traceID string, pr request := models.DesiredLRPByProcessGuidRequest{ ProcessGuid: processGuid, } - response := models.DesiredLRPResponse{} - err := c.doRequest(logger, traceID, DesiredLRPByProcessGuidRoute_r3, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoDesiredLRPResponse{} + err := c.doRequest(logger, traceID, DesiredLRPByProcessGuidRoute_r3, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.DesiredLrp, response.Error.ToError() } func (c *client) DesiredLRPSchedulingInfos(logger lager.Logger, traceID string, filter models.DesiredLRPFilter) ([]*models.DesiredLRPSchedulingInfo, error) { request := models.DesiredLRPsRequest(filter) - response := models.DesiredLRPSchedulingInfosResponse{} - err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfosRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoDesiredLRPSchedulingInfosResponse{} + err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfosRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.DesiredLrpSchedulingInfos, response.Error.ToError() } @@ -637,32 +658,36 @@ func (c *client) DesiredLRPSchedulingInfoByProcessGuid(logger lager.Logger, trac request := models.DesiredLRPByProcessGuidRequest{ ProcessGuid: processGuid, } - response := models.DesiredLRPSchedulingInfoByProcessGuidResponse{} - err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfoByProcessGuid_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{} + err := c.doRequest(logger, traceID, DesiredLRPSchedulingInfoByProcessGuid_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.DesiredLrpSchedulingInfo, response.Error.ToError() } func (c *client) DesiredLRPRoutingInfos(logger lager.Logger, traceID string, filter models.DesiredLRPFilter) ([]*models.DesiredLRP, error) { request := models.DesiredLRPsRequest(filter) - response := models.DesiredLRPsResponse{} - err := c.doRequest(logger, traceID, DesiredLRPRoutingInfosRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoDesiredLRPsResponse{} + err := c.doRequest(logger, traceID, DesiredLRPRoutingInfosRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.DesiredLrps, response.Error.ToError() } func (c *client) doDesiredLRPLifecycleRequest(logger lager.Logger, traceID string, route string, request proto.Message) error { - response := models.DesiredLRPLifecycleResponse{} - err := c.doRequest(logger, traceID, route, nil, nil, request, response.ToProto()) + protoResponse := models.ProtoDesiredLRPLifecycleResponse{} + err := c.doRequest(logger, traceID, route, nil, nil, request, &protoResponse) if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -690,12 +715,13 @@ func (c *client) RemoveDesiredLRP(logger lager.Logger, traceID string, processGu func (c *client) Tasks(logger lager.Logger, traceID string) ([]*models.Task, error) { request := models.TasksRequest{} - response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoTasksResponse{} + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.Tasks, response.Error.ToError() } @@ -704,11 +730,13 @@ func (c *client) TasksWithFilter(logger lager.Logger, traceID string, filter mod Domain: filter.Domain, CellId: filter.CellID, } - response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoTasksResponse{} + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + + response := protoResponse.FromProto() return response.Tasks, response.Error.ToError() } @@ -716,12 +744,13 @@ func (c *client) TasksByDomain(logger lager.Logger, traceID string, domain strin request := models.TasksRequest{ Domain: domain, } - response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoTasksResponse{} + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.Tasks, response.Error.ToError() } @@ -729,12 +758,13 @@ func (c *client) TasksByCellID(logger lager.Logger, traceID string, cellId strin request := models.TasksRequest{ CellId: cellId, } - response := models.TasksResponse{} - err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoTasksResponse{} + err := c.doRequest(logger, traceID, TasksRoute_r3, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.Tasks, response.Error.ToError() } @@ -742,21 +772,24 @@ func (c *client) TaskByGuid(logger lager.Logger, traceID string, taskGuid string request := models.TaskByGuidRequest{ TaskGuid: taskGuid, } - response := models.TaskResponse{} - err := c.doRequest(logger, traceID, TaskByGuidRoute_r3, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoTaskResponse{} + err := c.doRequest(logger, traceID, TaskByGuidRoute_r3, nil, nil, request.ToProto(), &protoResponse) if err != nil { return nil, err } + response := protoResponse.FromProto() return response.Task, response.Error.ToError() } func (c *client) doTaskLifecycleRequest(logger lager.Logger, traceID string, route string, request proto.Message) error { - response := models.TaskLifecycleResponse{} - err := c.doRequest(logger, traceID, route, nil, nil, request, response.ToProto()) + protoResponse := models.ProtoTaskLifecycleResponse{} + err := c.doRequest(logger, traceID, route, nil, nil, request, &protoResponse) if err != nil { return err } + + response := protoResponse.FromProto() return response.Error.ToError() } @@ -775,11 +808,13 @@ func (c *client) StartTask(logger lager.Logger, traceID string, taskGuid string, TaskGuid: taskGuid, CellId: cellId, } - response := &models.StartTaskResponse{} - err := c.doRequest(logger, traceID, StartTaskRoute_r0, nil, nil, request.ToProto(), response.ToProto()) + protoResponse := models.ProtoStartTaskResponse{} + err := c.doRequest(logger, traceID, StartTaskRoute_r0, nil, nil, request.ToProto(), &protoResponse) if err != nil { return false, err } + + response := protoResponse.FromProto() return response.ShouldStart, response.Error.ToError() } @@ -894,11 +929,13 @@ func (c *client) SubscribeToInstanceEventsByCellID(logger lager.Logger, cellId s } func (c *client) Cells(logger lager.Logger, traceID string) ([]*models.CellPresence, error) { - response := models.CellsResponse{} - err := c.doRequest(logger, traceID, CellsRoute_r0, nil, nil, nil, response.ToProto()) + protoResponse := models.ProtoCellsResponse{} + err := c.doRequest(logger, traceID, CellsRoute_r0, nil, nil, nil, &protoResponse) if err != nil { return nil, err } + + response := protoResponse.FromProto() return response.Cells, response.Error.ToError() } @@ -925,12 +962,13 @@ func (c *client) createRequest(traceID string, requestName string, params rata.P } func (c *client) doEvacRequest(logger lager.Logger, traceID string, route string, defaultKeepContainer bool, request proto.Message) (bool, error) { - var response models.EvacuationResponse - err := c.doRequest(logger, traceID, route, nil, nil, request, response.ToProto()) + protoResponse := models.ProtoEvacuationResponse{} + err := c.doRequest(logger, traceID, route, nil, nil, request, &protoResponse) if err != nil { return defaultKeepContainer, err } + response := protoResponse.FromProto() return response.KeepContainer, response.Error.ToError() } From e3d9faa541b7632e4f66619cd412069ccf240f64 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 15 Jul 2024 17:46:34 +0000 Subject: [PATCH 119/155] Need to store the deserializeModel result in a variable to use later --- db/sqldb/actual_lrp_db.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/db/sqldb/actual_lrp_db.go b/db/sqldb/actual_lrp_db.go index 6fe476ac..f7b9fdf6 100644 --- a/db/sqldb/actual_lrp_db.go +++ b/db/sqldb/actual_lrp_db.go @@ -665,7 +665,9 @@ func (db *SQLDB) scanToActualLRP(logger lager.Logger, row helpers.RowScanner) (* } if len(netInfoData) > 0 { - err = db.deserializeModel(logger, netInfoData, actualLRP.ActualLrpNetInfo.ToProto()) + protoNetInfo := models.ProtoActualLRPNetInfo{} + err = db.deserializeModel(logger, netInfoData, &protoNetInfo) + actualLRP.ActualLrpNetInfo = *protoNetInfo.FromProto() if err != nil { logger.Error("failed-unmarshaling-net-info-data", err) return &actualLRP, models.ErrDeserialize From cfa15d300e25cf7606928b8bfd09df870f0d0796 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 15 Jul 2024 17:46:51 +0000 Subject: [PATCH 120/155] Routable is a pointer and needs to be dereferenced --- db/sqldb/evacuation_db_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/sqldb/evacuation_db_test.go b/db/sqldb/evacuation_db_test.go index 236db50d..c14fea2a 100644 --- a/db/sqldb/evacuation_db_test.go +++ b/db/sqldb/evacuation_db_test.go @@ -150,7 +150,7 @@ var _ = Describe("Evacuation", func() { Expect(actualLRPs[0].ModificationTag.Index).To(BeEquivalentTo((0))) Expect(actualLRPs[0].ActualLrpInternalRoutes).To(Equal(internalRoutes)) Expect(actualLRPs[0].MetricTags).To(Equal(metricTags)) - Expect(actualLRPs[0].GetRoutable()).To(Equal(true)) + Expect(*actualLRPs[0].Routable).To(Equal(true)) Expect(actualLRPs[0].AvailabilityZone).To(Equal(actualLRP.AvailabilityZone)) actualLRPs[0].ModificationTag = actualLRP.ModificationTag From 8b4cf1eab06dfa3dbb61e8ec66327d1b7719acb0 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 16 Jul 2024 16:44:30 +0000 Subject: [PATCH 121/155] Make FakeEvent a proper proto object Regenerate protos --- models/actions.pb.go | 30 ++--- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 22 +-- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 38 +++--- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 6 +- models/cached_dependency.pb.go | 8 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 14 +- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 8 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 14 +- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 26 ++-- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 26 ++-- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 12 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 8 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 8 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 22 +-- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 172 ++++++++++++++++-------- models/events.proto | 4 + models/events_bbs.pb.go | 91 ++++++++++++- models/image_layer.pb.go | 8 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 8 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 8 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 8 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 8 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 8 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 12 +- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 8 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 10 +- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 32 ++--- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 12 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 6 +- 53 files changed, 420 insertions(+), 265 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index 7c6810b7..d4540fbb 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: actions.proto package models @@ -1022,7 +1022,7 @@ func file_actions_proto_rawDescGZIP() []byte { } var file_actions_proto_msgTypes = make([]protoimpl.MessageInfo, 11) -var file_actions_proto_goTypes = []interface{}{ +var file_actions_proto_goTypes = []any{ (*ProtoAction)(nil), // 0: models.ProtoAction (*ProtoDownloadAction)(nil), // 1: models.ProtoDownloadAction (*ProtoUploadAction)(nil), // 2: models.ProtoUploadAction @@ -1069,7 +1069,7 @@ func file_actions_proto_init() { file_bbs_proto_init() file_environment_variables_proto_init() if !protoimpl.UnsafeEnabled { - file_actions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoAction); i { case 0: return &v.state @@ -1081,7 +1081,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoDownloadAction); i { case 0: return &v.state @@ -1093,7 +1093,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoUploadAction); i { case 0: return &v.state @@ -1105,7 +1105,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoRunAction); i { case 0: return &v.state @@ -1117,7 +1117,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoTimeoutAction); i { case 0: return &v.state @@ -1129,7 +1129,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoEmitProgressAction); i { case 0: return &v.state @@ -1141,7 +1141,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoTryAction); i { case 0: return &v.state @@ -1153,7 +1153,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProtoParallelAction); i { case 0: return &v.state @@ -1165,7 +1165,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*ProtoSerialAction); i { case 0: return &v.state @@ -1177,7 +1177,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*ProtoCodependentAction); i { case 0: return &v.state @@ -1189,7 +1189,7 @@ func file_actions_proto_init() { return nil } } - file_actions_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_actions_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*ProtoResourceLimits); i { case 0: return &v.state @@ -1202,7 +1202,7 @@ func file_actions_proto_init() { } } } - file_actions_proto_msgTypes[10].OneofWrappers = []interface{}{} + file_actions_proto_msgTypes[10].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index eb6a0196..5aec94d0 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 46d78abc..57175627 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: actual_lrp.proto package models @@ -787,7 +787,7 @@ func file_actual_lrp_proto_rawDescGZIP() []byte { var file_actual_lrp_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_actual_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_actual_lrp_proto_goTypes = []interface{}{ +var file_actual_lrp_proto_goTypes = []any{ (ProtoActualLRPNetInfo_PreferredAddress)(0), // 0: models.ProtoActualLRPNetInfo.PreferredAddress (ProtoActualLRP_Presence)(0), // 1: models.ProtoActualLRP.Presence (*ProtoActualLRPGroup)(nil), // 2: models.ProtoActualLRPGroup @@ -827,7 +827,7 @@ func file_actual_lrp_proto_init() { file_bbs_proto_init() file_modification_tag_proto_init() if !protoimpl.UnsafeEnabled { - file_actual_lrp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPGroup); i { case 0: return &v.state @@ -839,7 +839,7 @@ func file_actual_lrp_proto_init() { return nil } } - file_actual_lrp_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoPortMapping); i { case 0: return &v.state @@ -851,7 +851,7 @@ func file_actual_lrp_proto_init() { return nil } } - file_actual_lrp_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPKey); i { case 0: return &v.state @@ -863,7 +863,7 @@ func file_actual_lrp_proto_init() { return nil } } - file_actual_lrp_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPInstanceKey); i { case 0: return &v.state @@ -875,7 +875,7 @@ func file_actual_lrp_proto_init() { return nil } } - file_actual_lrp_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPNetInfo); i { case 0: return &v.state @@ -887,7 +887,7 @@ func file_actual_lrp_proto_init() { return nil } } - file_actual_lrp_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPInternalRoute); i { case 0: return &v.state @@ -899,7 +899,7 @@ func file_actual_lrp_proto_init() { return nil } } - file_actual_lrp_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRP); i { case 0: return &v.state @@ -912,7 +912,7 @@ func file_actual_lrp_proto_init() { } } } - file_actual_lrp_proto_msgTypes[6].OneofWrappers = []interface{}{} + file_actual_lrp_proto_msgTypes[6].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 4439074e..d0518eb8 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 8b54d039..1522ff4b 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: actual_lrp_requests.proto package models @@ -1031,7 +1031,7 @@ func file_actual_lrp_requests_proto_rawDescGZIP() []byte { } var file_actual_lrp_requests_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_actual_lrp_requests_proto_goTypes = []interface{}{ +var file_actual_lrp_requests_proto_goTypes = []any{ (*ProtoActualLRPLifecycleResponse)(nil), // 0: models.ProtoActualLRPLifecycleResponse (*ProtoActualLRPGroupsResponse)(nil), // 1: models.ProtoActualLRPGroupsResponse (*ProtoActualLRPGroupResponse)(nil), // 2: models.ProtoActualLRPGroupResponse @@ -1090,7 +1090,7 @@ func file_actual_lrp_requests_proto_init() { file_actual_lrp_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { - file_actual_lrp_requests_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPLifecycleResponse); i { case 0: return &v.state @@ -1102,7 +1102,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPGroupsResponse); i { case 0: return &v.state @@ -1114,7 +1114,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPGroupResponse); i { case 0: return &v.state @@ -1126,7 +1126,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPGroupsRequest); i { case 0: return &v.state @@ -1138,7 +1138,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPGroupsByProcessGuidRequest); i { case 0: return &v.state @@ -1150,7 +1150,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPGroupByProcessGuidAndIndexRequest); i { case 0: return &v.state @@ -1162,7 +1162,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoClaimActualLRPRequest); i { case 0: return &v.state @@ -1174,7 +1174,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProtoStartActualLRPRequest); i { case 0: return &v.state @@ -1186,7 +1186,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*ProtoCrashActualLRPRequest); i { case 0: return &v.state @@ -1198,7 +1198,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*ProtoFailActualLRPRequest); i { case 0: return &v.state @@ -1210,7 +1210,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*ProtoRetireActualLRPRequest); i { case 0: return &v.state @@ -1222,7 +1222,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*ProtoRemoveActualLRPRequest); i { case 0: return &v.state @@ -1234,7 +1234,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPsResponse); i { case 0: return &v.state @@ -1246,7 +1246,7 @@ func file_actual_lrp_requests_proto_init() { return nil } } - file_actual_lrp_requests_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_actual_lrp_requests_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPsRequest); i { case 0: return &v.state @@ -1259,8 +1259,8 @@ func file_actual_lrp_requests_proto_init() { } } } - file_actual_lrp_requests_proto_msgTypes[7].OneofWrappers = []interface{}{} - file_actual_lrp_requests_proto_msgTypes[13].OneofWrappers = []interface{}{} + file_actual_lrp_requests_proto_msgTypes[7].OneofWrappers = []any{} + file_actual_lrp_requests_proto_msgTypes[13].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 42eb87b3..dd33d924 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 977b0aaf..af8c3cbb 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: bbs.proto package models @@ -118,7 +118,7 @@ var file_bbs_proto_rawDesc = []byte{ 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_bbs_proto_goTypes = []interface{}{ +var file_bbs_proto_goTypes = []any{ (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions (*descriptorpb.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions } diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 1c91c32f..78b07e43 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: cached_dependency.proto package models @@ -155,7 +155,7 @@ func file_cached_dependency_proto_rawDescGZIP() []byte { } var file_cached_dependency_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_cached_dependency_proto_goTypes = []interface{}{ +var file_cached_dependency_proto_goTypes = []any{ (*ProtoCachedDependency)(nil), // 0: models.ProtoCachedDependency } var file_cached_dependency_proto_depIdxs = []int32{ @@ -173,7 +173,7 @@ func file_cached_dependency_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_cached_dependency_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cached_dependency_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoCachedDependency); i { case 0: return &v.state diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 7a275cd4..114a6413 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index cefcf470..bbaa0efe 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: cells.proto package models @@ -363,7 +363,7 @@ func file_cells_proto_rawDescGZIP() []byte { } var file_cells_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_cells_proto_goTypes = []interface{}{ +var file_cells_proto_goTypes = []any{ (*ProtoCellCapacity)(nil), // 0: models.ProtoCellCapacity (*ProtoCellPresence)(nil), // 1: models.ProtoCellPresence (*ProtoProvider)(nil), // 2: models.ProtoProvider @@ -390,7 +390,7 @@ func file_cells_proto_init() { file_bbs_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { - file_cells_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cells_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoCellCapacity); i { case 0: return &v.state @@ -402,7 +402,7 @@ func file_cells_proto_init() { return nil } } - file_cells_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cells_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoCellPresence); i { case 0: return &v.state @@ -414,7 +414,7 @@ func file_cells_proto_init() { return nil } } - file_cells_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cells_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoProvider); i { case 0: return &v.state @@ -426,7 +426,7 @@ func file_cells_proto_init() { return nil } } - file_cells_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_cells_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoCellsResponse); i { case 0: return &v.state diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index a73d9e4d..11ce6d4c 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 1eb08966..fa068441 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: certificate_properties.proto package models @@ -96,7 +96,7 @@ func file_certificate_properties_proto_rawDescGZIP() []byte { } var file_certificate_properties_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_certificate_properties_proto_goTypes = []interface{}{ +var file_certificate_properties_proto_goTypes = []any{ (*ProtoCertificateProperties)(nil), // 0: models.ProtoCertificateProperties } var file_certificate_properties_proto_depIdxs = []int32{ @@ -113,7 +113,7 @@ func file_certificate_properties_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_certificate_properties_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_certificate_properties_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoCertificateProperties); i { case 0: return &v.state diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 74f3febb..90dcf675 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 40d15ce2..6875a7ce 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: check_definition.proto package models @@ -333,7 +333,7 @@ func file_check_definition_proto_rawDescGZIP() []byte { } var file_check_definition_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_check_definition_proto_goTypes = []interface{}{ +var file_check_definition_proto_goTypes = []any{ (*ProtoCheckDefinition)(nil), // 0: models.ProtoCheckDefinition (*ProtoCheck)(nil), // 1: models.ProtoCheck (*ProtoTCPCheck)(nil), // 2: models.ProtoTCPCheck @@ -358,7 +358,7 @@ func file_check_definition_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_check_definition_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_check_definition_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoCheckDefinition); i { case 0: return &v.state @@ -370,7 +370,7 @@ func file_check_definition_proto_init() { return nil } } - file_check_definition_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_check_definition_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoCheck); i { case 0: return &v.state @@ -382,7 +382,7 @@ func file_check_definition_proto_init() { return nil } } - file_check_definition_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_check_definition_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoTCPCheck); i { case 0: return &v.state @@ -394,7 +394,7 @@ func file_check_definition_proto_init() { return nil } } - file_check_definition_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_check_definition_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoHTTPCheck); i { case 0: return &v.state diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index f3db3646..ab15688b 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index b0e37808..5d404015 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: desired_lrp.proto package models @@ -1331,7 +1331,7 @@ func file_desired_lrp_proto_rawDescGZIP() []byte { } var file_desired_lrp_proto_msgTypes = make([]protoimpl.MessageInfo, 11) -var file_desired_lrp_proto_goTypes = []interface{}{ +var file_desired_lrp_proto_goTypes = []any{ (*ProtoDesiredLRPSchedulingInfo)(nil), // 0: models.ProtoDesiredLRPSchedulingInfo (*ProtoDesiredLRPRunInfo)(nil), // 1: models.ProtoDesiredLRPRunInfo (*ProtoRoutes)(nil), // 2: models.ProtoRoutes @@ -1428,7 +1428,7 @@ func file_desired_lrp_proto_init() { file_sidecar_proto_init() file_log_rate_limit_proto_init() if !protoimpl.UnsafeEnabled { - file_desired_lrp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPSchedulingInfo); i { case 0: return &v.state @@ -1440,7 +1440,7 @@ func file_desired_lrp_proto_init() { return nil } } - file_desired_lrp_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPRunInfo); i { case 0: return &v.state @@ -1452,7 +1452,7 @@ func file_desired_lrp_proto_init() { return nil } } - file_desired_lrp_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoRoutes); i { case 0: return &v.state @@ -1464,7 +1464,7 @@ func file_desired_lrp_proto_init() { return nil } } - file_desired_lrp_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPUpdate); i { case 0: return &v.state @@ -1476,7 +1476,7 @@ func file_desired_lrp_proto_init() { return nil } } - file_desired_lrp_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPKey); i { case 0: return &v.state @@ -1488,7 +1488,7 @@ func file_desired_lrp_proto_init() { return nil } } - file_desired_lrp_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPResource); i { case 0: return &v.state @@ -1500,7 +1500,7 @@ func file_desired_lrp_proto_init() { return nil } } - file_desired_lrp_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRP); i { case 0: return &v.state @@ -1513,9 +1513,9 @@ func file_desired_lrp_proto_init() { } } } - file_desired_lrp_proto_msgTypes[1].OneofWrappers = []interface{}{} - file_desired_lrp_proto_msgTypes[3].OneofWrappers = []interface{}{} - file_desired_lrp_proto_msgTypes[6].OneofWrappers = []interface{}{} + file_desired_lrp_proto_msgTypes[1].OneofWrappers = []any{} + file_desired_lrp_proto_msgTypes[3].OneofWrappers = []any{} + file_desired_lrp_proto_msgTypes[6].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 4477da5c..ef62fb99 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 18d8c75d..718b1017 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: desired_lrp_requests.proto package models @@ -639,7 +639,7 @@ func file_desired_lrp_requests_proto_rawDescGZIP() []byte { } var file_desired_lrp_requests_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_desired_lrp_requests_proto_goTypes = []interface{}{ +var file_desired_lrp_requests_proto_goTypes = []any{ (*ProtoDesiredLRPLifecycleResponse)(nil), // 0: models.ProtoDesiredLRPLifecycleResponse (*ProtoDesiredLRPsResponse)(nil), // 1: models.ProtoDesiredLRPsResponse (*ProtoDesiredLRPsRequest)(nil), // 2: models.ProtoDesiredLRPsRequest @@ -683,7 +683,7 @@ func file_desired_lrp_requests_proto_init() { file_desired_lrp_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { - file_desired_lrp_requests_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPLifecycleResponse); i { case 0: return &v.state @@ -695,7 +695,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPsResponse); i { case 0: return &v.state @@ -707,7 +707,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPsRequest); i { case 0: return &v.state @@ -719,7 +719,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPResponse); i { case 0: return &v.state @@ -731,7 +731,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPSchedulingInfosResponse); i { case 0: return &v.state @@ -743,7 +743,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse); i { case 0: return &v.state @@ -755,7 +755,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPByProcessGuidRequest); i { case 0: return &v.state @@ -767,7 +767,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesireLRPRequest); i { case 0: return &v.state @@ -779,7 +779,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*ProtoUpdateDesiredLRPRequest); i { case 0: return &v.state @@ -791,7 +791,7 @@ func file_desired_lrp_requests_proto_init() { return nil } } - file_desired_lrp_requests_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_desired_lrp_requests_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*ProtoRemoveDesiredLRPRequest); i { case 0: return &v.state diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index a95ea035..fafc54e7 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index ea9ae10d..57942afd 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: domain.proto package models @@ -216,7 +216,7 @@ func file_domain_proto_rawDescGZIP() []byte { } var file_domain_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_domain_proto_goTypes = []interface{}{ +var file_domain_proto_goTypes = []any{ (*ProtoDomainsResponse)(nil), // 0: models.ProtoDomainsResponse (*ProtoUpsertDomainResponse)(nil), // 1: models.ProtoUpsertDomainResponse (*ProtoUpsertDomainRequest)(nil), // 2: models.ProtoUpsertDomainRequest @@ -240,7 +240,7 @@ func file_domain_proto_init() { file_bbs_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { - file_domain_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_domain_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoDomainsResponse); i { case 0: return &v.state @@ -252,7 +252,7 @@ func file_domain_proto_init() { return nil } } - file_domain_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_domain_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoUpsertDomainResponse); i { case 0: return &v.state @@ -264,7 +264,7 @@ func file_domain_proto_init() { return nil } } - file_domain_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_domain_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoUpsertDomainRequest); i { case 0: return &v.state diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 3db27200..2ebfd953 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 3c8856be..c656a89b 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: environment_variables.proto package models @@ -104,7 +104,7 @@ func file_environment_variables_proto_rawDescGZIP() []byte { } var file_environment_variables_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_environment_variables_proto_goTypes = []interface{}{ +var file_environment_variables_proto_goTypes = []any{ (*ProtoEnvironmentVariable)(nil), // 0: models.ProtoEnvironmentVariable } var file_environment_variables_proto_depIdxs = []int32{ @@ -122,7 +122,7 @@ func file_environment_variables_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_environment_variables_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_environment_variables_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoEnvironmentVariable); i { case 0: return &v.state diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 97918714..27cccbc9 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index e9950b55..cce796d4 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: error.proto package models @@ -259,7 +259,7 @@ func file_error_proto_rawDescGZIP() []byte { var file_error_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_error_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_error_proto_goTypes = []interface{}{ +var file_error_proto_goTypes = []any{ (ProtoError_Type)(0), // 0: models.ProtoError.Type (*ProtoError)(nil), // 1: models.ProtoError } @@ -279,7 +279,7 @@ func file_error_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_error_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_error_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoError); i { case 0: return &v.state diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 5976c62b..1fa34b2a 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index a54355ea..366a2c80 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: evacuation.proto package models @@ -576,7 +576,7 @@ func file_evacuation_proto_rawDescGZIP() []byte { } var file_evacuation_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_evacuation_proto_goTypes = []interface{}{ +var file_evacuation_proto_goTypes = []any{ (*ProtoEvacuationResponse)(nil), // 0: models.ProtoEvacuationResponse (*ProtoEvacuateClaimedActualLRPRequest)(nil), // 1: models.ProtoEvacuateClaimedActualLRPRequest (*ProtoEvacuateRunningActualLRPRequest)(nil), // 2: models.ProtoEvacuateRunningActualLRPRequest @@ -623,7 +623,7 @@ func file_evacuation_proto_init() { file_actual_lrp_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { - file_evacuation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_evacuation_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoEvacuationResponse); i { case 0: return &v.state @@ -635,7 +635,7 @@ func file_evacuation_proto_init() { return nil } } - file_evacuation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_evacuation_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoEvacuateClaimedActualLRPRequest); i { case 0: return &v.state @@ -647,7 +647,7 @@ func file_evacuation_proto_init() { return nil } } - file_evacuation_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_evacuation_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoEvacuateRunningActualLRPRequest); i { case 0: return &v.state @@ -659,7 +659,7 @@ func file_evacuation_proto_init() { return nil } } - file_evacuation_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_evacuation_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoEvacuateStoppedActualLRPRequest); i { case 0: return &v.state @@ -671,7 +671,7 @@ func file_evacuation_proto_init() { return nil } } - file_evacuation_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_evacuation_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoEvacuateCrashedActualLRPRequest); i { case 0: return &v.state @@ -683,7 +683,7 @@ func file_evacuation_proto_init() { return nil } } - file_evacuation_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_evacuation_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoRemoveEvacuatingActualLRPRequest); i { case 0: return &v.state @@ -695,7 +695,7 @@ func file_evacuation_proto_init() { return nil } } - file_evacuation_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_evacuation_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoRemoveEvacuatingActualLRPResponse); i { case 0: return &v.state @@ -708,7 +708,7 @@ func file_evacuation_proto_init() { } } } - file_evacuation_proto_msgTypes[2].OneofWrappers = []interface{}{} + file_evacuation_proto_msgTypes[2].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index bd21fa74..72ffbb24 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index a5674427..a0f1f068 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: events.proto package models @@ -928,6 +928,53 @@ func (x *ProtoTaskRemovedEvent) GetTask() *ProtoTask { return nil } +type ProtoFakeEvent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` +} + +func (x *ProtoFakeEvent) Reset() { + *x = ProtoFakeEvent{} + if protoimpl.UnsafeEnabled { + mi := &file_events_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ProtoFakeEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ProtoFakeEvent) ProtoMessage() {} + +func (x *ProtoFakeEvent) ProtoReflect() protoreflect.Message { + mi := &file_events_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ProtoFakeEvent.ProtoReflect.Descriptor instead. +func (*ProtoFakeEvent) Descriptor() ([]byte, []int) { + return file_events_proto_rawDescGZIP(), []int{15} +} + +func (x *ProtoFakeEvent) GetToken() string { + if x != nil { + return x.Token + } + return "" +} + var File_events_proto protoreflect.FileDescriptor var file_events_proto_rawDesc = []byte{ @@ -1093,10 +1140,12 @@ var file_events_proto_rawDesc = []byte{ 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, - 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, - 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, - 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x26, 0x0a, 0x0e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x46, 0x61, 0x6b, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, + 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, + 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1111,8 +1160,8 @@ func file_events_proto_rawDescGZIP() []byte { return file_events_proto_rawDescData } -var file_events_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_events_proto_goTypes = []interface{}{ +var file_events_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_events_proto_goTypes = []any{ (*ProtoActualLRPCreatedEvent)(nil), // 0: models.ProtoActualLRPCreatedEvent (*ProtoActualLRPChangedEvent)(nil), // 1: models.ProtoActualLRPChangedEvent (*ProtoActualLRPRemovedEvent)(nil), // 2: models.ProtoActualLRPRemovedEvent @@ -1128,40 +1177,41 @@ var file_events_proto_goTypes = []interface{}{ (*ProtoTaskCreatedEvent)(nil), // 12: models.ProtoTaskCreatedEvent (*ProtoTaskChangedEvent)(nil), // 13: models.ProtoTaskChangedEvent (*ProtoTaskRemovedEvent)(nil), // 14: models.ProtoTaskRemovedEvent - (*ProtoActualLRPGroup)(nil), // 15: models.ProtoActualLRPGroup - (*ProtoActualLRP)(nil), // 16: models.ProtoActualLRP - (*ProtoActualLRPNetInfo)(nil), // 17: models.ProtoActualLRPNetInfo - (*ProtoModificationTag)(nil), // 18: models.ProtoModificationTag - (ProtoActualLRP_Presence)(0), // 19: models.ProtoActualLRP.Presence - (*ProtoActualLRPKey)(nil), // 20: models.ProtoActualLRPKey - (*ProtoActualLRPInstanceKey)(nil), // 21: models.ProtoActualLRPInstanceKey - (*ProtoDesiredLRP)(nil), // 22: models.ProtoDesiredLRP - (*ProtoTask)(nil), // 23: models.ProtoTask + (*ProtoFakeEvent)(nil), // 15: models.ProtoFakeEvent + (*ProtoActualLRPGroup)(nil), // 16: models.ProtoActualLRPGroup + (*ProtoActualLRP)(nil), // 17: models.ProtoActualLRP + (*ProtoActualLRPNetInfo)(nil), // 18: models.ProtoActualLRPNetInfo + (*ProtoModificationTag)(nil), // 19: models.ProtoModificationTag + (ProtoActualLRP_Presence)(0), // 20: models.ProtoActualLRP.Presence + (*ProtoActualLRPKey)(nil), // 21: models.ProtoActualLRPKey + (*ProtoActualLRPInstanceKey)(nil), // 22: models.ProtoActualLRPInstanceKey + (*ProtoDesiredLRP)(nil), // 23: models.ProtoDesiredLRP + (*ProtoTask)(nil), // 24: models.ProtoTask } var file_events_proto_depIdxs = []int32{ - 15, // 0: models.ProtoActualLRPCreatedEvent.actual_lrp_group:type_name -> models.ProtoActualLRPGroup - 15, // 1: models.ProtoActualLRPChangedEvent.before:type_name -> models.ProtoActualLRPGroup - 15, // 2: models.ProtoActualLRPChangedEvent.after:type_name -> models.ProtoActualLRPGroup - 15, // 3: models.ProtoActualLRPRemovedEvent.actual_lrp_group:type_name -> models.ProtoActualLRPGroup - 16, // 4: models.ProtoActualLRPInstanceCreatedEvent.actual_lrp:type_name -> models.ProtoActualLRP - 17, // 5: models.ProtoActualLRPInfo.actual_lrp_net_info:type_name -> models.ProtoActualLRPNetInfo - 18, // 6: models.ProtoActualLRPInfo.modification_tag:type_name -> models.ProtoModificationTag - 19, // 7: models.ProtoActualLRPInfo.presence:type_name -> models.ProtoActualLRP.Presence - 20, // 8: models.ProtoActualLRPInstanceChangedEvent.actual_lrp_key:type_name -> models.ProtoActualLRPKey - 21, // 9: models.ProtoActualLRPInstanceChangedEvent.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 16, // 0: models.ProtoActualLRPCreatedEvent.actual_lrp_group:type_name -> models.ProtoActualLRPGroup + 16, // 1: models.ProtoActualLRPChangedEvent.before:type_name -> models.ProtoActualLRPGroup + 16, // 2: models.ProtoActualLRPChangedEvent.after:type_name -> models.ProtoActualLRPGroup + 16, // 3: models.ProtoActualLRPRemovedEvent.actual_lrp_group:type_name -> models.ProtoActualLRPGroup + 17, // 4: models.ProtoActualLRPInstanceCreatedEvent.actual_lrp:type_name -> models.ProtoActualLRP + 18, // 5: models.ProtoActualLRPInfo.actual_lrp_net_info:type_name -> models.ProtoActualLRPNetInfo + 19, // 6: models.ProtoActualLRPInfo.modification_tag:type_name -> models.ProtoModificationTag + 20, // 7: models.ProtoActualLRPInfo.presence:type_name -> models.ProtoActualLRP.Presence + 21, // 8: models.ProtoActualLRPInstanceChangedEvent.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 22, // 9: models.ProtoActualLRPInstanceChangedEvent.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey 4, // 10: models.ProtoActualLRPInstanceChangedEvent.before:type_name -> models.ProtoActualLRPInfo 4, // 11: models.ProtoActualLRPInstanceChangedEvent.after:type_name -> models.ProtoActualLRPInfo - 16, // 12: models.ProtoActualLRPInstanceRemovedEvent.actual_lrp:type_name -> models.ProtoActualLRP - 22, // 13: models.ProtoDesiredLRPCreatedEvent.desired_lrp:type_name -> models.ProtoDesiredLRP - 22, // 14: models.ProtoDesiredLRPChangedEvent.before:type_name -> models.ProtoDesiredLRP - 22, // 15: models.ProtoDesiredLRPChangedEvent.after:type_name -> models.ProtoDesiredLRP - 22, // 16: models.ProtoDesiredLRPRemovedEvent.desired_lrp:type_name -> models.ProtoDesiredLRP - 20, // 17: models.ProtoActualLRPCrashedEvent.actual_lrp_key:type_name -> models.ProtoActualLRPKey - 21, // 18: models.ProtoActualLRPCrashedEvent.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey - 23, // 19: models.ProtoTaskCreatedEvent.task:type_name -> models.ProtoTask - 23, // 20: models.ProtoTaskChangedEvent.before:type_name -> models.ProtoTask - 23, // 21: models.ProtoTaskChangedEvent.after:type_name -> models.ProtoTask - 23, // 22: models.ProtoTaskRemovedEvent.task:type_name -> models.ProtoTask + 17, // 12: models.ProtoActualLRPInstanceRemovedEvent.actual_lrp:type_name -> models.ProtoActualLRP + 23, // 13: models.ProtoDesiredLRPCreatedEvent.desired_lrp:type_name -> models.ProtoDesiredLRP + 23, // 14: models.ProtoDesiredLRPChangedEvent.before:type_name -> models.ProtoDesiredLRP + 23, // 15: models.ProtoDesiredLRPChangedEvent.after:type_name -> models.ProtoDesiredLRP + 23, // 16: models.ProtoDesiredLRPRemovedEvent.desired_lrp:type_name -> models.ProtoDesiredLRP + 21, // 17: models.ProtoActualLRPCrashedEvent.actual_lrp_key:type_name -> models.ProtoActualLRPKey + 22, // 18: models.ProtoActualLRPCrashedEvent.actual_lrp_instance_key:type_name -> models.ProtoActualLRPInstanceKey + 24, // 19: models.ProtoTaskCreatedEvent.task:type_name -> models.ProtoTask + 24, // 20: models.ProtoTaskChangedEvent.before:type_name -> models.ProtoTask + 24, // 21: models.ProtoTaskChangedEvent.after:type_name -> models.ProtoTask + 24, // 22: models.ProtoTaskRemovedEvent.task:type_name -> models.ProtoTask 23, // [23:23] is the sub-list for method output_type 23, // [23:23] is the sub-list for method input_type 23, // [23:23] is the sub-list for extension type_name @@ -1180,7 +1230,7 @@ func file_events_proto_init() { file_task_proto_init() file_modification_tag_proto_init() if !protoimpl.UnsafeEnabled { - file_events_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPCreatedEvent); i { case 0: return &v.state @@ -1192,7 +1242,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPChangedEvent); i { case 0: return &v.state @@ -1204,7 +1254,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPRemovedEvent); i { case 0: return &v.state @@ -1216,7 +1266,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPInstanceCreatedEvent); i { case 0: return &v.state @@ -1228,7 +1278,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPInfo); i { case 0: return &v.state @@ -1240,7 +1290,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPInstanceChangedEvent); i { case 0: return &v.state @@ -1252,7 +1302,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPInstanceRemovedEvent); i { case 0: return &v.state @@ -1264,7 +1314,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPCreatedEvent); i { case 0: return &v.state @@ -1276,7 +1326,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPChangedEvent); i { case 0: return &v.state @@ -1288,7 +1338,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesiredLRPRemovedEvent); i { case 0: return &v.state @@ -1300,7 +1350,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*ProtoActualLRPCrashedEvent); i { case 0: return &v.state @@ -1312,7 +1362,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*ProtoEventsByCellId); i { case 0: return &v.state @@ -1324,7 +1374,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskCreatedEvent); i { case 0: return &v.state @@ -1336,7 +1386,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskChangedEvent); i { case 0: return &v.state @@ -1348,7 +1398,7 @@ func file_events_proto_init() { return nil } } - file_events_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_events_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskRemovedEvent); i { case 0: return &v.state @@ -1360,15 +1410,27 @@ func file_events_proto_init() { return nil } } + file_events_proto_msgTypes[15].Exporter = func(v any, i int) any { + switch v := v.(*ProtoFakeEvent); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } - file_events_proto_msgTypes[4].OneofWrappers = []interface{}{} + file_events_proto_msgTypes[4].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_events_proto_rawDesc, NumEnums: 0, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, }, diff --git a/models/events.proto b/models/events.proto index f3baf3e3..60982f25 100644 --- a/models/events.proto +++ b/models/events.proto @@ -96,3 +96,7 @@ message ProtoTaskChangedEvent { message ProtoTaskRemovedEvent { ProtoTask task = 1; } + +message ProtoFakeEvent { + string token = 1; +} diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index a17557f6..db190e46 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: events.proto package models @@ -1801,3 +1801,92 @@ func TaskRemovedEventFromProtoSlice(values []*ProtoTaskRemovedEvent) []*TaskRemo } return result } + +// Prevent copylock errors when using ProtoFakeEvent directly +type FakeEvent struct { + Token string `json:"token,omitempty"` +} + +func (this *FakeEvent) Equal(that interface{}) bool { + + if that == nil { + return this == nil + } + + that1, ok := that.(*FakeEvent) + if !ok { + that2, ok := that.(FakeEvent) + if ok { + that1 = &that2 + } else { + return false + } + } + + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + + if this.Token != that1.Token { + return false + } + return true +} +func (m *FakeEvent) GetToken() string { + if m != nil { + return m.Token + } + var defaultValue string + defaultValue = "" + return defaultValue +} +func (m *FakeEvent) SetToken(value string) { + if m != nil { + m.Token = value + } +} +func (x *FakeEvent) ToProto() *ProtoFakeEvent { + if x == nil { + return nil + } + + proto := &ProtoFakeEvent{ + Token: x.Token, + } + return proto +} + +func (x *ProtoFakeEvent) FromProto() *FakeEvent { + if x == nil { + return nil + } + + copysafe := &FakeEvent{ + Token: x.Token, + } + return copysafe +} + +func FakeEventToProtoSlice(values []*FakeEvent) []*ProtoFakeEvent { + if values == nil { + return nil + } + result := make([]*ProtoFakeEvent, len(values)) + for i, val := range values { + result[i] = val.ToProto() + } + return result +} + +func FakeEventFromProtoSlice(values []*ProtoFakeEvent) []*FakeEvent { + if values == nil { + return nil + } + result := make([]*FakeEvent, len(values)) + for i, val := range values { + result[i] = val.FromProto() + } + return result +} diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index f427cac4..ffbe5a0f 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: image_layer.proto package models @@ -335,7 +335,7 @@ func file_image_layer_proto_rawDescGZIP() []byte { var file_image_layer_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_image_layer_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_image_layer_proto_goTypes = []interface{}{ +var file_image_layer_proto_goTypes = []any{ (ProtoImageLayer_DigestAlgorithm)(0), // 0: models.ProtoImageLayer.DigestAlgorithm (ProtoImageLayer_MediaType)(0), // 1: models.ProtoImageLayer.MediaType (ProtoImageLayer_Type)(0), // 2: models.ProtoImageLayer.Type @@ -359,7 +359,7 @@ func file_image_layer_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_image_layer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_image_layer_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoImageLayer); i { case 0: return &v.state diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 4fa0eb66..9370a402 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index feaae0a3..902bde1a 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: log_rate_limit.proto package models @@ -94,7 +94,7 @@ func file_log_rate_limit_proto_rawDescGZIP() []byte { } var file_log_rate_limit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_log_rate_limit_proto_goTypes = []interface{}{ +var file_log_rate_limit_proto_goTypes = []any{ (*ProtoLogRateLimit)(nil), // 0: models.ProtoLogRateLimit } var file_log_rate_limit_proto_depIdxs = []int32{ @@ -111,7 +111,7 @@ func file_log_rate_limit_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_log_rate_limit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_log_rate_limit_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoLogRateLimit); i { case 0: return &v.state diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 9833f7b4..92fdbec0 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 1652360f..d704d14d 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: metric_tags.proto package models @@ -167,7 +167,7 @@ func file_metric_tags_proto_rawDescGZIP() []byte { var file_metric_tags_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_metric_tags_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_metric_tags_proto_goTypes = []interface{}{ +var file_metric_tags_proto_goTypes = []any{ (ProtoMetricTagValue_DynamicValue)(0), // 0: models.ProtoMetricTagValue.DynamicValue (*ProtoMetricTagValue)(nil), // 1: models.ProtoMetricTagValue } @@ -187,7 +187,7 @@ func file_metric_tags_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_metric_tags_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_metric_tags_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoMetricTagValue); i { case 0: return &v.state diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index e51d08e0..91ad3c72 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 09c7cf55..9e902961 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: modification_tag.proto package models @@ -104,7 +104,7 @@ func file_modification_tag_proto_rawDescGZIP() []byte { } var file_modification_tag_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_modification_tag_proto_goTypes = []interface{}{ +var file_modification_tag_proto_goTypes = []any{ (*ProtoModificationTag)(nil), // 0: models.ProtoModificationTag } var file_modification_tag_proto_depIdxs = []int32{ @@ -122,7 +122,7 @@ func file_modification_tag_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_modification_tag_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_modification_tag_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoModificationTag); i { case 0: return &v.state diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 445e96f3..ebbe0e23 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index 17ed437c..ed36d06b 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: network.proto package models @@ -99,7 +99,7 @@ func file_network_proto_rawDescGZIP() []byte { } var file_network_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_network_proto_goTypes = []interface{}{ +var file_network_proto_goTypes = []any{ (*ProtoNetwork)(nil), // 0: models.ProtoNetwork nil, // 1: models.ProtoNetwork.PropertiesEntry } @@ -118,7 +118,7 @@ func file_network_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_network_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_network_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoNetwork); i { case 0: return &v.state diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index e434efb0..72bc8b46 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 9ae632e5..724115e0 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: ping.proto package models @@ -94,7 +94,7 @@ func file_ping_proto_rawDescGZIP() []byte { } var file_ping_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_ping_proto_goTypes = []interface{}{ +var file_ping_proto_goTypes = []any{ (*ProtoPingResponse)(nil), // 0: models.ProtoPingResponse } var file_ping_proto_depIdxs = []int32{ @@ -112,7 +112,7 @@ func file_ping_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_ping_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_ping_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoPingResponse); i { case 0: return &v.state diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 2295b5a9..e2d21171 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index d366a767..d6d807f5 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: security_group.proto package models @@ -275,7 +275,7 @@ func file_security_group_proto_rawDescGZIP() []byte { } var file_security_group_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_security_group_proto_goTypes = []interface{}{ +var file_security_group_proto_goTypes = []any{ (*ProtoPortRange)(nil), // 0: models.ProtoPortRange (*ProtoICMPInfo)(nil), // 1: models.ProtoICMPInfo (*ProtoSecurityGroupRule)(nil), // 2: models.ProtoSecurityGroupRule @@ -297,7 +297,7 @@ func file_security_group_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_security_group_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_security_group_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoPortRange); i { case 0: return &v.state @@ -309,7 +309,7 @@ func file_security_group_proto_init() { return nil } } - file_security_group_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_security_group_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoICMPInfo); i { case 0: return &v.state @@ -321,7 +321,7 @@ func file_security_group_proto_init() { return nil } } - file_security_group_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_security_group_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoSecurityGroupRule); i { case 0: return &v.state diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 9dca8603..214ab6b0 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index b30d7146..0f57c09c 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: sidecar.proto package models @@ -115,7 +115,7 @@ func file_sidecar_proto_rawDescGZIP() []byte { } var file_sidecar_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_sidecar_proto_goTypes = []interface{}{ +var file_sidecar_proto_goTypes = []any{ (*ProtoSidecar)(nil), // 0: models.ProtoSidecar (*ProtoAction)(nil), // 1: models.ProtoAction } @@ -136,7 +136,7 @@ func file_sidecar_proto_init() { file_bbs_proto_init() file_actions_proto_init() if !protoimpl.UnsafeEnabled { - file_sidecar_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_sidecar_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoSidecar); i { case 0: return &v.state diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 8f3d109e..cb2b1f12 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index fb1a9eff..dd409f2f 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: task.proto package models @@ -646,7 +646,7 @@ func file_task_proto_rawDescGZIP() []byte { var file_task_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_task_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_task_proto_goTypes = []interface{}{ +var file_task_proto_goTypes = []any{ (ProtoTask_State)(0), // 0: models.ProtoTask.State (*ProtoTaskDefinition)(nil), // 1: models.ProtoTaskDefinition (*ProtoTask)(nil), // 2: models.ProtoTask @@ -700,7 +700,7 @@ func file_task_proto_init() { file_log_rate_limit_proto_init() file_metric_tags_proto_init() if !protoimpl.UnsafeEnabled { - file_task_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_task_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskDefinition); i { case 0: return &v.state @@ -712,7 +712,7 @@ func file_task_proto_init() { return nil } } - file_task_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_task_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoTask); i { case 0: return &v.state diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index f97a13cb..42936d9d 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index ebb941af..d2cac94e 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: task_requests.proto package models @@ -895,7 +895,7 @@ func file_task_requests_proto_rawDescGZIP() []byte { } var file_task_requests_proto_msgTypes = make([]protoimpl.MessageInfo, 13) -var file_task_requests_proto_goTypes = []interface{}{ +var file_task_requests_proto_goTypes = []any{ (*ProtoTaskLifecycleResponse)(nil), // 0: models.ProtoTaskLifecycleResponse (*ProtoDesireTaskRequest)(nil), // 1: models.ProtoDesireTaskRequest (*ProtoStartTaskRequest)(nil), // 2: models.ProtoStartTaskRequest @@ -937,7 +937,7 @@ func file_task_requests_proto_init() { file_task_proto_init() file_error_proto_init() if !protoimpl.UnsafeEnabled { - file_task_requests_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskLifecycleResponse); i { case 0: return &v.state @@ -949,7 +949,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoDesireTaskRequest); i { case 0: return &v.state @@ -961,7 +961,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoStartTaskRequest); i { case 0: return &v.state @@ -973,7 +973,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProtoStartTaskResponse); i { case 0: return &v.state @@ -985,7 +985,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProtoFailTaskRequest); i { case 0: return &v.state @@ -997,7 +997,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProtoRejectTaskRequest); i { case 0: return &v.state @@ -1009,7 +1009,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskGuidRequest); i { case 0: return &v.state @@ -1021,7 +1021,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProtoCompleteTaskRequest); i { case 0: return &v.state @@ -1033,7 +1033,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskCallbackResponse); i { case 0: return &v.state @@ -1045,7 +1045,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*ProtoTasksRequest); i { case 0: return &v.state @@ -1057,7 +1057,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*ProtoTasksResponse); i { case 0: return &v.state @@ -1069,7 +1069,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskByGuidRequest); i { case 0: return &v.state @@ -1081,7 +1081,7 @@ func file_task_requests_proto_init() { return nil } } - file_task_requests_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_task_requests_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*ProtoTaskResponse); i { case 0: return &v.state diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 4bbb04fc..59f8342e 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index b77d9adb..da67dbde 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: volume_mount.proto package models @@ -240,7 +240,7 @@ func file_volume_mount_proto_rawDescGZIP() []byte { } var file_volume_mount_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_volume_mount_proto_goTypes = []interface{}{ +var file_volume_mount_proto_goTypes = []any{ (*ProtoSharedDevice)(nil), // 0: models.ProtoSharedDevice (*ProtoVolumeMount)(nil), // 1: models.ProtoVolumeMount (*ProtoVolumePlacement)(nil), // 2: models.ProtoVolumePlacement @@ -261,7 +261,7 @@ func file_volume_mount_proto_init() { } file_bbs_proto_init() if !protoimpl.UnsafeEnabled { - file_volume_mount_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_volume_mount_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProtoSharedDevice); i { case 0: return &v.state @@ -273,7 +273,7 @@ func file_volume_mount_proto_init() { return nil } } - file_volume_mount_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_volume_mount_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProtoVolumeMount); i { case 0: return &v.state @@ -285,7 +285,7 @@ func file_volume_mount_proto_init() { return nil } } - file_volume_mount_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_volume_mount_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProtoVolumePlacement); i { case 0: return &v.state diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 7fe23bd4..10af6aea 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.0 +// - protoc v5.27.2 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 903a04b8..883c9622 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.34.2 +// protoc v5.27.2 // source: bbs.proto package main @@ -118,7 +118,7 @@ var file_bbs_proto_rawDesc = []byte{ 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_bbs_proto_goTypes = []interface{}{ +var file_bbs_proto_goTypes = []any{ (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions (*descriptorpb.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions } From 35019df86c4b18755dc848ecbb18255597419bbe Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 16 Jul 2024 16:47:30 +0000 Subject: [PATCH 122/155] Replace eventfakes with new FakeEvent object --- events/event_source.go | 11 +++++++++++ events/eventfakes/fake_events.go | 27 --------------------------- events/hub_test.go | 30 +++++++++++++++--------------- handlers/events_handlers_test.go | 24 +++++++++++++++--------- models/events.go | 14 ++++++++++++++ 5 files changed, 55 insertions(+), 51 deletions(-) delete mode 100644 events/eventfakes/fake_events.go diff --git a/events/event_source.go b/events/event_source.go index aea920b7..3da52837 100644 --- a/events/event_source.go +++ b/events/event_source.go @@ -294,6 +294,17 @@ func parseRawEvent(rawEvent sse.Event) (models.Event, error) { } event = protoEvent.FromProto() + return event, nil + + case models.EventTypeFake: + event := new(models.FakeEvent) + protoEvent := new(models.ProtoFakeEvent) + err := proto.Unmarshal(data, protoEvent) + if err != nil { + return nil, NewInvalidPayloadError(rawEvent.Name, err) + } + event = protoEvent.FromProto() + return event, nil } diff --git a/events/eventfakes/fake_events.go b/events/eventfakes/fake_events.go deleted file mode 100644 index 8646a089..00000000 --- a/events/eventfakes/fake_events.go +++ /dev/null @@ -1,27 +0,0 @@ -package eventfakes - -import ( - "errors" - - "google.golang.org/protobuf/proto" -) - -type FakeEvent struct{ Token string } - -func (FakeEvent) EventType() string { return "fake" } -func (FakeEvent) Key() string { return "fake" } -func (FakeEvent) ProtoMessage() {} -func (FakeEvent) ToEventProto() proto.Message { return nil } -func (FakeEvent) Reset() {} -func (FakeEvent) String() string { return "fake" } -func (e FakeEvent) Marshal() ([]byte, error) { return []byte(e.Token), nil } - -type UnmarshalableEvent struct{ Fn func() } - -func (UnmarshalableEvent) EventType() string { return "unmarshalable" } -func (UnmarshalableEvent) Key() string { return "unmarshalable" } -func (UnmarshalableEvent) ProtoMessage() {} -func (UnmarshalableEvent) ToEventProto() proto.Message { return nil } -func (UnmarshalableEvent) Reset() {} -func (UnmarshalableEvent) String() string { return "unmarshalable" } -func (UnmarshalableEvent) Marshal() ([]byte, error) { return nil, errors.New("no workie") } diff --git a/events/hub_test.go b/events/hub_test.go index ca62a7cd..156067d4 100644 --- a/events/hub_test.go +++ b/events/hub_test.go @@ -4,7 +4,7 @@ import ( "strconv" "code.cloudfoundry.org/bbs/events" - "code.cloudfoundry.org/bbs/events/eventfakes" + "code.cloudfoundry.org/bbs/models" "code.cloudfoundry.org/lager/v3/lagertest" . "github.com/onsi/ginkgo/v2" @@ -88,13 +88,13 @@ var _ = Describe("Hub", func() { source2, err := hub.Subscribe() Expect(err).NotTo(HaveOccurred()) - hub.Emit(eventfakes.FakeEvent{Token: "1"}) - Expect(source1.Next()).To(Equal(eventfakes.FakeEvent{Token: "1"})) - Expect(source2.Next()).To(Equal(eventfakes.FakeEvent{Token: "1"})) + hub.Emit(&models.FakeEvent{Token: "1"}) + Expect(source1.Next()).To(Equal(&models.FakeEvent{Token: "1"})) + Expect(source2.Next()).To(Equal(&models.FakeEvent{Token: "1"})) - hub.Emit(eventfakes.FakeEvent{Token: "2"}) - Expect(source1.Next()).To(Equal(eventfakes.FakeEvent{Token: "2"})) - Expect(source2.Next()).To(Equal(eventfakes.FakeEvent{Token: "2"})) + hub.Emit(&models.FakeEvent{Token: "2"}) + Expect(source1.Next()).To(Equal(&models.FakeEvent{Token: "2"})) + Expect(source2.Next()).To(Equal(&models.FakeEvent{Token: "2"})) }) It("closes slow consumers after MAX_PENDING_SUBSCRIBER_EVENTS missed events", func() { @@ -103,28 +103,28 @@ var _ = Describe("Hub", func() { By("filling the 'buffer'") for eventToken := 0; eventToken < events.MAX_PENDING_SUBSCRIBER_EVENTS; eventToken++ { - hub.Emit(eventfakes.FakeEvent{Token: strconv.Itoa(eventToken)}) + hub.Emit(&models.FakeEvent{Token: strconv.Itoa(eventToken)}) } By("reading 2 events off") ev, err := slowConsumer.Next() Expect(err).NotTo(HaveOccurred()) - Expect(ev).To(Equal(eventfakes.FakeEvent{Token: "0"})) + Expect(ev).To(Equal(&models.FakeEvent{Token: "0"})) ev, err = slowConsumer.Next() Expect(err).NotTo(HaveOccurred()) - Expect(ev).To(Equal(eventfakes.FakeEvent{Token: "1"})) + Expect(ev).To(Equal(&models.FakeEvent{Token: "1"})) By("putting 3 more events on, 'overflowing the buffer' and making the consumer 'slow'") for eventToken := events.MAX_PENDING_SUBSCRIBER_EVENTS; eventToken < events.MAX_PENDING_SUBSCRIBER_EVENTS+3; eventToken++ { - hub.Emit(eventfakes.FakeEvent{Token: strconv.Itoa(eventToken)}) + hub.Emit(&models.FakeEvent{Token: strconv.Itoa(eventToken)}) } By("reading off all the 'buffered' events") for eventToken := 2; eventToken < events.MAX_PENDING_SUBSCRIBER_EVENTS+2; eventToken++ { ev, err = slowConsumer.Next() Expect(err).NotTo(HaveOccurred()) - Expect(ev).To(Equal(eventfakes.FakeEvent{Token: strconv.Itoa(eventToken)})) + Expect(ev).To(Equal(&models.FakeEvent{Token: strconv.Itoa(eventToken)})) } By("trying to read more out of the source") @@ -137,8 +137,8 @@ var _ = Describe("Hub", func() { source, err := hub.Subscribe() Expect(err).NotTo(HaveOccurred()) - hub.Emit(eventfakes.FakeEvent{Token: "1"}) - Expect(source.Next()).To(Equal(eventfakes.FakeEvent{Token: "1"})) + hub.Emit(&models.FakeEvent{Token: "1"}) + Expect(source.Next()).To(Equal(&models.FakeEvent{Token: "1"})) err = source.Close() Expect(err).NotTo(HaveOccurred()) @@ -154,7 +154,7 @@ var _ = Describe("Hub", func() { err = source.Close() Expect(err).NotTo(HaveOccurred()) - hub.Emit(eventfakes.FakeEvent{Token: "1"}) + hub.Emit(&models.FakeEvent{Token: "1"}) _, err = source.Next() Expect(err).To(Equal(events.ErrReadFromClosedSource)) diff --git a/handlers/events_handlers_test.go b/handlers/events_handlers_test.go index d0179d5b..e4993b6a 100644 --- a/handlers/events_handlers_test.go +++ b/handlers/events_handlers_test.go @@ -10,7 +10,6 @@ import ( "strings" "code.cloudfoundry.org/bbs/events" - "code.cloudfoundry.org/bbs/events/eventfakes" "code.cloudfoundry.org/bbs/format" "code.cloudfoundry.org/bbs/handlers" "code.cloudfoundry.org/bbs/models" @@ -22,6 +21,7 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" "github.com/vito/go-sse/sse" + "google.golang.org/protobuf/proto" ) var _ = Describe("Event Handlers", func() { @@ -65,7 +65,7 @@ var _ = Describe("Event Handlers", func() { Expect(err).NotTo(HaveOccurred()) go func() { for { - hub.Emit(eventfakes.FakeEvent{Token: "A"}) + hub.Emit(&models.FakeEvent{Token: "A"}) } }() Eventually(eventStreamDone, 10).Should(BeClosed()) @@ -119,8 +119,10 @@ var _ = Describe("Event Handlers", func() { log.Printf("response.Body: %+v", response.Body) reader := sse.NewReadCloser(response.Body) - hub.Emit(&eventfakes.FakeEvent{Token: "A"}) - encodedPayload := base64.StdEncoding.EncodeToString([]byte("A")) + fakeEvent := &models.FakeEvent{Token: "A"} + marshalledFakeEvent, _ := proto.Marshal(fakeEvent.ToProto()) + hub.Emit(fakeEvent) + encodedPayload := base64.StdEncoding.EncodeToString(marshalledFakeEvent) tokenA, _ := reader.Next() log.Printf("tokenA: %+v", tokenA) @@ -131,9 +133,11 @@ var _ = Describe("Event Handlers", func() { Data: []byte(encodedPayload), })) - hub.Emit(&eventfakes.FakeEvent{Token: "B"}) + fakeEvent = &models.FakeEvent{Token: "B"} + marshalledFakeEvent, _ = proto.Marshal(fakeEvent.ToProto()) + hub.Emit(fakeEvent) - encodedPayload = base64.StdEncoding.EncodeToString([]byte("B")) + encodedPayload = base64.StdEncoding.EncodeToString(marshalledFakeEvent) Expect(reader.Next()).To(Equal(sse.Event{ ID: "1", Name: "fake", @@ -149,8 +153,10 @@ var _ = Describe("Event Handlers", func() { It("detects closed clients on the server", func() { reader := sse.NewReadCloser(response.Body) - hub.Emit(&eventfakes.FakeEvent{Token: "A"}) - encodedPayload := base64.StdEncoding.EncodeToString([]byte("A")) + fakeEvent := &models.FakeEvent{Token: "A"} + marshalledFakeEvent, _ := proto.Marshal(fakeEvent.ToProto()) + hub.Emit(fakeEvent) + encodedPayload := base64.StdEncoding.EncodeToString(marshalledFakeEvent) Expect(reader.Next()).To(Equal(sse.Event{ ID: "0", @@ -166,7 +172,7 @@ var _ = Describe("Event Handlers", func() { Context("when the source provides an unmarshalable event", func() { It("closes the event stream to the client", func() { - hub.Emit(eventfakes.UnmarshalableEvent{Fn: func() {}}) + hub.Emit(&models.FakeEvent{Token: "\xc3\x28"}) // invalid UTF-8 reader := sse.NewReadCloser(response.Body) _, err := reader.Next() diff --git a/models/events.go b/models/events.go index dc81a9c4..e904b200 100644 --- a/models/events.go +++ b/models/events.go @@ -33,6 +33,8 @@ const ( EventTypeTaskCreated = "task_created" EventTypeTaskChanged = "task_changed" EventTypeTaskRemoved = "task_removed" + + EventTypeFake = "fake" ) // Downgrade the DesiredLRPEvent payload (i.e. DesiredLRP(s)) to the given @@ -374,3 +376,15 @@ func (event TaskRemovedEvent) Key() string { func (event *TaskRemovedEvent) ToEventProto() proto.Message { return event.ToProto() } + +func (event *FakeEvent) EventType() string { + return EventTypeFake +} + +func (event FakeEvent) Key() string { + return event.Token +} + +func (event *FakeEvent) ToEventProto() proto.Message { + return event.ToProto() +} From 85ca46b4c53166d2aa6faccd1a6e6fd425f55b99 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 16 Jul 2024 16:51:07 +0000 Subject: [PATCH 123/155] We can use d.Routes directly here since it's a pointer --- models/desired_lrp.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 26f1f7dd..f848a514 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -208,10 +208,6 @@ func (d *DesiredLRP) DesiredLRPResource() DesiredLRPResource { } func (d *DesiredLRP) DesiredLRPSchedulingInfo() DesiredLRPSchedulingInfo { - var routes Routes - if d.Routes != nil { - routes = *d.Routes - } var modificationTag ModificationTag if d.ModificationTag != nil { modificationTag = *d.ModificationTag @@ -228,7 +224,7 @@ func (d *DesiredLRP) DesiredLRPSchedulingInfo() DesiredLRPSchedulingInfo { d.Annotation, d.Instances, d.DesiredLRPResource(), - &routes, + d.Routes, modificationTag, &volumePlacement, d.PlacementTags, From 8372c58fb0257976d163ae8ffeae3145a1c48560 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 16 Jul 2024 16:52:35 +0000 Subject: [PATCH 124/155] Change interface{} to explicit type so we can use ToProto() and send to newTestRequest --- handlers/events_handlers_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/handlers/events_handlers_test.go b/handlers/events_handlers_test.go index e4993b6a..8d62dc2a 100644 --- a/handlers/events_handlers_test.go +++ b/handlers/events_handlers_test.go @@ -255,7 +255,7 @@ var _ = Describe("Event Handlers", func() { Context("when cell id is specified", func() { var ( reader *sse.ReadCloser - requestBody interface{} + requestBody *models.EventsByCellId cellId = "cell-id" eventSource events.EventSource eventsCh chan models.Event @@ -273,7 +273,8 @@ var _ = Describe("Event Handlers", func() { JustBeforeEach(func() { By("creating server") server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - request := newTestRequest(requestBody) + protoRequestBody := requestBody.ToProto() + request := newTestRequest(protoRequestBody) handler.Subscribe_r0(logger, w, request) })) From 6664b3345772e00bc72bafd8b12245f669b52045 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 16 Jul 2024 16:52:58 +0000 Subject: [PATCH 125/155] Remove debug log statements Regen protos --- events/event_source.go | 3 --- events/hub.go | 3 --- handlers/events_handlers.go | 3 --- handlers/events_handlers_r0.go | 3 --- handlers/events_handlers_test.go | 4 --- models/actions.pb.go | 2 +- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 2 +- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 2 +- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 2 +- models/cached_dependency.pb.go | 2 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 2 +- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 2 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 2 +- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp_bbs.pb.go | 33 ++++++++++++++----------- models/desired_lrp_requests.pb.go | 2 +- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 2 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 2 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 2 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 2 +- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 2 +- models/events_bbs.pb.go | 2 +- models/image_layer.pb.go | 2 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 2 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 2 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 2 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 2 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 2 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 2 +- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 2 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 2 +- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 2 +- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 2 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 2 +- 56 files changed, 69 insertions(+), 80 deletions(-) diff --git a/events/event_source.go b/events/event_source.go index 3da52837..57eb2f9c 100644 --- a/events/event_source.go +++ b/events/event_source.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "log" "strconv" "code.cloudfoundry.org/bbs/models" @@ -58,8 +57,6 @@ func (e closeError) Error() string { func NewEventFromModelEvent(eventID int, event models.Event) (sse.Event, error) { payload, err := proto.Marshal(event.ToEventProto()) - log.Printf("event.ToEventProto(): %+v", event.ToEventProto()) - log.Printf("payload: %+v", payload) if err != nil { return sse.Event{}, err } diff --git a/events/hub.go b/events/hub.go index 6c1aa511..0950825d 100644 --- a/events/hub.go +++ b/events/hub.go @@ -2,7 +2,6 @@ package events import ( "errors" - "log" "sync" "code.cloudfoundry.org/bbs/models" @@ -83,8 +82,6 @@ func (hub *hub) Subscribe() (EventSource, error) { } func (hub *hub) Emit(event models.Event) { - log.Printf("event: %+v", event) - log.Printf("event.EventType(): %+v", event.EventType()) hub.lock.Lock() size := len(hub.subscribers) diff --git a/handlers/events_handlers.go b/handlers/events_handlers.go index a2b96fc1..929eba81 100644 --- a/handlers/events_handlers.go +++ b/handlers/events_handlers.go @@ -3,7 +3,6 @@ package handlers import ( "bytes" "fmt" - "log" "net/http" "code.cloudfoundry.org/bbs/events" @@ -97,9 +96,7 @@ func streamEventsToResponse(logger lager.Logger, w http.ResponseWriter, eventCha return } - log.Printf("streamEventsToResponse event: %+v", event) sseEvent, err := events.NewEventFromModelEvent(eventID, event) - log.Printf("sseEvent: %+v", sseEvent) if err != nil { logger.Error("failed-to-marshal-event", err) return diff --git a/handlers/events_handlers_r0.go b/handlers/events_handlers_r0.go index 849ce13a..858be616 100644 --- a/handlers/events_handlers_r0.go +++ b/handlers/events_handlers_r0.go @@ -1,7 +1,6 @@ package handlers import ( - "log" "net/http" "code.cloudfoundry.org/bbs/format" @@ -93,8 +92,6 @@ func (h *LRPInstanceEventHandler) commonSubscribe(logger lager.Logger, w http.Re protoRequest := &models.ProtoEventsByCellId{} err := parseRequest(logger, req, protoRequest) request = protoRequest.FromProto() - log.Printf("protoRequest: %+v", protoRequest) - log.Printf("request: %+v", request) if err != nil { logger.Error("failed-parsing-request", err) w.WriteHeader(http.StatusInternalServerError) diff --git a/handlers/events_handlers_test.go b/handlers/events_handlers_test.go index 8d62dc2a..805e2a83 100644 --- a/handlers/events_handlers_test.go +++ b/handlers/events_handlers_test.go @@ -4,7 +4,6 @@ import ( "encoding/base64" "fmt" "io" - "log" "net/http" "net/http/httptest" "strings" @@ -116,7 +115,6 @@ var _ = Describe("Event Handlers", func() { Context("when successfully subscribing to the event hub", func() { It("emits events from the hub to the connection", func() { - log.Printf("response.Body: %+v", response.Body) reader := sse.NewReadCloser(response.Body) fakeEvent := &models.FakeEvent{Token: "A"} @@ -125,8 +123,6 @@ var _ = Describe("Event Handlers", func() { encodedPayload := base64.StdEncoding.EncodeToString(marshalledFakeEvent) tokenA, _ := reader.Next() - log.Printf("tokenA: %+v", tokenA) - Expect(tokenA).To(Equal(sse.Event{ ID: "0", Name: "fake", diff --git a/models/actions.pb.go b/models/actions.pb.go index d4540fbb..d17268ca 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: actions.proto package models diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 5aec94d0..c9076436 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 57175627..d126c54d 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index d0518eb8..7b0ef8fe 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 1522ff4b..376f12da 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: actual_lrp_requests.proto package models diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index dd33d924..64f226e6 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index af8c3cbb..70255193 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: bbs.proto package models diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 78b07e43..c2fd0a7f 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: cached_dependency.proto package models diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 114a6413..fc4ae9ce 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index bbaa0efe..c9ca34d7 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: cells.proto package models diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 11ce6d4c..0158674d 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index fa068441..68dc28c1 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: certificate_properties.proto package models diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 90dcf675..353765e5 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 6875a7ce..8d634ef9 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: check_definition.proto package models diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index ab15688b..4ae52fae 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: check_definition.proto package models diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index ef62fb99..28f65fb8 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: desired_lrp.proto package models @@ -234,19 +234,20 @@ type DesiredLRPRunInfo struct { CreatedAt int64 `json:"created_at"` CachedDependencies []*CachedDependency `json:"cachedDependencies,omitempty"` // Deprecated: marked deprecated in desired_lrp.proto - LegacyDownloadUser string `json:"legacy_download_user,omitempty"` - TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` - Network *Network `json:"network,omitempty"` - StartTimeoutMs int64 `json:"start_timeout_ms"` - CertificateProperties *CertificateProperties `json:"certificate_properties,omitempty"` - ImageUsername string `json:"image_username,omitempty"` - ImagePassword string `json:"image_password,omitempty"` - CheckDefinition *CheckDefinition `json:"check_definition,omitempty"` - ImageLayers []*ImageLayer `json:"image_layers,omitempty"` - MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` - Sidecars []*Sidecar `json:"sidecars,omitempty"` - LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` + LegacyDownloadUser string `json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*VolumeMount `json:"volume_mounts,omitempty"` + Network *Network `json:"network,omitempty"` + StartTimeoutMs int64 `json:"start_timeout_ms"` + CertificateProperties *CertificateProperties `json:"certificate_properties,omitempty"` + ImageUsername string `json:"image_username,omitempty"` + ImagePassword string `json:"image_password,omitempty"` + CheckDefinition *CheckDefinition `json:"check_definition,omitempty"` + ImageLayers []*ImageLayer `json:"image_layers,omitempty"` + // Deprecated: marked deprecated in desired_lrp.proto + MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` + Sidecars []*Sidecar `json:"sidecars,omitempty"` + LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` } func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { @@ -749,12 +750,16 @@ func (m *DesiredLRPRunInfo) SetImageLayers(value []*ImageLayer) { m.ImageLayers = value } } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) GetMetricTags() map[string]*MetricTagValue { if m != nil { return m.MetricTags } return nil } + +// Deprecated: marked deprecated in desired_lrp.proto func (m *DesiredLRPRunInfo) SetMetricTags(value map[string]*MetricTagValue) { if m != nil { m.MetricTags = value diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 718b1017..c576a5d6 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: desired_lrp_requests.proto package models diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index fafc54e7..d9b32e37 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index 57942afd..d0786abb 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: domain.proto package models diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 2ebfd953..bcf09eee 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index c656a89b..530666d5 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: environment_variables.proto package models diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 27cccbc9..ec1a0c8d 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index cce796d4..0784f7d0 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: error.proto package models diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 1fa34b2a..6929ec9e 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 366a2c80..cdf48653 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: evacuation.proto package models diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 72ffbb24..180a0143 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index a0f1f068..92e91545 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: events.proto package models diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index db190e46..7978c797 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: events.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index ffbe5a0f..97be31c2 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: image_layer.proto package models diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 9370a402..028744cf 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index 902bde1a..df5f6fda 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: log_rate_limit.proto package models diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 92fdbec0..053b89dd 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index d704d14d..de1b9385 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: metric_tags.proto package models diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 91ad3c72..c083ef92 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 9e902961..402343d5 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: modification_tag.proto package models diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index ebbe0e23..80befb5d 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index ed36d06b..e1cc5e06 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: network.proto package models diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 72bc8b46..4666c596 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 724115e0..cdc8d57f 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: ping.proto package models diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index e2d21171..f9cee815 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index d6d807f5..7ac046b5 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: security_group.proto package models diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 214ab6b0..1dc7fa47 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 0f57c09c..3c413e29 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: sidecar.proto package models diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index cb2b1f12..67823325 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index dd409f2f..a3af2c30 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: task.proto package models diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 42936d9d..69481e93 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index d2cac94e..8eed514a 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: task_requests.proto package models diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 59f8342e..f3eae29c 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index da67dbde..556ac2ba 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: volume_mount.proto package models diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 10af6aea..f68d09af 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.27.2 +// - protoc v5.28.0 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 883c9622..0a7cdfab 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc v5.28.0 // source: bbs.proto package main From 075ee2ecea08b15ccc4e2fff67353cb6a5cc7ec5 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 3 Sep 2024 17:57:06 +0000 Subject: [PATCH 126/155] Change to match new protobufs Regen protos --- cmd/bbs/main.go | 2 +- cmd/bbs/master_lock_test.go | 2 +- cmd/bbs/metrics_test.go | 2 +- cmd/bbs/ping_test.go | 4 +- cmd/bbs/presence_test.go | 2 +- cmd/bbs/sql_lock_test.go | 4 +- db/migrations/1722634733_split_metric_tags.go | 6 +- .../1722634733_split_metric_tags_test.go | 7 +- models/actions.pb.go | 248 +++--------- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 160 ++------ models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 314 +++------------ models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 4 +- models/cached_dependency.pb.go | 28 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 94 +---- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 28 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 94 +---- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 165 ++------ models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 226 ++--------- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 72 +--- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 28 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 28 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 160 ++------ models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 358 ++++-------------- models/events_bbs.pb.go | 2 +- models/image_layer.pb.go | 28 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 28 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 28 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 28 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 28 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 28 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 72 +--- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 28 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 50 +-- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 292 +++----------- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 72 +--- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 4 +- serviceclient/service_client.go | 2 +- serviceclient/service_client_test.go | 2 +- test_helpers/locket_helper.go | 2 +- 63 files changed, 561 insertions(+), 2217 deletions(-) diff --git a/cmd/bbs/main.go b/cmd/bbs/main.go index cdc0741a..66870a5b 100644 --- a/cmd/bbs/main.go +++ b/cmd/bbs/main.go @@ -222,7 +222,7 @@ func main() { lockIdentifier := &locketmodels.Resource{ Key: bbsLockKey, Owner: bbsConfig.UUID, - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, Type: locketmodels.LockType, } diff --git a/cmd/bbs/master_lock_test.go b/cmd/bbs/master_lock_test.go index e53cd5cb..7237b993 100644 --- a/cmd/bbs/master_lock_test.go +++ b/cmd/bbs/master_lock_test.go @@ -25,7 +25,7 @@ var _ = Describe("MasterLock", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, } clock := clock.NewClock() diff --git a/cmd/bbs/metrics_test.go b/cmd/bbs/metrics_test.go index d2dc323e..2c3dcadf 100644 --- a/cmd/bbs/metrics_test.go +++ b/cmd/bbs/metrics_test.go @@ -71,7 +71,7 @@ var _ = Describe("Metrics", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, } clock := clock.NewClock() diff --git a/cmd/bbs/ping_test.go b/cmd/bbs/ping_test.go index 7a9c7de6..4c1aaa41 100644 --- a/cmd/bbs/ping_test.go +++ b/cmd/bbs/ping_test.go @@ -30,7 +30,7 @@ var _ = Describe("Ping API", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, } clock := clock.NewClock() @@ -88,7 +88,7 @@ var _ = Describe("Ping API", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, } clock := clock.NewClock() diff --git a/cmd/bbs/presence_test.go b/cmd/bbs/presence_test.go index 9b15421a..6d0be2e5 100644 --- a/cmd/bbs/presence_test.go +++ b/cmd/bbs/presence_test.go @@ -86,7 +86,7 @@ var _ = Describe("CellPresence", func() { Key: "cell-locket", Owner: "anything", Value: string(data), - TypeCode: locketmodels.PRESENCE, + TypeCode: locketmodels.TypeCode_PRESENCE, } cellPresenceLocket = ginkgomon.Invoke( diff --git a/cmd/bbs/sql_lock_test.go b/cmd/bbs/sql_lock_test.go index 42d00d46..c83044db 100644 --- a/cmd/bbs/sql_lock_test.go +++ b/cmd/bbs/sql_lock_test.go @@ -150,7 +150,7 @@ var _ = Describe("SqlLock", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, } clock := clock.NewClock() @@ -204,7 +204,7 @@ var _ = Describe("SqlLock", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, } clock := clock.NewClock() diff --git a/db/migrations/1722634733_split_metric_tags.go b/db/migrations/1722634733_split_metric_tags.go index 5756f3bc..1640119d 100644 --- a/db/migrations/1722634733_split_metric_tags.go +++ b/db/migrations/1722634733_split_metric_tags.go @@ -89,13 +89,15 @@ func (e *SplitMetricTags) Up(tx *sql.Tx, logger lager.Logger) error { logger.Error("failed-reading-row", err) continue } - var runInfo models.DesiredLRPRunInfo - err = e.serializer.Unmarshal(logger, runInfoData, &runInfo) + var protoRunInfo models.ProtoDesiredLRPRunInfo + err = e.serializer.Unmarshal(logger, runInfoData, &protoRunInfo) if err != nil { logger.Error("failed-parsing-run-info", err) continue } + runInfo := protoRunInfo.FromProto() metricTags := map[string]*models.MetricTagValue{} + //lint:ignore SA1019 - migration from deprecated functionality for k, v := range runInfo.MetricTags { metricTags[k] = v } diff --git a/db/migrations/1722634733_split_metric_tags_test.go b/db/migrations/1722634733_split_metric_tags_test.go index 9c8e497b..c535237d 100644 --- a/db/migrations/1722634733_split_metric_tags_test.go +++ b/db/migrations/1722634733_split_metric_tags_test.go @@ -54,7 +54,7 @@ var _ = Describe("SplitMetricTags", func() { Context("when there is desired lrp", func() { JustBeforeEach(func() { - runInfoData, err := serializer.Marshal(logger, runInfo) + runInfoData, err := serializer.Marshal(logger, runInfo.ToProto()) Expect(err).NotTo(HaveOccurred()) _, err = rawSQLDB.Exec( @@ -72,7 +72,8 @@ var _ = Describe("SplitMetricTags", func() { Context("when run info has metric tags", func() { BeforeEach(func() { - runInfo.MetricTags = map[string]*models.MetricTagValue{"foo": &models.MetricTagValue{Static: "some-value"}} + //lint:ignore SA1019 - testing deprecated functionality + runInfo.MetricTags = map[string]*models.MetricTagValue{"foo": {Static: "some-value"}} }) It("updates metric_tags to run_info metric_tags", func() { @@ -91,7 +92,7 @@ var _ = Describe("SplitMetricTags", func() { err = json.Unmarshal(decodedMetricTags, &metricTags) Expect(err).NotTo(HaveOccurred()) - Expect(metricTags).To(Equal(map[string]*models.MetricTagValue{"foo": &models.MetricTagValue{Static: "some-value"}})) + Expect(metricTags).To(Equal(map[string]*models.MetricTagValue{"foo": {Static: "some-value"}})) }) }) diff --git a/models/actions.pb.go b/models/actions.pb.go index d17268ca..2d3fd613 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: actions.proto package models @@ -49,11 +49,9 @@ type ProtoAction struct { func (x *ProtoAction) Reset() { *x = ProtoAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoAction) String() string { @@ -64,7 +62,7 @@ func (*ProtoAction) ProtoMessage() {} func (x *ProtoAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -159,11 +157,9 @@ type ProtoDownloadAction struct { func (x *ProtoDownloadAction) Reset() { *x = ProtoDownloadAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDownloadAction) String() string { @@ -174,7 +170,7 @@ func (*ProtoDownloadAction) ProtoMessage() {} func (x *ProtoDownloadAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -259,11 +255,9 @@ type ProtoUploadAction struct { func (x *ProtoUploadAction) Reset() { *x = ProtoUploadAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoUploadAction) String() string { @@ -274,7 +268,7 @@ func (*ProtoUploadAction) ProtoMessage() {} func (x *ProtoUploadAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -341,11 +335,9 @@ type ProtoRunAction struct { func (x *ProtoRunAction) Reset() { *x = ProtoRunAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRunAction) String() string { @@ -356,7 +348,7 @@ func (*ProtoRunAction) ProtoMessage() {} func (x *ProtoRunAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -441,11 +433,9 @@ type ProtoTimeoutAction struct { func (x *ProtoTimeoutAction) Reset() { *x = ProtoTimeoutAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTimeoutAction) String() string { @@ -456,7 +446,7 @@ func (*ProtoTimeoutAction) ProtoMessage() {} func (x *ProtoTimeoutAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -514,11 +504,9 @@ type ProtoEmitProgressAction struct { func (x *ProtoEmitProgressAction) Reset() { *x = ProtoEmitProgressAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEmitProgressAction) String() string { @@ -529,7 +517,7 @@ func (*ProtoEmitProgressAction) ProtoMessage() {} func (x *ProtoEmitProgressAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -590,11 +578,9 @@ type ProtoTryAction struct { func (x *ProtoTryAction) Reset() { *x = ProtoTryAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTryAction) String() string { @@ -605,7 +591,7 @@ func (*ProtoTryAction) ProtoMessage() {} func (x *ProtoTryAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -645,11 +631,9 @@ type ProtoParallelAction struct { func (x *ProtoParallelAction) Reset() { *x = ProtoParallelAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoParallelAction) String() string { @@ -660,7 +644,7 @@ func (*ProtoParallelAction) ProtoMessage() {} func (x *ProtoParallelAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -700,11 +684,9 @@ type ProtoSerialAction struct { func (x *ProtoSerialAction) Reset() { *x = ProtoSerialAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoSerialAction) String() string { @@ -715,7 +697,7 @@ func (*ProtoSerialAction) ProtoMessage() {} func (x *ProtoSerialAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -755,11 +737,9 @@ type ProtoCodependentAction struct { func (x *ProtoCodependentAction) Reset() { *x = ProtoCodependentAction{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCodependentAction) String() string { @@ -770,7 +750,7 @@ func (*ProtoCodependentAction) ProtoMessage() {} func (x *ProtoCodependentAction) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -811,11 +791,9 @@ type ProtoResourceLimits struct { func (x *ProtoResourceLimits) Reset() { *x = ProtoResourceLimits{} - if protoimpl.UnsafeEnabled { - mi := &file_actions_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actions_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoResourceLimits) String() string { @@ -826,7 +804,7 @@ func (*ProtoResourceLimits) ProtoMessage() {} func (x *ProtoResourceLimits) ProtoReflect() protoreflect.Message { mi := &file_actions_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1068,140 +1046,6 @@ func file_actions_proto_init() { } file_bbs_proto_init() file_environment_variables_proto_init() - if !protoimpl.UnsafeEnabled { - file_actions_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDownloadAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoUploadAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRunAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTimeoutAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEmitProgressAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTryAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*ProtoParallelAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*ProtoSerialAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCodependentAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actions_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*ProtoResourceLimits); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_actions_proto_msgTypes[10].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index c9076436..e560ad47 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index d126c54d..6199ff0c 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: actual_lrp.proto package models @@ -130,11 +130,9 @@ type ProtoActualLRPGroup struct { func (x *ProtoActualLRPGroup) Reset() { *x = ProtoActualLRPGroup{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPGroup) String() string { @@ -145,7 +143,7 @@ func (*ProtoActualLRPGroup) ProtoMessage() {} func (x *ProtoActualLRPGroup) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -187,11 +185,9 @@ type ProtoPortMapping struct { func (x *ProtoPortMapping) Reset() { *x = ProtoPortMapping{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoPortMapping) String() string { @@ -202,7 +198,7 @@ func (*ProtoPortMapping) ProtoMessage() {} func (x *ProtoPortMapping) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -257,11 +253,9 @@ type ProtoActualLRPKey struct { func (x *ProtoActualLRPKey) Reset() { *x = ProtoActualLRPKey{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPKey) String() string { @@ -272,7 +266,7 @@ func (*ProtoActualLRPKey) ProtoMessage() {} func (x *ProtoActualLRPKey) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -319,11 +313,9 @@ type ProtoActualLRPInstanceKey struct { func (x *ProtoActualLRPInstanceKey) Reset() { *x = ProtoActualLRPInstanceKey{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPInstanceKey) String() string { @@ -334,7 +326,7 @@ func (*ProtoActualLRPInstanceKey) ProtoMessage() {} func (x *ProtoActualLRPInstanceKey) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -376,11 +368,9 @@ type ProtoActualLRPNetInfo struct { func (x *ProtoActualLRPNetInfo) Reset() { *x = ProtoActualLRPNetInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPNetInfo) String() string { @@ -391,7 +381,7 @@ func (*ProtoActualLRPNetInfo) ProtoMessage() {} func (x *ProtoActualLRPNetInfo) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -444,11 +434,9 @@ type ProtoActualLRPInternalRoute struct { func (x *ProtoActualLRPInternalRoute) Reset() { *x = ProtoActualLRPInternalRoute{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPInternalRoute) String() string { @@ -459,7 +447,7 @@ func (*ProtoActualLRPInternalRoute) ProtoMessage() {} func (x *ProtoActualLRPInternalRoute) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -504,11 +492,9 @@ type ProtoActualLRP struct { func (x *ProtoActualLRP) Reset() { *x = ProtoActualLRP{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRP) String() string { @@ -519,7 +505,7 @@ func (*ProtoActualLRP) ProtoMessage() {} func (x *ProtoActualLRP) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -826,92 +812,6 @@ func file_actual_lrp_proto_init() { } file_bbs_proto_init() file_modification_tag_proto_init() - if !protoimpl.UnsafeEnabled { - file_actual_lrp_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPGroup); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoPortMapping); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPInstanceKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPNetInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPInternalRoute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRP); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_actual_lrp_proto_msgTypes[6].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 7b0ef8fe..839898cd 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 376f12da..2547d599 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: actual_lrp_requests.proto package models @@ -30,11 +30,9 @@ type ProtoActualLRPLifecycleResponse struct { func (x *ProtoActualLRPLifecycleResponse) Reset() { *x = ProtoActualLRPLifecycleResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPLifecycleResponse) String() string { @@ -45,7 +43,7 @@ func (*ProtoActualLRPLifecycleResponse) ProtoMessage() {} func (x *ProtoActualLRPLifecycleResponse) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -79,11 +77,9 @@ type ProtoActualLRPGroupsResponse struct { func (x *ProtoActualLRPGroupsResponse) Reset() { *x = ProtoActualLRPGroupsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPGroupsResponse) String() string { @@ -94,7 +90,7 @@ func (*ProtoActualLRPGroupsResponse) ProtoMessage() {} func (x *ProtoActualLRPGroupsResponse) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -135,11 +131,9 @@ type ProtoActualLRPGroupResponse struct { func (x *ProtoActualLRPGroupResponse) Reset() { *x = ProtoActualLRPGroupResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPGroupResponse) String() string { @@ -150,7 +144,7 @@ func (*ProtoActualLRPGroupResponse) ProtoMessage() {} func (x *ProtoActualLRPGroupResponse) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -191,11 +185,9 @@ type ProtoActualLRPGroupsRequest struct { func (x *ProtoActualLRPGroupsRequest) Reset() { *x = ProtoActualLRPGroupsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPGroupsRequest) String() string { @@ -206,7 +198,7 @@ func (*ProtoActualLRPGroupsRequest) ProtoMessage() {} func (x *ProtoActualLRPGroupsRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -246,11 +238,9 @@ type ProtoActualLRPGroupsByProcessGuidRequest struct { func (x *ProtoActualLRPGroupsByProcessGuidRequest) Reset() { *x = ProtoActualLRPGroupsByProcessGuidRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPGroupsByProcessGuidRequest) String() string { @@ -261,7 +251,7 @@ func (*ProtoActualLRPGroupsByProcessGuidRequest) ProtoMessage() {} func (x *ProtoActualLRPGroupsByProcessGuidRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -295,11 +285,9 @@ type ProtoActualLRPGroupByProcessGuidAndIndexRequest struct { func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) Reset() { *x = ProtoActualLRPGroupByProcessGuidAndIndexRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) String() string { @@ -310,7 +298,7 @@ func (*ProtoActualLRPGroupByProcessGuidAndIndexRequest) ProtoMessage() {} func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -351,11 +339,9 @@ type ProtoClaimActualLRPRequest struct { func (x *ProtoClaimActualLRPRequest) Reset() { *x = ProtoClaimActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoClaimActualLRPRequest) String() string { @@ -366,7 +352,7 @@ func (*ProtoClaimActualLRPRequest) ProtoMessage() {} func (x *ProtoClaimActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -418,11 +404,9 @@ type ProtoStartActualLRPRequest struct { func (x *ProtoStartActualLRPRequest) Reset() { *x = ProtoStartActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoStartActualLRPRequest) String() string { @@ -433,7 +417,7 @@ func (*ProtoStartActualLRPRequest) ProtoMessage() {} func (x *ProtoStartActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -509,11 +493,9 @@ type ProtoCrashActualLRPRequest struct { func (x *ProtoCrashActualLRPRequest) Reset() { *x = ProtoCrashActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCrashActualLRPRequest) String() string { @@ -524,7 +506,7 @@ func (*ProtoCrashActualLRPRequest) ProtoMessage() {} func (x *ProtoCrashActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -571,11 +553,9 @@ type ProtoFailActualLRPRequest struct { func (x *ProtoFailActualLRPRequest) Reset() { *x = ProtoFailActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoFailActualLRPRequest) String() string { @@ -586,7 +566,7 @@ func (*ProtoFailActualLRPRequest) ProtoMessage() {} func (x *ProtoFailActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -625,11 +605,9 @@ type ProtoRetireActualLRPRequest struct { func (x *ProtoRetireActualLRPRequest) Reset() { *x = ProtoRetireActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRetireActualLRPRequest) String() string { @@ -640,7 +618,7 @@ func (*ProtoRetireActualLRPRequest) ProtoMessage() {} func (x *ProtoRetireActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -674,11 +652,9 @@ type ProtoRemoveActualLRPRequest struct { func (x *ProtoRemoveActualLRPRequest) Reset() { *x = ProtoRemoveActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRemoveActualLRPRequest) String() string { @@ -689,7 +665,7 @@ func (*ProtoRemoveActualLRPRequest) ProtoMessage() {} func (x *ProtoRemoveActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -736,11 +712,9 @@ type ProtoActualLRPsResponse struct { func (x *ProtoActualLRPsResponse) Reset() { *x = ProtoActualLRPsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPsResponse) String() string { @@ -751,7 +725,7 @@ func (*ProtoActualLRPsResponse) ProtoMessage() {} func (x *ProtoActualLRPsResponse) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -793,11 +767,9 @@ type ProtoActualLRPsRequest struct { func (x *ProtoActualLRPsRequest) Reset() { *x = ProtoActualLRPsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_actual_lrp_requests_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_actual_lrp_requests_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPsRequest) String() string { @@ -808,7 +780,7 @@ func (*ProtoActualLRPsRequest) ProtoMessage() {} func (x *ProtoActualLRPsRequest) ProtoReflect() protoreflect.Message { mi := &file_actual_lrp_requests_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1089,176 +1061,6 @@ func file_actual_lrp_requests_proto_init() { file_bbs_proto_init() file_actual_lrp_proto_init() file_error_proto_init() - if !protoimpl.UnsafeEnabled { - file_actual_lrp_requests_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPLifecycleResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPGroupsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPGroupResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPGroupsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPGroupsByProcessGuidRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPGroupByProcessGuidAndIndexRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoClaimActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*ProtoStartActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCrashActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*ProtoFailActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRetireActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[11].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRemoveActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[12].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_actual_lrp_requests_proto_msgTypes[13].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_actual_lrp_requests_proto_msgTypes[7].OneofWrappers = []any{} file_actual_lrp_requests_proto_msgTypes[13].OneofWrappers = []any{} type x struct{} diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 64f226e6..3ddee97f 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 70255193..2d19a28b 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: bbs.proto package models diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index c2fd0a7f..aee6699b 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: cached_dependency.proto package models @@ -36,11 +36,9 @@ type ProtoCachedDependency struct { func (x *ProtoCachedDependency) Reset() { *x = ProtoCachedDependency{} - if protoimpl.UnsafeEnabled { - mi := &file_cached_dependency_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_cached_dependency_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCachedDependency) String() string { @@ -51,7 +49,7 @@ func (*ProtoCachedDependency) ProtoMessage() {} func (x *ProtoCachedDependency) ProtoReflect() protoreflect.Message { mi := &file_cached_dependency_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -172,20 +170,6 @@ func file_cached_dependency_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_cached_dependency_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCachedDependency); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index fc4ae9ce..ba0daf09 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index c9ca34d7..d8496c5f 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: cells.proto package models @@ -32,11 +32,9 @@ type ProtoCellCapacity struct { func (x *ProtoCellCapacity) Reset() { *x = ProtoCellCapacity{} - if protoimpl.UnsafeEnabled { - mi := &file_cells_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_cells_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCellCapacity) String() string { @@ -47,7 +45,7 @@ func (*ProtoCellCapacity) ProtoMessage() {} func (x *ProtoCellCapacity) ProtoReflect() protoreflect.Message { mi := &file_cells_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -100,11 +98,9 @@ type ProtoCellPresence struct { func (x *ProtoCellPresence) Reset() { *x = ProtoCellPresence{} - if protoimpl.UnsafeEnabled { - mi := &file_cells_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_cells_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCellPresence) String() string { @@ -115,7 +111,7 @@ func (*ProtoCellPresence) ProtoMessage() {} func (x *ProtoCellPresence) ProtoReflect() protoreflect.Message { mi := &file_cells_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -197,11 +193,9 @@ type ProtoProvider struct { func (x *ProtoProvider) Reset() { *x = ProtoProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_cells_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_cells_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoProvider) String() string { @@ -212,7 +206,7 @@ func (*ProtoProvider) ProtoMessage() {} func (x *ProtoProvider) ProtoReflect() protoreflect.Message { mi := &file_cells_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -252,11 +246,9 @@ type ProtoCellsResponse struct { func (x *ProtoCellsResponse) Reset() { *x = ProtoCellsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_cells_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_cells_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCellsResponse) String() string { @@ -267,7 +259,7 @@ func (*ProtoCellsResponse) ProtoMessage() {} func (x *ProtoCellsResponse) ProtoReflect() protoreflect.Message { mi := &file_cells_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -389,56 +381,6 @@ func file_cells_proto_init() { } file_bbs_proto_init() file_error_proto_init() - if !protoimpl.UnsafeEnabled { - file_cells_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCellCapacity); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cells_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCellPresence); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cells_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_cells_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCellsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 0158674d..2a0e6a1c 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 68dc28c1..903e87c4 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: certificate_properties.proto package models @@ -30,11 +30,9 @@ type ProtoCertificateProperties struct { func (x *ProtoCertificateProperties) Reset() { *x = ProtoCertificateProperties{} - if protoimpl.UnsafeEnabled { - mi := &file_certificate_properties_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_certificate_properties_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCertificateProperties) String() string { @@ -45,7 +43,7 @@ func (*ProtoCertificateProperties) ProtoMessage() {} func (x *ProtoCertificateProperties) ProtoReflect() protoreflect.Message { mi := &file_certificate_properties_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -112,20 +110,6 @@ func file_certificate_properties_proto_init() { if File_certificate_properties_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_certificate_properties_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCertificateProperties); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 353765e5..89cd58cc 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 8d634ef9..bc9f185d 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: check_definition.proto package models @@ -32,11 +32,9 @@ type ProtoCheckDefinition struct { func (x *ProtoCheckDefinition) Reset() { *x = ProtoCheckDefinition{} - if protoimpl.UnsafeEnabled { - mi := &file_check_definition_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_check_definition_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCheckDefinition) String() string { @@ -47,7 +45,7 @@ func (*ProtoCheckDefinition) ProtoMessage() {} func (x *ProtoCheckDefinition) ProtoReflect() protoreflect.Message { mi := &file_check_definition_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -96,11 +94,9 @@ type ProtoCheck struct { func (x *ProtoCheck) Reset() { *x = ProtoCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_check_definition_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_check_definition_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCheck) String() string { @@ -111,7 +107,7 @@ func (*ProtoCheck) ProtoMessage() {} func (x *ProtoCheck) ProtoReflect() protoreflect.Message { mi := &file_check_definition_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -152,11 +148,9 @@ type ProtoTCPCheck struct { func (x *ProtoTCPCheck) Reset() { *x = ProtoTCPCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_check_definition_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_check_definition_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTCPCheck) String() string { @@ -167,7 +161,7 @@ func (*ProtoTCPCheck) ProtoMessage() {} func (x *ProtoTCPCheck) ProtoReflect() protoreflect.Message { mi := &file_check_definition_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -216,11 +210,9 @@ type ProtoHTTPCheck struct { func (x *ProtoHTTPCheck) Reset() { *x = ProtoHTTPCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_check_definition_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_check_definition_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoHTTPCheck) String() string { @@ -231,7 +223,7 @@ func (*ProtoHTTPCheck) ProtoMessage() {} func (x *ProtoHTTPCheck) ProtoReflect() protoreflect.Message { mi := &file_check_definition_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -357,56 +349,6 @@ func file_check_definition_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_check_definition_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCheckDefinition); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_check_definition_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_check_definition_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTCPCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_check_definition_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoHTTPCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 4ae52fae..8b16763d 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 5d404015..8a0c8077 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.27.2 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: desired_lrp.proto package models import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -37,11 +38,9 @@ type ProtoDesiredLRPSchedulingInfo struct { func (x *ProtoDesiredLRPSchedulingInfo) Reset() { *x = ProtoDesiredLRPSchedulingInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPSchedulingInfo) String() string { @@ -52,7 +51,7 @@ func (*ProtoDesiredLRPSchedulingInfo) ProtoMessage() {} func (x *ProtoDesiredLRPSchedulingInfo) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -162,11 +161,9 @@ type ProtoDesiredLRPRunInfo struct { func (x *ProtoDesiredLRPRunInfo) Reset() { *x = ProtoDesiredLRPRunInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPRunInfo) String() string { @@ -177,7 +174,7 @@ func (*ProtoDesiredLRPRunInfo) ProtoMessage() {} func (x *ProtoDesiredLRPRunInfo) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -395,11 +392,9 @@ type ProtoRoutes struct { func (x *ProtoRoutes) Reset() { *x = ProtoRoutes{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRoutes) String() string { @@ -410,7 +405,7 @@ func (*ProtoRoutes) ProtoMessage() {} func (x *ProtoRoutes) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -445,11 +440,9 @@ type ProtoDesiredLRPUpdate struct { func (x *ProtoDesiredLRPUpdate) Reset() { *x = ProtoDesiredLRPUpdate{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPUpdate) String() string { @@ -460,7 +453,7 @@ func (*ProtoDesiredLRPUpdate) ProtoMessage() {} func (x *ProtoDesiredLRPUpdate) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -515,11 +508,9 @@ type ProtoDesiredLRPKey struct { func (x *ProtoDesiredLRPKey) Reset() { *x = ProtoDesiredLRPKey{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPKey) String() string { @@ -530,7 +521,7 @@ func (*ProtoDesiredLRPKey) ProtoMessage() {} func (x *ProtoDesiredLRPKey) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -579,11 +570,9 @@ type ProtoDesiredLRPResource struct { func (x *ProtoDesiredLRPResource) Reset() { *x = ProtoDesiredLRPResource{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPResource) String() string { @@ -594,7 +583,7 @@ func (*ProtoDesiredLRPResource) ProtoMessage() {} func (x *ProtoDesiredLRPResource) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -686,11 +675,9 @@ type ProtoDesiredLRP struct { func (x *ProtoDesiredLRP) Reset() { *x = ProtoDesiredLRP{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRP) String() string { @@ -701,7 +688,7 @@ func (*ProtoDesiredLRP) ProtoMessage() {} func (x *ProtoDesiredLRP) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1427,92 +1414,6 @@ func file_desired_lrp_proto_init() { file_metric_tags_proto_init() file_sidecar_proto_init() file_log_rate_limit_proto_init() - if !protoimpl.UnsafeEnabled { - file_desired_lrp_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPSchedulingInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPRunInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRoutes); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPUpdate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPResource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRP); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_desired_lrp_proto_msgTypes[1].OneofWrappers = []any{} file_desired_lrp_proto_msgTypes[3].OneofWrappers = []any{} file_desired_lrp_proto_msgTypes[6].OneofWrappers = []any{} diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 28f65fb8..aee47f58 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index c576a5d6..eabca33e 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: desired_lrp_requests.proto package models @@ -30,11 +30,9 @@ type ProtoDesiredLRPLifecycleResponse struct { func (x *ProtoDesiredLRPLifecycleResponse) Reset() { *x = ProtoDesiredLRPLifecycleResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPLifecycleResponse) String() string { @@ -45,7 +43,7 @@ func (*ProtoDesiredLRPLifecycleResponse) ProtoMessage() {} func (x *ProtoDesiredLRPLifecycleResponse) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -78,11 +76,9 @@ type ProtoDesiredLRPsResponse struct { func (x *ProtoDesiredLRPsResponse) Reset() { *x = ProtoDesiredLRPsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPsResponse) String() string { @@ -93,7 +89,7 @@ func (*ProtoDesiredLRPsResponse) ProtoMessage() {} func (x *ProtoDesiredLRPsResponse) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -133,11 +129,9 @@ type ProtoDesiredLRPsRequest struct { func (x *ProtoDesiredLRPsRequest) Reset() { *x = ProtoDesiredLRPsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPsRequest) String() string { @@ -148,7 +142,7 @@ func (*ProtoDesiredLRPsRequest) ProtoMessage() {} func (x *ProtoDesiredLRPsRequest) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -188,11 +182,9 @@ type ProtoDesiredLRPResponse struct { func (x *ProtoDesiredLRPResponse) Reset() { *x = ProtoDesiredLRPResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPResponse) String() string { @@ -203,7 +195,7 @@ func (*ProtoDesiredLRPResponse) ProtoMessage() {} func (x *ProtoDesiredLRPResponse) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -243,11 +235,9 @@ type ProtoDesiredLRPSchedulingInfosResponse struct { func (x *ProtoDesiredLRPSchedulingInfosResponse) Reset() { *x = ProtoDesiredLRPSchedulingInfosResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPSchedulingInfosResponse) String() string { @@ -258,7 +248,7 @@ func (*ProtoDesiredLRPSchedulingInfosResponse) ProtoMessage() {} func (x *ProtoDesiredLRPSchedulingInfosResponse) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -298,11 +288,9 @@ type ProtoDesiredLRPSchedulingInfoByProcessGuidResponse struct { func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) Reset() { *x = ProtoDesiredLRPSchedulingInfoByProcessGuidResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) String() string { @@ -313,7 +301,7 @@ func (*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) ProtoMessage() {} func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -352,11 +340,9 @@ type ProtoDesiredLRPByProcessGuidRequest struct { func (x *ProtoDesiredLRPByProcessGuidRequest) Reset() { *x = ProtoDesiredLRPByProcessGuidRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPByProcessGuidRequest) String() string { @@ -367,7 +353,7 @@ func (*ProtoDesiredLRPByProcessGuidRequest) ProtoMessage() {} func (x *ProtoDesiredLRPByProcessGuidRequest) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -399,11 +385,9 @@ type ProtoDesireLRPRequest struct { func (x *ProtoDesireLRPRequest) Reset() { *x = ProtoDesireLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesireLRPRequest) String() string { @@ -414,7 +398,7 @@ func (*ProtoDesireLRPRequest) ProtoMessage() {} func (x *ProtoDesireLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -447,11 +431,9 @@ type ProtoUpdateDesiredLRPRequest struct { func (x *ProtoUpdateDesiredLRPRequest) Reset() { *x = ProtoUpdateDesiredLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoUpdateDesiredLRPRequest) String() string { @@ -462,7 +444,7 @@ func (*ProtoUpdateDesiredLRPRequest) ProtoMessage() {} func (x *ProtoUpdateDesiredLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -501,11 +483,9 @@ type ProtoRemoveDesiredLRPRequest struct { func (x *ProtoRemoveDesiredLRPRequest) Reset() { *x = ProtoRemoveDesiredLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_desired_lrp_requests_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_desired_lrp_requests_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRemoveDesiredLRPRequest) String() string { @@ -516,7 +496,7 @@ func (*ProtoRemoveDesiredLRPRequest) ProtoMessage() {} func (x *ProtoRemoveDesiredLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_desired_lrp_requests_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -682,128 +662,6 @@ func file_desired_lrp_requests_proto_init() { file_bbs_proto_init() file_desired_lrp_proto_init() file_error_proto_init() - if !protoimpl.UnsafeEnabled { - file_desired_lrp_requests_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPLifecycleResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPSchedulingInfosResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPSchedulingInfoByProcessGuidResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPByProcessGuidRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesireLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*ProtoUpdateDesiredLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_desired_lrp_requests_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRemoveDesiredLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index d9b32e37..cc2346d1 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index d0786abb..a2467072 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: domain.proto package models @@ -31,11 +31,9 @@ type ProtoDomainsResponse struct { func (x *ProtoDomainsResponse) Reset() { *x = ProtoDomainsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_domain_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_domain_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDomainsResponse) String() string { @@ -46,7 +44,7 @@ func (*ProtoDomainsResponse) ProtoMessage() {} func (x *ProtoDomainsResponse) ProtoReflect() protoreflect.Message { mi := &file_domain_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -85,11 +83,9 @@ type ProtoUpsertDomainResponse struct { func (x *ProtoUpsertDomainResponse) Reset() { *x = ProtoUpsertDomainResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_domain_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_domain_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoUpsertDomainResponse) String() string { @@ -100,7 +96,7 @@ func (*ProtoUpsertDomainResponse) ProtoMessage() {} func (x *ProtoUpsertDomainResponse) ProtoReflect() protoreflect.Message { mi := &file_domain_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -133,11 +129,9 @@ type ProtoUpsertDomainRequest struct { func (x *ProtoUpsertDomainRequest) Reset() { *x = ProtoUpsertDomainRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_domain_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_domain_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoUpsertDomainRequest) String() string { @@ -148,7 +142,7 @@ func (*ProtoUpsertDomainRequest) ProtoMessage() {} func (x *ProtoUpsertDomainRequest) ProtoReflect() protoreflect.Message { mi := &file_domain_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -239,44 +233,6 @@ func file_domain_proto_init() { } file_bbs_proto_init() file_error_proto_init() - if !protoimpl.UnsafeEnabled { - file_domain_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDomainsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_domain_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoUpsertDomainResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_domain_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoUpsertDomainRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index bcf09eee..ae9443d2 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 530666d5..540607fb 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: environment_variables.proto package models @@ -31,11 +31,9 @@ type ProtoEnvironmentVariable struct { func (x *ProtoEnvironmentVariable) Reset() { *x = ProtoEnvironmentVariable{} - if protoimpl.UnsafeEnabled { - mi := &file_environment_variables_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_environment_variables_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEnvironmentVariable) String() string { @@ -46,7 +44,7 @@ func (*ProtoEnvironmentVariable) ProtoMessage() {} func (x *ProtoEnvironmentVariable) ProtoReflect() protoreflect.Message { mi := &file_environment_variables_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -121,20 +119,6 @@ func file_environment_variables_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_environment_variables_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEnvironmentVariable); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index ec1a0c8d..24668e81 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index 0784f7d0..7ef36a9e 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: error.proto package models @@ -146,11 +146,9 @@ type ProtoError struct { func (x *ProtoError) Reset() { *x = ProtoError{} - if protoimpl.UnsafeEnabled { - mi := &file_error_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_error_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoError) String() string { @@ -161,7 +159,7 @@ func (*ProtoError) ProtoMessage() {} func (x *ProtoError) ProtoReflect() protoreflect.Message { mi := &file_error_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -278,20 +276,6 @@ func file_error_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_error_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoError); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 6929ec9e..a8851201 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index cdf48653..58fd01b3 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: evacuation.proto package models @@ -31,11 +31,9 @@ type ProtoEvacuationResponse struct { func (x *ProtoEvacuationResponse) Reset() { *x = ProtoEvacuationResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_evacuation_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_evacuation_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEvacuationResponse) String() string { @@ -46,7 +44,7 @@ func (*ProtoEvacuationResponse) ProtoMessage() {} func (x *ProtoEvacuationResponse) ProtoReflect() protoreflect.Message { mi := &file_evacuation_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -86,11 +84,9 @@ type ProtoEvacuateClaimedActualLRPRequest struct { func (x *ProtoEvacuateClaimedActualLRPRequest) Reset() { *x = ProtoEvacuateClaimedActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_evacuation_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_evacuation_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEvacuateClaimedActualLRPRequest) String() string { @@ -101,7 +97,7 @@ func (*ProtoEvacuateClaimedActualLRPRequest) ProtoMessage() {} func (x *ProtoEvacuateClaimedActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_evacuation_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -146,11 +142,9 @@ type ProtoEvacuateRunningActualLRPRequest struct { func (x *ProtoEvacuateRunningActualLRPRequest) Reset() { *x = ProtoEvacuateRunningActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_evacuation_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_evacuation_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEvacuateRunningActualLRPRequest) String() string { @@ -161,7 +155,7 @@ func (*ProtoEvacuateRunningActualLRPRequest) ProtoMessage() {} func (x *ProtoEvacuateRunningActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_evacuation_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -236,11 +230,9 @@ type ProtoEvacuateStoppedActualLRPRequest struct { func (x *ProtoEvacuateStoppedActualLRPRequest) Reset() { *x = ProtoEvacuateStoppedActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_evacuation_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_evacuation_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEvacuateStoppedActualLRPRequest) String() string { @@ -251,7 +243,7 @@ func (*ProtoEvacuateStoppedActualLRPRequest) ProtoMessage() {} func (x *ProtoEvacuateStoppedActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_evacuation_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -292,11 +284,9 @@ type ProtoEvacuateCrashedActualLRPRequest struct { func (x *ProtoEvacuateCrashedActualLRPRequest) Reset() { *x = ProtoEvacuateCrashedActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_evacuation_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_evacuation_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEvacuateCrashedActualLRPRequest) String() string { @@ -307,7 +297,7 @@ func (*ProtoEvacuateCrashedActualLRPRequest) ProtoMessage() {} func (x *ProtoEvacuateCrashedActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_evacuation_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -354,11 +344,9 @@ type ProtoRemoveEvacuatingActualLRPRequest struct { func (x *ProtoRemoveEvacuatingActualLRPRequest) Reset() { *x = ProtoRemoveEvacuatingActualLRPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_evacuation_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_evacuation_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRemoveEvacuatingActualLRPRequest) String() string { @@ -369,7 +357,7 @@ func (*ProtoRemoveEvacuatingActualLRPRequest) ProtoMessage() {} func (x *ProtoRemoveEvacuatingActualLRPRequest) ProtoReflect() protoreflect.Message { mi := &file_evacuation_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -408,11 +396,9 @@ type ProtoRemoveEvacuatingActualLRPResponse struct { func (x *ProtoRemoveEvacuatingActualLRPResponse) Reset() { *x = ProtoRemoveEvacuatingActualLRPResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_evacuation_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_evacuation_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRemoveEvacuatingActualLRPResponse) String() string { @@ -423,7 +409,7 @@ func (*ProtoRemoveEvacuatingActualLRPResponse) ProtoMessage() {} func (x *ProtoRemoveEvacuatingActualLRPResponse) ProtoReflect() protoreflect.Message { mi := &file_evacuation_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -622,92 +608,6 @@ func file_evacuation_proto_init() { file_bbs_proto_init() file_actual_lrp_proto_init() file_error_proto_init() - if !protoimpl.UnsafeEnabled { - file_evacuation_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEvacuationResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_evacuation_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEvacuateClaimedActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_evacuation_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEvacuateRunningActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_evacuation_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEvacuateStoppedActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_evacuation_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEvacuateCrashedActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_evacuation_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRemoveEvacuatingActualLRPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_evacuation_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRemoveEvacuatingActualLRPResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_evacuation_proto_msgTypes[2].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 180a0143..0a6b6272 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index 92e91545..36b8ed71 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: events.proto package models @@ -31,11 +31,9 @@ type ProtoActualLRPCreatedEvent struct { func (x *ProtoActualLRPCreatedEvent) Reset() { *x = ProtoActualLRPCreatedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPCreatedEvent) String() string { @@ -46,7 +44,7 @@ func (*ProtoActualLRPCreatedEvent) ProtoMessage() {} func (x *ProtoActualLRPCreatedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -80,11 +78,9 @@ type ProtoActualLRPChangedEvent struct { func (x *ProtoActualLRPChangedEvent) Reset() { *x = ProtoActualLRPChangedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPChangedEvent) String() string { @@ -95,7 +91,7 @@ func (*ProtoActualLRPChangedEvent) ProtoMessage() {} func (x *ProtoActualLRPChangedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -135,11 +131,9 @@ type ProtoActualLRPRemovedEvent struct { func (x *ProtoActualLRPRemovedEvent) Reset() { *x = ProtoActualLRPRemovedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPRemovedEvent) String() string { @@ -150,7 +144,7 @@ func (*ProtoActualLRPRemovedEvent) ProtoMessage() {} func (x *ProtoActualLRPRemovedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -183,11 +177,9 @@ type ProtoActualLRPInstanceCreatedEvent struct { func (x *ProtoActualLRPInstanceCreatedEvent) Reset() { *x = ProtoActualLRPInstanceCreatedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPInstanceCreatedEvent) String() string { @@ -198,7 +190,7 @@ func (*ProtoActualLRPInstanceCreatedEvent) ProtoMessage() {} func (x *ProtoActualLRPInstanceCreatedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -246,11 +238,9 @@ type ProtoActualLRPInfo struct { func (x *ProtoActualLRPInfo) Reset() { *x = ProtoActualLRPInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPInfo) String() string { @@ -261,7 +251,7 @@ func (*ProtoActualLRPInfo) ProtoMessage() {} func (x *ProtoActualLRPInfo) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -360,11 +350,9 @@ type ProtoActualLRPInstanceChangedEvent struct { func (x *ProtoActualLRPInstanceChangedEvent) Reset() { *x = ProtoActualLRPInstanceChangedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPInstanceChangedEvent) String() string { @@ -375,7 +363,7 @@ func (*ProtoActualLRPInstanceChangedEvent) ProtoMessage() {} func (x *ProtoActualLRPInstanceChangedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -436,11 +424,9 @@ type ProtoActualLRPInstanceRemovedEvent struct { func (x *ProtoActualLRPInstanceRemovedEvent) Reset() { *x = ProtoActualLRPInstanceRemovedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPInstanceRemovedEvent) String() string { @@ -451,7 +437,7 @@ func (*ProtoActualLRPInstanceRemovedEvent) ProtoMessage() {} func (x *ProtoActualLRPInstanceRemovedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -491,11 +477,9 @@ type ProtoDesiredLRPCreatedEvent struct { func (x *ProtoDesiredLRPCreatedEvent) Reset() { *x = ProtoDesiredLRPCreatedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPCreatedEvent) String() string { @@ -506,7 +490,7 @@ func (*ProtoDesiredLRPCreatedEvent) ProtoMessage() {} func (x *ProtoDesiredLRPCreatedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -547,11 +531,9 @@ type ProtoDesiredLRPChangedEvent struct { func (x *ProtoDesiredLRPChangedEvent) Reset() { *x = ProtoDesiredLRPChangedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPChangedEvent) String() string { @@ -562,7 +544,7 @@ func (*ProtoDesiredLRPChangedEvent) ProtoMessage() {} func (x *ProtoDesiredLRPChangedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -609,11 +591,9 @@ type ProtoDesiredLRPRemovedEvent struct { func (x *ProtoDesiredLRPRemovedEvent) Reset() { *x = ProtoDesiredLRPRemovedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesiredLRPRemovedEvent) String() string { @@ -624,7 +604,7 @@ func (*ProtoDesiredLRPRemovedEvent) ProtoMessage() {} func (x *ProtoDesiredLRPRemovedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -667,11 +647,9 @@ type ProtoActualLRPCrashedEvent struct { func (x *ProtoActualLRPCrashedEvent) Reset() { *x = ProtoActualLRPCrashedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoActualLRPCrashedEvent) String() string { @@ -682,7 +660,7 @@ func (*ProtoActualLRPCrashedEvent) ProtoMessage() {} func (x *ProtoActualLRPCrashedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -742,11 +720,9 @@ type ProtoEventsByCellId struct { func (x *ProtoEventsByCellId) Reset() { *x = ProtoEventsByCellId{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoEventsByCellId) String() string { @@ -757,7 +733,7 @@ func (*ProtoEventsByCellId) ProtoMessage() {} func (x *ProtoEventsByCellId) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -789,11 +765,9 @@ type ProtoTaskCreatedEvent struct { func (x *ProtoTaskCreatedEvent) Reset() { *x = ProtoTaskCreatedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskCreatedEvent) String() string { @@ -804,7 +778,7 @@ func (*ProtoTaskCreatedEvent) ProtoMessage() {} func (x *ProtoTaskCreatedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -837,11 +811,9 @@ type ProtoTaskChangedEvent struct { func (x *ProtoTaskChangedEvent) Reset() { *x = ProtoTaskChangedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskChangedEvent) String() string { @@ -852,7 +824,7 @@ func (*ProtoTaskChangedEvent) ProtoMessage() {} func (x *ProtoTaskChangedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -891,11 +863,9 @@ type ProtoTaskRemovedEvent struct { func (x *ProtoTaskRemovedEvent) Reset() { *x = ProtoTaskRemovedEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskRemovedEvent) String() string { @@ -906,7 +876,7 @@ func (*ProtoTaskRemovedEvent) ProtoMessage() {} func (x *ProtoTaskRemovedEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -938,11 +908,9 @@ type ProtoFakeEvent struct { func (x *ProtoFakeEvent) Reset() { *x = ProtoFakeEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_events_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_events_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoFakeEvent) String() string { @@ -953,7 +921,7 @@ func (*ProtoFakeEvent) ProtoMessage() {} func (x *ProtoFakeEvent) ProtoReflect() protoreflect.Message { mi := &file_events_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1229,200 +1197,6 @@ func file_events_proto_init() { file_desired_lrp_proto_init() file_task_proto_init() file_modification_tag_proto_init() - if !protoimpl.UnsafeEnabled { - file_events_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPCreatedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPChangedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPRemovedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPInstanceCreatedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPInstanceChangedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPInstanceRemovedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPCreatedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPChangedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesiredLRPRemovedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*ProtoActualLRPCrashedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[11].Exporter = func(v any, i int) any { - switch v := v.(*ProtoEventsByCellId); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[12].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskCreatedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[13].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskChangedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[14].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskRemovedEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_events_proto_msgTypes[15].Exporter = func(v any, i int) any { - switch v := v.(*ProtoFakeEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_events_proto_msgTypes[4].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 7978c797..12c5d6a5 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: events.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 97be31c2..9a5a8eb0 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: image_layer.proto package models @@ -187,11 +187,9 @@ type ProtoImageLayer struct { func (x *ProtoImageLayer) Reset() { *x = ProtoImageLayer{} - if protoimpl.UnsafeEnabled { - mi := &file_image_layer_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_image_layer_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoImageLayer) String() string { @@ -202,7 +200,7 @@ func (*ProtoImageLayer) ProtoMessage() {} func (x *ProtoImageLayer) ProtoReflect() protoreflect.Message { mi := &file_image_layer_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -358,20 +356,6 @@ func file_image_layer_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_image_layer_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoImageLayer); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 028744cf..d02db90a 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index df5f6fda..15ada17e 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: log_rate_limit.proto package models @@ -30,11 +30,9 @@ type ProtoLogRateLimit struct { func (x *ProtoLogRateLimit) Reset() { *x = ProtoLogRateLimit{} - if protoimpl.UnsafeEnabled { - mi := &file_log_rate_limit_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_log_rate_limit_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoLogRateLimit) String() string { @@ -45,7 +43,7 @@ func (*ProtoLogRateLimit) ProtoMessage() {} func (x *ProtoLogRateLimit) ProtoReflect() protoreflect.Message { mi := &file_log_rate_limit_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -110,20 +108,6 @@ func file_log_rate_limit_proto_init() { if File_log_rate_limit_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_log_rate_limit_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoLogRateLimit); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 053b89dd..ef8cccef 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index de1b9385..e7f43e64 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: metric_tags.proto package models @@ -82,11 +82,9 @@ type ProtoMetricTagValue struct { func (x *ProtoMetricTagValue) Reset() { *x = ProtoMetricTagValue{} - if protoimpl.UnsafeEnabled { - mi := &file_metric_tags_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_metric_tags_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoMetricTagValue) String() string { @@ -97,7 +95,7 @@ func (*ProtoMetricTagValue) ProtoMessage() {} func (x *ProtoMetricTagValue) ProtoReflect() protoreflect.Message { mi := &file_metric_tags_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -186,20 +184,6 @@ func file_metric_tags_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_metric_tags_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoMetricTagValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index c083ef92..e48995c2 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 402343d5..0008c776 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: modification_tag.proto package models @@ -31,11 +31,9 @@ type ProtoModificationTag struct { func (x *ProtoModificationTag) Reset() { *x = ProtoModificationTag{} - if protoimpl.UnsafeEnabled { - mi := &file_modification_tag_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_modification_tag_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoModificationTag) String() string { @@ -46,7 +44,7 @@ func (*ProtoModificationTag) ProtoMessage() {} func (x *ProtoModificationTag) ProtoReflect() protoreflect.Message { mi := &file_modification_tag_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -121,20 +119,6 @@ func file_modification_tag_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_modification_tag_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoModificationTag); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 80befb5d..4579e1b9 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index e1cc5e06..fce94d1e 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: network.proto package models @@ -30,11 +30,9 @@ type ProtoNetwork struct { func (x *ProtoNetwork) Reset() { *x = ProtoNetwork{} - if protoimpl.UnsafeEnabled { - mi := &file_network_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_network_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoNetwork) String() string { @@ -45,7 +43,7 @@ func (*ProtoNetwork) ProtoMessage() {} func (x *ProtoNetwork) ProtoReflect() protoreflect.Message { mi := &file_network_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -117,20 +115,6 @@ func file_network_proto_init() { if File_network_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_network_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoNetwork); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 4666c596..00c42fa4 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index cdc8d57f..d5aaba8a 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: ping.proto package models @@ -30,11 +30,9 @@ type ProtoPingResponse struct { func (x *ProtoPingResponse) Reset() { *x = ProtoPingResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_ping_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_ping_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoPingResponse) String() string { @@ -45,7 +43,7 @@ func (*ProtoPingResponse) ProtoMessage() {} func (x *ProtoPingResponse) ProtoReflect() protoreflect.Message { mi := &file_ping_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -111,20 +109,6 @@ func file_ping_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_ping_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoPingResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index f9cee815..68f97ed2 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index 7ac046b5..ddee71e2 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: security_group.proto package models @@ -31,11 +31,9 @@ type ProtoPortRange struct { func (x *ProtoPortRange) Reset() { *x = ProtoPortRange{} - if protoimpl.UnsafeEnabled { - mi := &file_security_group_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_security_group_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoPortRange) String() string { @@ -46,7 +44,7 @@ func (*ProtoPortRange) ProtoMessage() {} func (x *ProtoPortRange) ProtoReflect() protoreflect.Message { mi := &file_security_group_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -86,11 +84,9 @@ type ProtoICMPInfo struct { func (x *ProtoICMPInfo) Reset() { *x = ProtoICMPInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_security_group_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_security_group_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoICMPInfo) String() string { @@ -101,7 +97,7 @@ func (*ProtoICMPInfo) ProtoMessage() {} func (x *ProtoICMPInfo) ProtoReflect() protoreflect.Message { mi := &file_security_group_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -146,11 +142,9 @@ type ProtoSecurityGroupRule struct { func (x *ProtoSecurityGroupRule) Reset() { *x = ProtoSecurityGroupRule{} - if protoimpl.UnsafeEnabled { - mi := &file_security_group_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_security_group_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoSecurityGroupRule) String() string { @@ -161,7 +155,7 @@ func (*ProtoSecurityGroupRule) ProtoMessage() {} func (x *ProtoSecurityGroupRule) ProtoReflect() protoreflect.Message { mi := &file_security_group_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -296,44 +290,6 @@ func file_security_group_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_security_group_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoPortRange); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_security_group_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoICMPInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_security_group_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoSecurityGroupRule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 1dc7fa47..e275a76b 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 3c413e29..294afbbb 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: sidecar.proto package models @@ -32,11 +32,9 @@ type ProtoSidecar struct { func (x *ProtoSidecar) Reset() { *x = ProtoSidecar{} - if protoimpl.UnsafeEnabled { - mi := &file_sidecar_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_sidecar_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoSidecar) String() string { @@ -47,7 +45,7 @@ func (*ProtoSidecar) ProtoMessage() {} func (x *ProtoSidecar) ProtoReflect() protoreflect.Message { mi := &file_sidecar_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -135,20 +133,6 @@ func file_sidecar_proto_init() { } file_bbs_proto_init() file_actions_proto_init() - if !protoimpl.UnsafeEnabled { - file_sidecar_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoSidecar); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 67823325..aeeccc2c 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index a3af2c30..da768e2b 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: task.proto package models @@ -112,11 +112,9 @@ type ProtoTaskDefinition struct { func (x *ProtoTaskDefinition) Reset() { *x = ProtoTaskDefinition{} - if protoimpl.UnsafeEnabled { - mi := &file_task_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskDefinition) String() string { @@ -127,7 +125,7 @@ func (*ProtoTaskDefinition) ProtoMessage() {} func (x *ProtoTaskDefinition) ProtoReflect() protoreflect.Message { mi := &file_task_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -354,11 +352,9 @@ type ProtoTask struct { func (x *ProtoTask) Reset() { *x = ProtoTask{} - if protoimpl.UnsafeEnabled { - mi := &file_task_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTask) String() string { @@ -369,7 +365,7 @@ func (*ProtoTask) ProtoMessage() {} func (x *ProtoTask) ProtoReflect() protoreflect.Message { mi := &file_task_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -699,32 +695,6 @@ func file_task_proto_init() { file_image_layer_proto_init() file_log_rate_limit_proto_init() file_metric_tags_proto_init() - if !protoimpl.UnsafeEnabled { - file_task_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskDefinition); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTask); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 69481e93..1d6574ff 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index 8eed514a..80703bf4 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: task_requests.proto package models @@ -30,11 +30,9 @@ type ProtoTaskLifecycleResponse struct { func (x *ProtoTaskLifecycleResponse) Reset() { *x = ProtoTaskLifecycleResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskLifecycleResponse) String() string { @@ -45,7 +43,7 @@ func (*ProtoTaskLifecycleResponse) ProtoMessage() {} func (x *ProtoTaskLifecycleResponse) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -79,11 +77,9 @@ type ProtoDesireTaskRequest struct { func (x *ProtoDesireTaskRequest) Reset() { *x = ProtoDesireTaskRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoDesireTaskRequest) String() string { @@ -94,7 +90,7 @@ func (*ProtoDesireTaskRequest) ProtoMessage() {} func (x *ProtoDesireTaskRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -141,11 +137,9 @@ type ProtoStartTaskRequest struct { func (x *ProtoStartTaskRequest) Reset() { *x = ProtoStartTaskRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoStartTaskRequest) String() string { @@ -156,7 +150,7 @@ func (*ProtoStartTaskRequest) ProtoMessage() {} func (x *ProtoStartTaskRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -196,11 +190,9 @@ type ProtoStartTaskResponse struct { func (x *ProtoStartTaskResponse) Reset() { *x = ProtoStartTaskResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoStartTaskResponse) String() string { @@ -211,7 +203,7 @@ func (*ProtoStartTaskResponse) ProtoMessage() {} func (x *ProtoStartTaskResponse) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -252,11 +244,9 @@ type ProtoFailTaskRequest struct { func (x *ProtoFailTaskRequest) Reset() { *x = ProtoFailTaskRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoFailTaskRequest) String() string { @@ -267,7 +257,7 @@ func (*ProtoFailTaskRequest) ProtoMessage() {} func (x *ProtoFailTaskRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,11 +297,9 @@ type ProtoRejectTaskRequest struct { func (x *ProtoRejectTaskRequest) Reset() { *x = ProtoRejectTaskRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoRejectTaskRequest) String() string { @@ -322,7 +310,7 @@ func (*ProtoRejectTaskRequest) ProtoMessage() {} func (x *ProtoRejectTaskRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -361,11 +349,9 @@ type ProtoTaskGuidRequest struct { func (x *ProtoTaskGuidRequest) Reset() { *x = ProtoTaskGuidRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskGuidRequest) String() string { @@ -376,7 +362,7 @@ func (*ProtoTaskGuidRequest) ProtoMessage() {} func (x *ProtoTaskGuidRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -412,11 +398,9 @@ type ProtoCompleteTaskRequest struct { func (x *ProtoCompleteTaskRequest) Reset() { *x = ProtoCompleteTaskRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoCompleteTaskRequest) String() string { @@ -427,7 +411,7 @@ func (*ProtoCompleteTaskRequest) ProtoMessage() {} func (x *ProtoCompleteTaskRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -492,11 +476,9 @@ type ProtoTaskCallbackResponse struct { func (x *ProtoTaskCallbackResponse) Reset() { *x = ProtoTaskCallbackResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskCallbackResponse) String() string { @@ -507,7 +489,7 @@ func (*ProtoTaskCallbackResponse) ProtoMessage() {} func (x *ProtoTaskCallbackResponse) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -575,11 +557,9 @@ type ProtoTasksRequest struct { func (x *ProtoTasksRequest) Reset() { *x = ProtoTasksRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTasksRequest) String() string { @@ -590,7 +570,7 @@ func (*ProtoTasksRequest) ProtoMessage() {} func (x *ProtoTasksRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -630,11 +610,9 @@ type ProtoTasksResponse struct { func (x *ProtoTasksResponse) Reset() { *x = ProtoTasksResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTasksResponse) String() string { @@ -645,7 +623,7 @@ func (*ProtoTasksResponse) ProtoMessage() {} func (x *ProtoTasksResponse) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -684,11 +662,9 @@ type ProtoTaskByGuidRequest struct { func (x *ProtoTaskByGuidRequest) Reset() { *x = ProtoTaskByGuidRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskByGuidRequest) String() string { @@ -699,7 +675,7 @@ func (*ProtoTaskByGuidRequest) ProtoMessage() {} func (x *ProtoTaskByGuidRequest) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -732,11 +708,9 @@ type ProtoTaskResponse struct { func (x *ProtoTaskResponse) Reset() { *x = ProtoTaskResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_task_requests_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_task_requests_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoTaskResponse) String() string { @@ -747,7 +721,7 @@ func (*ProtoTaskResponse) ProtoMessage() {} func (x *ProtoTaskResponse) ProtoReflect() protoreflect.Message { mi := &file_task_requests_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -936,164 +910,6 @@ func file_task_requests_proto_init() { file_bbs_proto_init() file_task_proto_init() file_error_proto_init() - if !protoimpl.UnsafeEnabled { - file_task_requests_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskLifecycleResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoDesireTaskRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoStartTaskRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*ProtoStartTaskResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*ProtoFailTaskRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*ProtoRejectTaskRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskGuidRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*ProtoCompleteTaskRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskCallbackResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTasksRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTasksResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[11].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskByGuidRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_task_requests_proto_msgTypes[12].Exporter = func(v any, i int) any { - switch v := v.(*ProtoTaskResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index f3eae29c..92e71a97 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 556ac2ba..c8d21fc9 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: volume_mount.proto package models @@ -31,11 +31,9 @@ type ProtoSharedDevice struct { func (x *ProtoSharedDevice) Reset() { *x = ProtoSharedDevice{} - if protoimpl.UnsafeEnabled { - mi := &file_volume_mount_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_volume_mount_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoSharedDevice) String() string { @@ -46,7 +44,7 @@ func (*ProtoSharedDevice) ProtoMessage() {} func (x *ProtoSharedDevice) ProtoReflect() protoreflect.Message { mi := &file_volume_mount_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -89,11 +87,9 @@ type ProtoVolumeMount struct { func (x *ProtoVolumeMount) Reset() { *x = ProtoVolumeMount{} - if protoimpl.UnsafeEnabled { - mi := &file_volume_mount_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_volume_mount_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoVolumeMount) String() string { @@ -104,7 +100,7 @@ func (*ProtoVolumeMount) ProtoMessage() {} func (x *ProtoVolumeMount) ProtoReflect() protoreflect.Message { mi := &file_volume_mount_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -157,11 +153,9 @@ type ProtoVolumePlacement struct { func (x *ProtoVolumePlacement) Reset() { *x = ProtoVolumePlacement{} - if protoimpl.UnsafeEnabled { - mi := &file_volume_mount_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_volume_mount_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtoVolumePlacement) String() string { @@ -172,7 +166,7 @@ func (*ProtoVolumePlacement) ProtoMessage() {} func (x *ProtoVolumePlacement) ProtoReflect() protoreflect.Message { mi := &file_volume_mount_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -260,44 +254,6 @@ func file_volume_mount_proto_init() { return } file_bbs_proto_init() - if !protoimpl.UnsafeEnabled { - file_volume_mount_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*ProtoSharedDevice); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_volume_mount_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ProtoVolumeMount); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_volume_mount_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*ProtoVolumePlacement); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index f68d09af..681ffbe7 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.0 +// - protoc v5.28.2 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 0a7cdfab..0d64493b 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v5.28.0 +// protoc-gen-go v1.35.1 +// protoc v5.28.2 // source: bbs.proto package main diff --git a/serviceclient/service_client.go b/serviceclient/service_client.go index 3d968add..8b1106a4 100644 --- a/serviceclient/service_client.go +++ b/serviceclient/service_client.go @@ -39,7 +39,7 @@ func (s *serviceClient) Cells(logger lager.Logger) (models.CellSet, error) { var cellSet = models.CellSet{} - resp, err := s.locketClient.FetchAll(context.Background(), &locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.PRESENCE}) + resp, err := s.locketClient.FetchAll(context.Background(), &locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.TypeCode_PRESENCE}) if err != nil { logger.Error("failed-to-fetch-cells-from-locket", err) return nil, err diff --git a/serviceclient/service_client_test.go b/serviceclient/service_client_test.go index e1a66c5f..d3f7f820 100644 --- a/serviceclient/service_client_test.go +++ b/serviceclient/service_client_test.go @@ -80,7 +80,7 @@ var _ = Describe("ServiceClient", func() { Expect(locketClient.FetchAllCallCount()).To(Equal(1)) _, request, _ := locketClient.FetchAllArgsForCall(0) - Expect(request).To(Equal(&locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.PRESENCE})) + Expect(request).To(Equal(&locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.TypeCode_PRESENCE})) }) Context("when fetching the cells from the locket client fails", func() { diff --git a/test_helpers/locket_helper.go b/test_helpers/locket_helper.go index c1b786dd..f8470720 100644 --- a/test_helpers/locket_helper.go +++ b/test_helpers/locket_helper.go @@ -27,7 +27,7 @@ func (h *LocketHelper) RegisterCell(cell *models.CellPresence) { Key: "bbs", Owner: "test_helpers", Value: "Something", - TypeCode: locketmodels.LOCK, + TypeCode: locketmodels.TypeCode_LOCK, } // Use NewLockRunner instead of NewPresence in order to block on the cell being registered runner := lock.NewLockRunner(h.logger, h.LocketClient, locketIdentifier, locket.DefaultSessionTTLInSeconds, clock.NewClock(), locket.RetryInterval) From cc0e5c84354cceaf7551eff960987023c688b2e3 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 16 Oct 2024 20:34:49 +0000 Subject: [PATCH 127/155] Need to send a proto.Message to newTestRequest From 8429185e72f7f93cb7021582282908d68a412046 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 16 Oct 2024 20:53:20 +0000 Subject: [PATCH 128/155] Remove extra JustBeforeEach Regen protos --- handlers/desired_lrp_handlers_test.go | 8 -- models/actions.pb.go | 129 ++++++++++------------ models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 71 ++++++------- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 122 ++++++++++----------- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 4 +- models/cached_dependency.pb.go | 25 +++-- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 56 +++++----- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 13 ++- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 56 +++++----- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 98 ++++++++--------- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 82 +++++++------- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 29 +++-- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 13 ++- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 13 ++- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 57 +++++----- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 136 +++++++++++------------- models/events_bbs.pb.go | 2 +- models/image_layer.pb.go | 11 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 13 ++- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 15 ++- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 13 ++- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 11 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 11 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 41 ++++--- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 15 ++- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 46 ++++---- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 135 +++++++++++------------ models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 35 +++--- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 4 +- 53 files changed, 595 insertions(+), 717 deletions(-) diff --git a/handlers/desired_lrp_handlers_test.go b/handlers/desired_lrp_handlers_test.go index 865a87ec..84ee6d3e 100644 --- a/handlers/desired_lrp_handlers_test.go +++ b/handlers/desired_lrp_handlers_test.go @@ -1269,14 +1269,6 @@ var _ = Describe("DesiredLRP Handlers", func() { requestBody *models.UpdateDesiredLRPRequest ) - JustBeforeEach(func() { - protoRequestBody := requestBody.ToProto() - request := newTestRequest(protoRequestBody) - request.Header.Set(lager.RequestIdHeader, requestIdHeader) - handler.UpdateDesiredLRP(logger, responseRecorder, request) - time.Sleep(100 * time.Millisecond) - }) - BeforeEach(func() { processGuid = "some-guid" someText := "some-text" diff --git a/models/actions.pb.go b/models/actions.pb.go index 2d3fd613..29771f26 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: actions.proto package models @@ -21,10 +21,7 @@ const ( ) type ProtoAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Note: we only expect one of the following set of fields to be // set. Previously we used `option (gogoproto.onlyone) = true' but since this // is now deprecated and oneof introduces a lot of structural changes, we @@ -45,6 +42,8 @@ type ProtoAction struct { ParallelAction *ProtoParallelAction `protobuf:"bytes,7,opt,name=parallel_action,json=parallel,proto3" json:"parallel_action,omitempty"` SerialAction *ProtoSerialAction `protobuf:"bytes,8,opt,name=serial_action,json=serial,proto3" json:"serial_action,omitempty"` CodependentAction *ProtoCodependentAction `protobuf:"bytes,9,opt,name=codependent_action,json=codependent,proto3" json:"codependent_action,omitempty"` // } + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoAction) Reset() { @@ -141,18 +140,17 @@ func (x *ProtoAction) GetCodependentAction() *ProtoCodependentAction { } type ProtoDownloadAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` - CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` - User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` - ChecksumAlgorithm string `protobuf:"bytes,7,opt,name=checksum_algorithm,proto3" json:"checksum_algorithm,omitempty"` - ChecksumValue string `protobuf:"bytes,8,opt,name=checksum_value,proto3" json:"checksum_value,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` + User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` + ChecksumAlgorithm string `protobuf:"bytes,7,opt,name=checksum_algorithm,proto3" json:"checksum_algorithm,omitempty"` + ChecksumValue string `protobuf:"bytes,8,opt,name=checksum_value,proto3" json:"checksum_value,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoDownloadAction) Reset() { @@ -242,15 +240,14 @@ func (x *ProtoDownloadAction) GetChecksumValue() string { } type ProtoUploadAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + LogSource string `protobuf:"bytes,4,opt,name=log_source,proto3" json:"log_source,omitempty"` + User string `protobuf:"bytes,5,opt,name=user,proto3" json:"user,omitempty"` unknownFields protoimpl.UnknownFields - - Artifact string `protobuf:"bytes,1,opt,name=artifact,proto3" json:"artifact,omitempty"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` - LogSource string `protobuf:"bytes,4,opt,name=log_source,proto3" json:"log_source,omitempty"` - User string `protobuf:"bytes,5,opt,name=user,proto3" json:"user,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoUploadAction) Reset() { @@ -319,10 +316,7 @@ func (x *ProtoUploadAction) GetUser() string { } type ProtoRunAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` Dir string `protobuf:"bytes,3,opt,name=dir,proto3" json:"dir,omitempty"` @@ -331,6 +325,8 @@ type ProtoRunAction struct { User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user,omitempty"` LogSource string `protobuf:"bytes,7,opt,name=log_source,proto3" json:"log_source,omitempty"` SuppressLogOutput bool `protobuf:"varint,8,opt,name=suppress_log_output,proto3" json:"suppress_log_output,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoRunAction) Reset() { @@ -420,15 +416,14 @@ func (x *ProtoRunAction) GetSuppressLogOutput() bool { } type ProtoTimeoutAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` // Deprecated: Marked as deprecated in actions.proto. DeprecatedTimeoutNs int64 `protobuf:"varint,2,opt,name=deprecated_timeout_ns,json=timeout,proto3" json:"deprecated_timeout_ns,omitempty"` LogSource string `protobuf:"bytes,3,opt,name=log_source,proto3" json:"log_source,omitempty"` TimeoutMs int64 `protobuf:"varint,4,opt,name=timeout_ms,proto3" json:"timeout_ms,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoTimeoutAction) Reset() { @@ -491,15 +486,14 @@ func (x *ProtoTimeoutAction) GetTimeoutMs() int64 { } type ProtoEmitProgressAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - StartMessage string `protobuf:"bytes,2,opt,name=start_message,proto3" json:"start_message,omitempty"` - SuccessMessage string `protobuf:"bytes,3,opt,name=success_message,proto3" json:"success_message,omitempty"` - FailureMessagePrefix string `protobuf:"bytes,4,opt,name=failure_message_prefix,proto3" json:"failure_message_prefix,omitempty"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + StartMessage string `protobuf:"bytes,2,opt,name=start_message,proto3" json:"start_message,omitempty"` + SuccessMessage string `protobuf:"bytes,3,opt,name=success_message,proto3" json:"success_message,omitempty"` + FailureMessagePrefix string `protobuf:"bytes,4,opt,name=failure_message_prefix,proto3" json:"failure_message_prefix,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoEmitProgressAction) Reset() { @@ -568,12 +562,11 @@ func (x *ProtoEmitProgressAction) GetLogSource() string { } type ProtoTryAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` unknownFields protoimpl.UnknownFields - - Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTryAction) Reset() { @@ -621,12 +614,11 @@ func (x *ProtoTryAction) GetLogSource() string { } type ProtoParallelAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` unknownFields protoimpl.UnknownFields - - Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoParallelAction) Reset() { @@ -674,12 +666,11 @@ func (x *ProtoParallelAction) GetLogSource() string { } type ProtoSerialAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` unknownFields protoimpl.UnknownFields - - Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoSerialAction) Reset() { @@ -727,12 +718,11 @@ func (x *ProtoSerialAction) GetLogSource() string { } type ProtoCodependentAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` unknownFields protoimpl.UnknownFields - - Actions []*ProtoAction `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoCodependentAction) Reset() { @@ -780,13 +770,12 @@ func (x *ProtoCodependentAction) GetLogSource() string { } type ProtoResourceLimits struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Nofile *uint64 `protobuf:"varint,1,opt,name=nofile,proto3,oneof" json:"nofile,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Nofile *uint64 `protobuf:"varint,1,opt,name=nofile,proto3,oneof" json:"nofile,omitempty"` // Deprecated: Marked as deprecated in actions.proto. - Nproc *uint64 `protobuf:"varint,2,opt,name=nproc,proto3,oneof" json:"nproc,omitempty"` + Nproc *uint64 `protobuf:"varint,2,opt,name=nproc,proto3,oneof" json:"nproc,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoResourceLimits) Reset() { diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index e560ad47..65130fc5 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 6199ff0c..08c9004f 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: actual_lrp.proto package models @@ -120,12 +120,11 @@ func (ProtoActualLRP_Presence) EnumDescriptor() ([]byte, []int) { // Deprecated: Marked as deprecated in actual_lrp.proto. type ProtoActualLRPGroup struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Instance *ProtoActualLRP `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"` + Evacuating *ProtoActualLRP `protobuf:"bytes,2,opt,name=evacuating,proto3" json:"evacuating,omitempty"` unknownFields protoimpl.UnknownFields - - Instance *ProtoActualLRP `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"` - Evacuating *ProtoActualLRP `protobuf:"bytes,2,opt,name=evacuating,proto3" json:"evacuating,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPGroup) Reset() { @@ -173,14 +172,13 @@ func (x *ProtoActualLRPGroup) GetEvacuating() *ProtoActualLRP { } type ProtoPortMapping struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ContainerPort uint32 `protobuf:"varint,1,opt,name=container_port,proto3" json:"container_port,omitempty"` - HostPort uint32 `protobuf:"varint,2,opt,name=host_port,proto3" json:"host_port,omitempty"` - ContainerTlsProxyPort uint32 `protobuf:"varint,3,opt,name=container_tls_proxy_port,proto3" json:"container_tls_proxy_port,omitempty"` - HostTlsProxyPort uint32 `protobuf:"varint,4,opt,name=host_tls_proxy_port,proto3" json:"host_tls_proxy_port,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ContainerPort uint32 `protobuf:"varint,1,opt,name=container_port,proto3" json:"container_port,omitempty"` + HostPort uint32 `protobuf:"varint,2,opt,name=host_port,proto3" json:"host_port,omitempty"` + ContainerTlsProxyPort uint32 `protobuf:"varint,3,opt,name=container_tls_proxy_port,proto3" json:"container_tls_proxy_port,omitempty"` + HostTlsProxyPort uint32 `protobuf:"varint,4,opt,name=host_tls_proxy_port,proto3" json:"host_tls_proxy_port,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoPortMapping) Reset() { @@ -242,13 +240,12 @@ func (x *ProtoPortMapping) GetHostTlsProxyPort() uint32 { } type ProtoActualLRPKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` unknownFields protoimpl.UnknownFields - - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` - Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` - Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPKey) Reset() { @@ -303,12 +300,11 @@ func (x *ProtoActualLRPKey) GetDomain() string { } type ProtoActualLRPInstanceKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + InstanceGuid string `protobuf:"bytes,1,opt,name=instance_guid,proto3" json:"instance_guid,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` unknownFields protoimpl.UnknownFields - - InstanceGuid string `protobuf:"bytes,1,opt,name=instance_guid,proto3" json:"instance_guid,omitempty"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPInstanceKey) Reset() { @@ -356,14 +352,13 @@ func (x *ProtoActualLRPInstanceKey) GetCellId() string { } type ProtoActualLRPNetInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` Ports []*ProtoPortMapping `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty"` InstanceAddress string `protobuf:"bytes,3,opt,name=instance_address,proto3" json:"instance_address,omitempty"` PreferredAddress ProtoActualLRPNetInfo_PreferredAddress `protobuf:"varint,4,opt,name=preferred_address,proto3,enum=models.ProtoActualLRPNetInfo_PreferredAddress" json:"preferred_address,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPNetInfo) Reset() { @@ -425,11 +420,10 @@ func (x *ProtoActualLRPNetInfo) GetPreferredAddress() ProtoActualLRPNetInfo_Pref } type ProtoActualLRPInternalRoute struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Hostname string `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"` unknownFields protoimpl.UnknownFields - - Hostname string `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPInternalRoute) Reset() { @@ -470,10 +464,7 @@ func (x *ProtoActualLRPInternalRoute) GetHostname() string { } type ProtoActualLRP struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,json=actualLrpKey,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,json=actualLrpInstanceKey,proto3" json:"actual_lrp_instance_key,omitempty"` ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,json=actualLrpNetInfo,proto3" json:"actual_lrp_net_info,omitempty"` @@ -485,9 +476,11 @@ type ProtoActualLRP struct { ModificationTag *ProtoModificationTag `protobuf:"bytes,9,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` Presence ProtoActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ProtoActualLRP_Presence" json:"presence,omitempty"` ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,11,rep,name=actual_lrp_internal_routes,json=actualLrpInternalRoutes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,12,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricTags map[string]string `protobuf:"bytes,12,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Routable *bool `protobuf:"varint,13,opt,name=routable,proto3,oneof" json:"routable,omitempty"` AvailabilityZone string `protobuf:"bytes,14,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRP) Reset() { diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 839898cd..4e77848d 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 2547d599..770ac934 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: actual_lrp_requests.proto package models @@ -21,11 +21,10 @@ const ( ) type ProtoActualLRPLifecycleResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPLifecycleResponse) Reset() { @@ -67,12 +66,11 @@ func (x *ProtoActualLRPLifecycleResponse) GetError() *ProtoError { // Deprecated: Marked as deprecated in actual_lrp_requests.proto. type ProtoActualLRPGroupsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` ActualLrpGroups []*ProtoActualLRPGroup `protobuf:"bytes,2,rep,name=actual_lrp_groups,proto3" json:"actual_lrp_groups,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPGroupsResponse) Reset() { @@ -121,12 +119,11 @@ func (x *ProtoActualLRPGroupsResponse) GetActualLrpGroups() []*ProtoActualLRPGro // Deprecated: Marked as deprecated in actual_lrp_requests.proto. type ProtoActualLRPGroupResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPGroupResponse) Reset() { @@ -175,12 +172,11 @@ func (x *ProtoActualLRPGroupResponse) GetActualLrpGroup() *ProtoActualLRPGroup { // Deprecated: Marked as deprecated in actual_lrp_requests.proto. type ProtoActualLRPGroupsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` unknownFields protoimpl.UnknownFields - - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPGroupsRequest) Reset() { @@ -229,11 +225,10 @@ func (x *ProtoActualLRPGroupsRequest) GetCellId() string { // Deprecated: Marked as deprecated in actual_lrp_requests.proto. type ProtoActualLRPGroupsByProcessGuidRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` unknownFields protoimpl.UnknownFields - - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPGroupsByProcessGuidRequest) Reset() { @@ -275,12 +270,11 @@ func (x *ProtoActualLRPGroupsByProcessGuidRequest) GetProcessGuid() string { // Deprecated: Marked as deprecated in actual_lrp_requests.proto. type ProtoActualLRPGroupByProcessGuidAndIndexRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` unknownFields protoimpl.UnknownFields - - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` - Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) Reset() { @@ -328,13 +322,12 @@ func (x *ProtoActualLRPGroupByProcessGuidAndIndexRequest) GetIndex() int32 { } type ProtoClaimActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoClaimActualLRPRequest) Reset() { @@ -389,17 +382,16 @@ func (x *ProtoClaimActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPIn } type ProtoStartActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,proto3" json:"actual_lrp_net_info,omitempty"` ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,4,rep,name=actual_lrp_internal_routes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,5,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricTags map[string]string `protobuf:"bytes,5,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Routable *bool `protobuf:"varint,6,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` AvailabilityZone string `protobuf:"bytes,7,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoStartActualLRPRequest) Reset() { @@ -482,13 +474,12 @@ func (x *ProtoStartActualLRPRequest) GetAvailabilityZone() string { } type ProtoCrashActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,proto3" json:"error_message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoCrashActualLRPRequest) Reset() { @@ -543,12 +534,11 @@ func (x *ProtoCrashActualLRPRequest) GetErrorMessage() string { } type ProtoFailActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,proto3" json:"error_message,omitempty"` unknownFields protoimpl.UnknownFields - - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` - ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,proto3" json:"error_message,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoFailActualLRPRequest) Reset() { @@ -596,11 +586,10 @@ func (x *ProtoFailActualLRPRequest) GetErrorMessage() string { } type ProtoRetireActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` unknownFields protoimpl.UnknownFields - - ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoRetireActualLRPRequest) Reset() { @@ -641,13 +630,12 @@ func (x *ProtoRetireActualLRPRequest) GetActualLrpKey() *ProtoActualLRPKey { } type ProtoRemoveActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,3,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoRemoveActualLRPRequest) Reset() { @@ -702,12 +690,11 @@ func (x *ProtoRemoveActualLRPRequest) GetActualLrpInstanceKey() *ProtoActualLRPI } type ProtoActualLRPsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + ActualLrps []*ProtoActualLRP `protobuf:"bytes,2,rep,name=actual_lrps,proto3" json:"actual_lrps,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ActualLrps []*ProtoActualLRP `protobuf:"bytes,2,rep,name=actual_lrps,proto3" json:"actual_lrps,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPsResponse) Reset() { @@ -755,14 +742,13 @@ func (x *ProtoActualLRPsResponse) GetActualLrps() []*ProtoActualLRP { } type ProtoActualLRPsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + ProcessGuid string `protobuf:"bytes,3,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Index *int32 `protobuf:"varint,4,opt,name=index,proto3,oneof" json:"index,omitempty"` unknownFields protoimpl.UnknownFields - - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` - ProcessGuid string `protobuf:"bytes,3,opt,name=process_guid,proto3" json:"process_guid,omitempty"` - Index *int32 `protobuf:"varint,4,opt,name=index,proto3,oneof" json:"index,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPsRequest) Reset() { diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 3ddee97f..32fbf179 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 2d19a28b..65b523d8 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: bbs.proto package models diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index aee6699b..01e78ea6 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: cached_dependency.proto package models @@ -21,17 +21,16 @@ const ( ) type ProtoCachedDependency struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` - CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` - LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` - ChecksumAlgorithm string `protobuf:"bytes,6,opt,name=checksum_algorithm,proto3" json:"checksum_algorithm,omitempty"` - ChecksumValue string `protobuf:"bytes,7,opt,name=checksum_value,proto3" json:"checksum_value,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + CacheKey string `protobuf:"bytes,4,opt,name=cache_key,proto3" json:"cache_key,omitempty"` + LogSource string `protobuf:"bytes,5,opt,name=log_source,proto3" json:"log_source,omitempty"` + ChecksumAlgorithm string `protobuf:"bytes,6,opt,name=checksum_algorithm,proto3" json:"checksum_algorithm,omitempty"` + ChecksumValue string `protobuf:"bytes,7,opt,name=checksum_value,proto3" json:"checksum_value,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoCachedDependency) Reset() { diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index ba0daf09..dc7383a3 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index d8496c5f..1c8fa224 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: cells.proto package models @@ -21,13 +21,12 @@ const ( ) type ProtoCellCapacity struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` + DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + Containers int32 `protobuf:"varint,3,opt,name=containers,proto3" json:"containers,omitempty"` unknownFields protoimpl.UnknownFields - - MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` - DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` - Containers int32 `protobuf:"varint,3,opt,name=containers,proto3" json:"containers,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoCellCapacity) Reset() { @@ -82,18 +81,17 @@ func (x *ProtoCellCapacity) GetContainers() int32 { } type ProtoCellPresence struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - CellId string `protobuf:"bytes,1,opt,name=cell_id,proto3" json:"cell_id,omitempty"` - RepAddress string `protobuf:"bytes,2,opt,name=rep_address,proto3" json:"rep_address,omitempty"` - Zone string `protobuf:"bytes,3,opt,name=zone,proto3" json:"zone,omitempty"` - Capacity *ProtoCellCapacity `protobuf:"bytes,4,opt,name=capacity,proto3" json:"capacity,omitempty"` - RootfsProviders []*ProtoProvider `protobuf:"bytes,5,rep,name=rootfs_providers,json=rootfs_provider_list,proto3" json:"rootfs_providers,omitempty"` - PlacementTags []string `protobuf:"bytes,6,rep,name=placement_tags,proto3" json:"placement_tags,omitempty"` - OptionalPlacementTags []string `protobuf:"bytes,7,rep,name=optional_placement_tags,proto3" json:"optional_placement_tags,omitempty"` - RepUrl string `protobuf:"bytes,8,opt,name=rep_url,proto3" json:"rep_url,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + CellId string `protobuf:"bytes,1,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + RepAddress string `protobuf:"bytes,2,opt,name=rep_address,proto3" json:"rep_address,omitempty"` + Zone string `protobuf:"bytes,3,opt,name=zone,proto3" json:"zone,omitempty"` + Capacity *ProtoCellCapacity `protobuf:"bytes,4,opt,name=capacity,proto3" json:"capacity,omitempty"` + RootfsProviders []*ProtoProvider `protobuf:"bytes,5,rep,name=rootfs_providers,json=rootfs_provider_list,proto3" json:"rootfs_providers,omitempty"` + PlacementTags []string `protobuf:"bytes,6,rep,name=placement_tags,proto3" json:"placement_tags,omitempty"` + OptionalPlacementTags []string `protobuf:"bytes,7,rep,name=optional_placement_tags,proto3" json:"optional_placement_tags,omitempty"` + RepUrl string `protobuf:"bytes,8,opt,name=rep_url,proto3" json:"rep_url,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoCellPresence) Reset() { @@ -183,12 +181,11 @@ func (x *ProtoCellPresence) GetRepUrl() string { } type ProtoProvider struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Properties []string `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty"` unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Properties []string `protobuf:"bytes,2,rep,name=properties,proto3" json:"properties,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoProvider) Reset() { @@ -236,12 +233,11 @@ func (x *ProtoProvider) GetProperties() []string { } type ProtoCellsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Cells []*ProtoCellPresence `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Cells []*ProtoCellPresence `protobuf:"bytes,2,rep,name=cells,proto3" json:"cells,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoCellsResponse) Reset() { diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 2a0e6a1c..437bf91e 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 903e87c4..799fec0b 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: certificate_properties.proto package models @@ -21,11 +21,10 @@ const ( ) type ProtoCertificateProperties struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - OrganizationalUnit []string `protobuf:"bytes,1,rep,name=organizational_unit,proto3" json:"organizational_unit,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + OrganizationalUnit []string `protobuf:"bytes,1,rep,name=organizational_unit,proto3" json:"organizational_unit,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoCertificateProperties) Reset() { diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 89cd58cc..fbb21069 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index bc9f185d..43a0b3a2 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: check_definition.proto package models @@ -21,13 +21,12 @@ const ( ) type ProtoCheckDefinition struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Checks []*ProtoCheck `protobuf:"bytes,1,rep,name=checks,proto3" json:"checks,omitempty"` - LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` - ReadinessChecks []*ProtoCheck `protobuf:"bytes,3,rep,name=readiness_checks,proto3" json:"readiness_checks,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Checks []*ProtoCheck `protobuf:"bytes,1,rep,name=checks,proto3" json:"checks,omitempty"` + LogSource string `protobuf:"bytes,2,opt,name=log_source,proto3" json:"log_source,omitempty"` + ReadinessChecks []*ProtoCheck `protobuf:"bytes,3,rep,name=readiness_checks,proto3" json:"readiness_checks,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoCheckDefinition) Reset() { @@ -82,14 +81,13 @@ func (x *ProtoCheckDefinition) GetReadinessChecks() []*ProtoCheck { } type ProtoCheck struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // oneof is hard to use right now, instead we can do this check in validation // oneof check { - TcpCheck *ProtoTCPCheck `protobuf:"bytes,1,opt,name=tcp_check,proto3" json:"tcp_check,omitempty"` - HttpCheck *ProtoHTTPCheck `protobuf:"bytes,2,opt,name=http_check,proto3" json:"http_check,omitempty"` // } + TcpCheck *ProtoTCPCheck `protobuf:"bytes,1,opt,name=tcp_check,proto3" json:"tcp_check,omitempty"` + HttpCheck *ProtoHTTPCheck `protobuf:"bytes,2,opt,name=http_check,proto3" json:"http_check,omitempty"` // } + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoCheck) Reset() { @@ -137,13 +135,12 @@ func (x *ProtoCheck) GetHttpCheck() *ProtoHTTPCheck { } type ProtoTCPCheck struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` - ConnectTimeoutMs uint64 `protobuf:"varint,2,opt,name=connect_timeout_ms,proto3" json:"connect_timeout_ms,omitempty"` - IntervalMs uint64 `protobuf:"varint,3,opt,name=interval_ms,proto3" json:"interval_ms,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` + ConnectTimeoutMs uint64 `protobuf:"varint,2,opt,name=connect_timeout_ms,proto3" json:"connect_timeout_ms,omitempty"` + IntervalMs uint64 `protobuf:"varint,3,opt,name=interval_ms,proto3" json:"interval_ms,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoTCPCheck) Reset() { @@ -198,14 +195,13 @@ func (x *ProtoTCPCheck) GetIntervalMs() uint64 { } type ProtoHTTPCheck struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` - RequestTimeoutMs uint64 `protobuf:"varint,2,opt,name=request_timeout_ms,proto3" json:"request_timeout_ms,omitempty"` - Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` - IntervalMs uint64 `protobuf:"varint,4,opt,name=interval_ms,proto3" json:"interval_ms,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Port uint32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` + RequestTimeoutMs uint64 `protobuf:"varint,2,opt,name=request_timeout_ms,proto3" json:"request_timeout_ms,omitempty"` + Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` + IntervalMs uint64 `protobuf:"varint,4,opt,name=interval_ms,proto3" json:"interval_ms,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoHTTPCheck) Reset() { diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 8b16763d..15cad6d8 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 8a0c8077..b7030979 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: desired_lrp.proto package models @@ -22,10 +22,7 @@ const ( ) type ProtoDesiredLRPSchedulingInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,proto3" json:"desired_lrp_key,omitempty"` Annotation string `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation,omitempty"` Instances int32 `protobuf:"varint,3,opt,name=instances,proto3" json:"instances,omitempty"` @@ -34,6 +31,8 @@ type ProtoDesiredLRPSchedulingInfo struct { ModificationTag *ProtoModificationTag `protobuf:"bytes,6,opt,name=modification_tag,proto3" json:"modification_tag,omitempty"` VolumePlacement *ProtoVolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,proto3" json:"volume_placement,omitempty"` PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,json=placement_tags,proto3" json:"PlacementTags,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPSchedulingInfo) Reset() { @@ -123,10 +122,7 @@ func (x *ProtoDesiredLRPSchedulingInfo) GetPlacementTags() []string { } type ProtoDesiredLRPRunInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` DesiredLrpKey *ProtoDesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,proto3" json:"desired_lrp_key,omitempty"` EnvironmentVariables []*ProtoEnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=env,proto3" json:"environment_variables,omitempty"` Setup *ProtoAction `protobuf:"bytes,3,opt,name=setup,proto3" json:"setup,omitempty"` @@ -144,19 +140,22 @@ type ProtoDesiredLRPRunInfo struct { CreatedAt int64 `protobuf:"varint,13,opt,name=created_at,proto3" json:"created_at,omitempty"` CachedDependencies []*ProtoCachedDependency `protobuf:"bytes,14,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` // Deprecated: Marked as deprecated in desired_lrp.proto. - LegacyDownloadUser string `protobuf:"bytes,15,opt,name=legacy_download_user,proto3" json:"legacy_download_user,omitempty"` - TrustedSystemCertificatesPath string `protobuf:"bytes,16,opt,name=trusted_system_certificates_path,proto3" json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,17,rep,name=volume_mounts,proto3" json:"volume_mounts,omitempty"` - Network *ProtoNetwork `protobuf:"bytes,18,opt,name=network,proto3" json:"network,omitempty"` - StartTimeoutMs int64 `protobuf:"varint,19,opt,name=start_timeout_ms,proto3" json:"start_timeout_ms,omitempty"` - CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,20,opt,name=certificate_properties,proto3,oneof" json:"certificate_properties,omitempty"` - ImageUsername string `protobuf:"bytes,21,opt,name=image_username,proto3" json:"image_username,omitempty"` - ImagePassword string `protobuf:"bytes,22,opt,name=image_password,proto3" json:"image_password,omitempty"` - CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,23,opt,name=check_definition,proto3" json:"check_definition,omitempty"` - ImageLayers []*ProtoImageLayer `protobuf:"bytes,24,rep,name=image_layers,proto3" json:"image_layers,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,25,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Sidecars []*ProtoSidecar `protobuf:"bytes,26,rep,name=sidecars,proto3" json:"sidecars,omitempty"` - LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,27,opt,name=log_rate_limit,proto3" json:"log_rate_limit,omitempty"` + LegacyDownloadUser string `protobuf:"bytes,15,opt,name=legacy_download_user,proto3" json:"legacy_download_user,omitempty"` + TrustedSystemCertificatesPath string `protobuf:"bytes,16,opt,name=trusted_system_certificates_path,proto3" json:"trusted_system_certificates_path,omitempty"` + VolumeMounts []*ProtoVolumeMount `protobuf:"bytes,17,rep,name=volume_mounts,proto3" json:"volume_mounts,omitempty"` + Network *ProtoNetwork `protobuf:"bytes,18,opt,name=network,proto3" json:"network,omitempty"` + StartTimeoutMs int64 `protobuf:"varint,19,opt,name=start_timeout_ms,proto3" json:"start_timeout_ms,omitempty"` + CertificateProperties *ProtoCertificateProperties `protobuf:"bytes,20,opt,name=certificate_properties,proto3,oneof" json:"certificate_properties,omitempty"` + ImageUsername string `protobuf:"bytes,21,opt,name=image_username,proto3" json:"image_username,omitempty"` + ImagePassword string `protobuf:"bytes,22,opt,name=image_password,proto3" json:"image_password,omitempty"` + CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,23,opt,name=check_definition,proto3" json:"check_definition,omitempty"` + ImageLayers []*ProtoImageLayer `protobuf:"bytes,24,rep,name=image_layers,proto3" json:"image_layers,omitempty"` + // Deprecated: Marked as deprecated in desired_lrp.proto. + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,25,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Sidecars []*ProtoSidecar `protobuf:"bytes,26,rep,name=sidecars,proto3" json:"sidecars,omitempty"` + LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,27,opt,name=log_rate_limit,proto3" json:"log_rate_limit,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPRunInfo) Reset() { @@ -383,11 +382,10 @@ func (x *ProtoDesiredLRPRunInfo) GetLogRateLimit() *ProtoLogRateLimit { // helper message for marshalling routes type ProtoRoutes struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Routes map[string][]byte `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Routes map[string][]byte `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *ProtoRoutes) Reset() { @@ -428,14 +426,13 @@ func (x *ProtoRoutes) GetRoutes() map[string][]byte { } type ProtoDesiredLRPUpdate struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` + Routes *ProtoRoutes `protobuf:"bytes,2,opt,name=routes,proto3,oneof" json:"routes,omitempty"` + Annotation *string `protobuf:"bytes,3,opt,name=annotation,proto3,oneof" json:"annotation,omitempty"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Instances *int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` - Routes *ProtoRoutes `protobuf:"bytes,2,opt,name=routes,proto3,oneof" json:"routes,omitempty"` - Annotation *string `protobuf:"bytes,3,opt,name=annotation,proto3,oneof" json:"annotation,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPUpdate) Reset() { @@ -497,13 +494,12 @@ func (x *ProtoDesiredLRPUpdate) GetMetricTags() map[string]*ProtoMetricTagValue } type ProtoDesiredLRPKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` + LogGuid string `protobuf:"bytes,3,opt,name=log_guid,proto3" json:"log_guid,omitempty"` unknownFields protoimpl.UnknownFields - - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` - Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` - LogGuid string `protobuf:"bytes,3,opt,name=log_guid,proto3" json:"log_guid,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPKey) Reset() { @@ -558,14 +554,13 @@ func (x *ProtoDesiredLRPKey) GetLogGuid() string { } type ProtoDesiredLRPResource struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` + DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + RootFs string `protobuf:"bytes,3,opt,name=root_fs,json=rootfs,proto3" json:"root_fs,omitempty"` + MaxPids int32 `protobuf:"varint,4,opt,name=max_pids,proto3" json:"max_pids,omitempty"` unknownFields protoimpl.UnknownFields - - MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` - DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` - RootFs string `protobuf:"bytes,3,opt,name=root_fs,json=rootfs,proto3" json:"root_fs,omitempty"` - MaxPids int32 `protobuf:"varint,4,opt,name=max_pids,proto3" json:"max_pids,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPResource) Reset() { @@ -627,10 +622,7 @@ func (x *ProtoDesiredLRPResource) GetMaxPids() int32 { } type ProtoDesiredLRP struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` RootFs string `protobuf:"bytes,3,opt,name=root_fs,json=rootfs,proto3" json:"root_fs,omitempty"` @@ -668,9 +660,11 @@ type ProtoDesiredLRP struct { ImagePassword string `protobuf:"bytes,32,opt,name=image_password,proto3" json:"image_password,omitempty"` CheckDefinition *ProtoCheckDefinition `protobuf:"bytes,33,opt,name=check_definition,proto3" json:"check_definition,omitempty"` ImageLayers []*ProtoImageLayer `protobuf:"bytes,34,rep,name=image_layers,proto3" json:"image_layers,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,35,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,35,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Sidecars []*ProtoSidecar `protobuf:"bytes,36,rep,name=sidecars,proto3" json:"sidecars,omitempty"` LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,37,opt,name=log_rate_limit,proto3" json:"log_rate_limit,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRP) Reset() { diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index aee47f58..49174978 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index eabca33e..e15258cd 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: desired_lrp_requests.proto package models @@ -21,11 +21,10 @@ const ( ) type ProtoDesiredLRPLifecycleResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPLifecycleResponse) Reset() { @@ -66,12 +65,11 @@ func (x *ProtoDesiredLRPLifecycleResponse) GetError() *ProtoError { } type ProtoDesiredLRPsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + DesiredLrps []*ProtoDesiredLRP `protobuf:"bytes,2,rep,name=desired_lrps,proto3" json:"desired_lrps,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrps []*ProtoDesiredLRP `protobuf:"bytes,2,rep,name=desired_lrps,proto3" json:"desired_lrps,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPsResponse) Reset() { @@ -119,12 +117,11 @@ func (x *ProtoDesiredLRPsResponse) GetDesiredLrps() []*ProtoDesiredLRP { } type ProtoDesiredLRPsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + ProcessGuids []string `protobuf:"bytes,2,rep,name=process_guids,proto3" json:"process_guids,omitempty"` unknownFields protoimpl.UnknownFields - - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` - ProcessGuids []string `protobuf:"bytes,2,rep,name=process_guids,proto3" json:"process_guids,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPsRequest) Reset() { @@ -172,12 +169,11 @@ func (x *ProtoDesiredLRPsRequest) GetProcessGuids() []string { } type ProtoDesiredLRPResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPResponse) Reset() { @@ -225,12 +221,11 @@ func (x *ProtoDesiredLRPResponse) GetDesiredLrp() *ProtoDesiredLRP { } type ProtoDesiredLRPSchedulingInfosResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` DesiredLrpSchedulingInfos []*ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,rep,name=desired_lrp_scheduling_infos,proto3" json:"desired_lrp_scheduling_infos,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPSchedulingInfosResponse) Reset() { @@ -278,12 +273,11 @@ func (x *ProtoDesiredLRPSchedulingInfosResponse) GetDesiredLrpSchedulingInfos() } type ProtoDesiredLRPSchedulingInfoByProcessGuidResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` DesiredLrpSchedulingInfo *ProtoDesiredLRPSchedulingInfo `protobuf:"bytes,2,opt,name=desired_lrp_scheduling_info,proto3" json:"desired_lrp_scheduling_info,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) Reset() { @@ -331,11 +325,10 @@ func (x *ProtoDesiredLRPSchedulingInfoByProcessGuidResponse) GetDesiredLrpSchedu } type ProtoDesiredLRPByProcessGuidRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` unknownFields protoimpl.UnknownFields - - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPByProcessGuidRequest) Reset() { @@ -376,11 +369,10 @@ func (x *ProtoDesiredLRPByProcessGuidRequest) GetProcessGuid() string { } type ProtoDesireLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` unknownFields protoimpl.UnknownFields - - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesireLRPRequest) Reset() { @@ -421,12 +413,11 @@ func (x *ProtoDesireLRPRequest) GetDesiredLrp() *ProtoDesiredLRP { } type ProtoUpdateDesiredLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + Update *ProtoDesiredLRPUpdate `protobuf:"bytes,2,opt,name=update,proto3" json:"update,omitempty"` unknownFields protoimpl.UnknownFields - - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` - Update *ProtoDesiredLRPUpdate `protobuf:"bytes,2,opt,name=update,proto3" json:"update,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoUpdateDesiredLRPRequest) Reset() { @@ -474,11 +465,10 @@ func (x *ProtoUpdateDesiredLRPRequest) GetUpdate() *ProtoDesiredLRPUpdate { } type ProtoRemoveDesiredLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` unknownFields protoimpl.UnknownFields - - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,proto3" json:"process_guid,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoRemoveDesiredLRPRequest) Reset() { diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index cc2346d1..9b3bdd19 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index a2467072..db25aaa2 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: domain.proto package models @@ -21,12 +21,11 @@ const ( ) type ProtoDomainsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDomainsResponse) Reset() { @@ -74,11 +73,10 @@ func (x *ProtoDomainsResponse) GetDomains() []string { } type ProtoUpsertDomainResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoUpsertDomainResponse) Reset() { @@ -119,12 +117,11 @@ func (x *ProtoUpsertDomainResponse) GetError() *ProtoError { } type ProtoUpsertDomainRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + Ttl uint32 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` unknownFields protoimpl.UnknownFields - - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` - Ttl uint32 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoUpsertDomainRequest) Reset() { diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index ae9443d2..e24cea9c 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 540607fb..406c0393 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: environment_variables.proto package models @@ -21,12 +21,11 @@ const ( ) type ProtoEnvironmentVariable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoEnvironmentVariable) Reset() { diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 24668e81..6674e9c9 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index 7ef36a9e..9c85869e 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: error.proto package models @@ -136,12 +136,11 @@ func (ProtoError_Type) EnumDescriptor() ([]byte, []int) { } type ProtoError struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type ProtoError_Type `protobuf:"varint,1,opt,name=type,proto3,enum=models.ProtoError_Type" json:"type,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` unknownFields protoimpl.UnknownFields - - Type ProtoError_Type `protobuf:"varint,1,opt,name=type,proto3,enum=models.ProtoError_Type" json:"type,omitempty"` - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoError) Reset() { diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index a8851201..ebeca099 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 58fd01b3..3100b217 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: evacuation.proto package models @@ -21,12 +21,11 @@ const ( ) type ProtoEvacuationResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + KeepContainer bool `protobuf:"varint,2,opt,name=keep_container,proto3" json:"keep_container,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - KeepContainer bool `protobuf:"varint,2,opt,name=keep_container,proto3" json:"keep_container,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoEvacuationResponse) Reset() { @@ -74,12 +73,11 @@ func (x *ProtoEvacuationResponse) GetKeepContainer() bool { } type ProtoEvacuateClaimedActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoEvacuateClaimedActualLRPRequest) Reset() { @@ -127,17 +125,16 @@ func (x *ProtoEvacuateClaimedActualLRPRequest) GetActualLrpInstanceKey() *ProtoA } type ProtoEvacuateRunningActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,proto3" json:"actual_lrp_net_info,omitempty"` ActualLrpInternalRoutes []*ProtoActualLRPInternalRoute `protobuf:"bytes,5,rep,name=actual_lrp_internal_routes,proto3" json:"actual_lrp_internal_routes,omitempty"` - MetricTags map[string]string `protobuf:"bytes,6,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricTags map[string]string `protobuf:"bytes,6,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Routable *bool `protobuf:"varint,7,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` AvailabilityZone string `protobuf:"bytes,8,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoEvacuateRunningActualLRPRequest) Reset() { @@ -220,12 +217,11 @@ func (x *ProtoEvacuateRunningActualLRPRequest) GetAvailabilityZone() string { } type ProtoEvacuateStoppedActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoEvacuateStoppedActualLRPRequest) Reset() { @@ -273,13 +269,12 @@ func (x *ProtoEvacuateStoppedActualLRPRequest) GetActualLrpInstanceKey() *ProtoA } type ProtoEvacuateCrashedActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,proto3" json:"error_message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoEvacuateCrashedActualLRPRequest) Reset() { @@ -334,12 +329,11 @@ func (x *ProtoEvacuateCrashedActualLRPRequest) GetErrorMessage() string { } type ProtoRemoveEvacuatingActualLRPRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoRemoveEvacuatingActualLRPRequest) Reset() { @@ -387,11 +381,10 @@ func (x *ProtoRemoveEvacuatingActualLRPRequest) GetActualLrpInstanceKey() *Proto } type ProtoRemoveEvacuatingActualLRPResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoRemoveEvacuatingActualLRPResponse) Reset() { diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 0a6b6272..7846f9b2 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index 36b8ed71..43ea18af 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: events.proto package models @@ -22,11 +22,10 @@ const ( // Deprecated: Marked as deprecated in events.proto. type ProtoActualLRPCreatedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPCreatedEvent) Reset() { @@ -68,12 +67,11 @@ func (x *ProtoActualLRPCreatedEvent) GetActualLrpGroup() *ProtoActualLRPGroup { // Deprecated: Marked as deprecated in events.proto. type ProtoActualLRPChangedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Before *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` + After *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` unknownFields protoimpl.UnknownFields - - Before *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` - After *ProtoActualLRPGroup `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPChangedEvent) Reset() { @@ -122,11 +120,10 @@ func (x *ProtoActualLRPChangedEvent) GetAfter() *ProtoActualLRPGroup { // Deprecated: Marked as deprecated in events.proto. type ProtoActualLRPRemovedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ActualLrpGroup *ProtoActualLRPGroup `protobuf:"bytes,1,opt,name=actual_lrp_group,proto3" json:"actual_lrp_group,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPRemovedEvent) Reset() { @@ -167,12 +164,11 @@ func (x *ProtoActualLRPRemovedEvent) GetActualLrpGroup() *ProtoActualLRPGroup { } type ProtoActualLRPInstanceCreatedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,proto3" json:"actual_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` unknownFields protoimpl.UnknownFields - - ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,proto3" json:"actual_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPInstanceCreatedEvent) Reset() { @@ -220,10 +216,7 @@ func (x *ProtoActualLRPInstanceCreatedEvent) GetTraceId() string { } type ProtoActualLRPInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpNetInfo *ProtoActualLRPNetInfo `protobuf:"bytes,3,opt,name=actual_lrp_net_info,proto3" json:"actual_lrp_net_info,omitempty"` CrashCount int32 `protobuf:"varint,4,opt,name=crash_count,proto3" json:"crash_count,omitempty"` CrashReason string `protobuf:"bytes,5,opt,name=crash_reason,proto3" json:"crash_reason,omitempty"` @@ -234,6 +227,8 @@ type ProtoActualLRPInfo struct { Presence ProtoActualLRP_Presence `protobuf:"varint,10,opt,name=presence,proto3,enum=models.ProtoActualLRP_Presence" json:"presence,omitempty"` Routable *bool `protobuf:"varint,11,opt,name=Routable,proto3,oneof" json:"Routable,omitempty"` AvailabilityZone string `protobuf:"bytes,12,opt,name=availability_zone,proto3" json:"availability_zone,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPInfo) Reset() { @@ -337,15 +332,14 @@ func (x *ProtoActualLRPInfo) GetAvailabilityZone() string { } type ProtoActualLRPInstanceChangedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` Before *ProtoActualLRPInfo `protobuf:"bytes,3,opt,name=before,proto3" json:"before,omitempty"` After *ProtoActualLRPInfo `protobuf:"bytes,4,opt,name=after,proto3" json:"after,omitempty"` TraceId string `protobuf:"bytes,5,opt,name=trace_id,proto3" json:"trace_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPInstanceChangedEvent) Reset() { @@ -414,12 +408,11 @@ func (x *ProtoActualLRPInstanceChangedEvent) GetTraceId() string { } type ProtoActualLRPInstanceRemovedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,proto3" json:"actual_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` unknownFields protoimpl.UnknownFields - - ActualLrp *ProtoActualLRP `protobuf:"bytes,1,opt,name=actual_lrp,proto3" json:"actual_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPInstanceRemovedEvent) Reset() { @@ -467,12 +460,11 @@ func (x *ProtoActualLRPInstanceRemovedEvent) GetTraceId() string { } type ProtoDesiredLRPCreatedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` unknownFields protoimpl.UnknownFields - - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPCreatedEvent) Reset() { @@ -520,13 +512,12 @@ func (x *ProtoDesiredLRPCreatedEvent) GetTraceId() string { } type ProtoDesiredLRPChangedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Before *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` + After *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` + TraceId string `protobuf:"bytes,3,opt,name=trace_id,proto3" json:"trace_id,omitempty"` unknownFields protoimpl.UnknownFields - - Before *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` - After *ProtoDesiredLRP `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` - TraceId string `protobuf:"bytes,3,opt,name=trace_id,proto3" json:"trace_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPChangedEvent) Reset() { @@ -581,12 +572,11 @@ func (x *ProtoDesiredLRPChangedEvent) GetTraceId() string { } type ProtoDesiredLRPRemovedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` + TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` unknownFields protoimpl.UnknownFields - - DesiredLrp *ProtoDesiredLRP `protobuf:"bytes,1,opt,name=desired_lrp,proto3" json:"desired_lrp,omitempty"` - TraceId string `protobuf:"bytes,2,opt,name=trace_id,proto3" json:"trace_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoDesiredLRPRemovedEvent) Reset() { @@ -634,15 +624,14 @@ func (x *ProtoDesiredLRPRemovedEvent) GetTraceId() string { } type ProtoActualLRPCrashedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` ActualLrpKey *ProtoActualLRPKey `protobuf:"bytes,1,opt,name=actual_lrp_key,proto3" json:"actual_lrp_key,omitempty"` ActualLrpInstanceKey *ProtoActualLRPInstanceKey `protobuf:"bytes,2,opt,name=actual_lrp_instance_key,proto3" json:"actual_lrp_instance_key,omitempty"` CrashCount int32 `protobuf:"varint,3,opt,name=crash_count,proto3" json:"crash_count,omitempty"` CrashReason string `protobuf:"bytes,4,opt,name=crash_reason,proto3" json:"crash_reason,omitempty"` Since int64 `protobuf:"varint,5,opt,name=since,proto3" json:"since,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoActualLRPCrashedEvent) Reset() { @@ -711,11 +700,10 @@ func (x *ProtoActualLRPCrashedEvent) GetSince() int64 { } type ProtoEventsByCellId struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + CellId string `protobuf:"bytes,1,opt,name=cell_id,proto3" json:"cell_id,omitempty"` unknownFields protoimpl.UnknownFields - - CellId string `protobuf:"bytes,1,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoEventsByCellId) Reset() { @@ -756,11 +744,10 @@ func (x *ProtoEventsByCellId) GetCellId() string { } type ProtoTaskCreatedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Task *ProtoTask `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` unknownFields protoimpl.UnknownFields - - Task *ProtoTask `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskCreatedEvent) Reset() { @@ -801,12 +788,11 @@ func (x *ProtoTaskCreatedEvent) GetTask() *ProtoTask { } type ProtoTaskChangedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Before *ProtoTask `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` + After *ProtoTask `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` unknownFields protoimpl.UnknownFields - - Before *ProtoTask `protobuf:"bytes,1,opt,name=before,proto3" json:"before,omitempty"` - After *ProtoTask `protobuf:"bytes,2,opt,name=after,proto3" json:"after,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskChangedEvent) Reset() { @@ -854,11 +840,10 @@ func (x *ProtoTaskChangedEvent) GetAfter() *ProtoTask { } type ProtoTaskRemovedEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Task *ProtoTask `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` unknownFields protoimpl.UnknownFields - - Task *ProtoTask `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskRemovedEvent) Reset() { @@ -899,11 +884,10 @@ func (x *ProtoTaskRemovedEvent) GetTask() *ProtoTask { } type ProtoFakeEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` unknownFields protoimpl.UnknownFields - - Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoFakeEvent) Reset() { diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 12c5d6a5..a63e0a93 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: events.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 9a5a8eb0..5e31fd17 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: image_layer.proto package models @@ -172,10 +172,7 @@ func (ProtoImageLayer_Type) EnumDescriptor() ([]byte, []int) { } type ProtoImageLayer struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` DestinationPath string `protobuf:"bytes,3,opt,name=destination_path,proto3" json:"destination_path,omitempty"` @@ -183,6 +180,8 @@ type ProtoImageLayer struct { MediaType ProtoImageLayer_MediaType `protobuf:"varint,5,opt,name=media_type,proto3,enum=models.ProtoImageLayer_MediaType" json:"media_type,omitempty"` DigestAlgorithm ProtoImageLayer_DigestAlgorithm `protobuf:"varint,6,opt,name=digest_algorithm,proto3,enum=models.ProtoImageLayer_DigestAlgorithm" json:"digest_algorithm,omitempty"` DigestValue string `protobuf:"bytes,7,opt,name=digest_value,proto3" json:"digest_value,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoImageLayer) Reset() { diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index d02db90a..8e8bcd10 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index 15ada17e..56be60da 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: log_rate_limit.proto package models @@ -21,11 +21,10 @@ const ( ) type ProtoLogRateLimit struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - BytesPerSecond int64 `protobuf:"varint,1,opt,name=bytes_per_second,proto3" json:"bytes_per_second,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + BytesPerSecond int64 `protobuf:"varint,1,opt,name=bytes_per_second,proto3" json:"bytes_per_second,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoLogRateLimit) Reset() { diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index ef8cccef..8d9e1bb6 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index e7f43e64..fde4c759 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: metric_tags.proto package models @@ -70,14 +70,13 @@ func (ProtoMetricTagValue_DynamicValue) EnumDescriptor() ([]byte, []int) { } type ProtoMetricTagValue struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Note: we only expect one of the following set of fields to be // set. - Static string `protobuf:"bytes,1,opt,name=static,proto3" json:"static,omitempty"` - Dynamic ProtoMetricTagValue_DynamicValue `protobuf:"varint,2,opt,name=dynamic,proto3,enum=models.ProtoMetricTagValue_DynamicValue" json:"dynamic,omitempty"` + Static string `protobuf:"bytes,1,opt,name=static,proto3" json:"static,omitempty"` + Dynamic ProtoMetricTagValue_DynamicValue `protobuf:"varint,2,opt,name=dynamic,proto3,enum=models.ProtoMetricTagValue_DynamicValue" json:"dynamic,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoMetricTagValue) Reset() { diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index e48995c2..93388ef0 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 0008c776..1b8f6ba8 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: modification_tag.proto package models @@ -21,12 +21,11 @@ const ( ) type ProtoModificationTag struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Epoch string `protobuf:"bytes,1,opt,name=epoch,proto3" json:"epoch,omitempty"` + Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` unknownFields protoimpl.UnknownFields - - Epoch string `protobuf:"bytes,1,opt,name=epoch,proto3" json:"epoch,omitempty"` - Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoModificationTag) Reset() { diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 4579e1b9..390043ba 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index fce94d1e..e0387803 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: network.proto package models @@ -21,11 +21,10 @@ const ( ) type ProtoNetwork struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Properties map[string]string `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Properties map[string]string `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *ProtoNetwork) Reset() { diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 00c42fa4..2eb11a23 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index d5aaba8a..38b8c35c 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: ping.proto package models @@ -21,11 +21,10 @@ const ( ) type ProtoPingResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Available bool `protobuf:"varint,1,opt,name=available,proto3" json:"available,omitempty"` unknownFields protoimpl.UnknownFields - - Available bool `protobuf:"varint,1,opt,name=available,proto3" json:"available,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoPingResponse) Reset() { diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 68f97ed2..36891686 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index ddee71e2..781289d8 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: security_group.proto package models @@ -21,12 +21,11 @@ const ( ) type ProtoPortRange struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Start uint32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"` + End uint32 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"` unknownFields protoimpl.UnknownFields - - Start uint32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"` - End uint32 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoPortRange) Reset() { @@ -74,12 +73,11 @@ func (x *ProtoPortRange) GetEnd() uint32 { } type ProtoICMPInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` + Code int32 `protobuf:"varint,2,opt,name=code,proto3" json:"code,omitempty"` unknownFields protoimpl.UnknownFields - - Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type,omitempty"` - Code int32 `protobuf:"varint,2,opt,name=code,proto3" json:"code,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoICMPInfo) Reset() { @@ -127,17 +125,16 @@ func (x *ProtoICMPInfo) GetCode() int32 { } type ProtoSecurityGroupRule struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Protocol string `protobuf:"bytes,1,opt,name=protocol,proto3" json:"protocol,omitempty"` + Destinations []string `protobuf:"bytes,2,rep,name=destinations,proto3" json:"destinations,omitempty"` + Ports []uint32 `protobuf:"varint,3,rep,name=ports,proto3" json:"ports,omitempty"` + PortRange *ProtoPortRange `protobuf:"bytes,4,opt,name=port_range,proto3" json:"port_range,omitempty"` + IcmpInfo *ProtoICMPInfo `protobuf:"bytes,5,opt,name=icmp_info,proto3" json:"icmp_info,omitempty"` + Log bool `protobuf:"varint,6,opt,name=log,proto3" json:"log,omitempty"` + Annotations []string `protobuf:"bytes,7,rep,name=annotations,proto3" json:"annotations,omitempty"` unknownFields protoimpl.UnknownFields - - Protocol string `protobuf:"bytes,1,opt,name=protocol,proto3" json:"protocol,omitempty"` - Destinations []string `protobuf:"bytes,2,rep,name=destinations,proto3" json:"destinations,omitempty"` - Ports []uint32 `protobuf:"varint,3,rep,name=ports,proto3" json:"ports,omitempty"` - PortRange *ProtoPortRange `protobuf:"bytes,4,opt,name=port_range,proto3" json:"port_range,omitempty"` - IcmpInfo *ProtoICMPInfo `protobuf:"bytes,5,opt,name=icmp_info,proto3" json:"icmp_info,omitempty"` - Log bool `protobuf:"varint,6,opt,name=log,proto3" json:"log,omitempty"` - Annotations []string `protobuf:"bytes,7,rep,name=annotations,proto3" json:"annotations,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoSecurityGroupRule) Reset() { diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index e275a76b..80ce0147 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 294afbbb..456b722e 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: sidecar.proto package models @@ -21,13 +21,12 @@ const ( ) type ProtoSidecar struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` + MemoryMb int32 `protobuf:"varint,3,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` unknownFields protoimpl.UnknownFields - - Action *ProtoAction `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` - DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,proto3" json:"disk_mb,omitempty"` - MemoryMb int32 `protobuf:"varint,3,opt,name=memory_mb,proto3" json:"memory_mb,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoSidecar) Reset() { diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index aeeccc2c..a29deb38 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index da768e2b..d638e287 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: task.proto package models @@ -76,10 +76,7 @@ func (ProtoTask_State) EnumDescriptor() ([]byte, []int) { } type ProtoTaskDefinition struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` RootFs string `protobuf:"bytes,1,opt,name=root_fs,json=rootfs,proto3" json:"root_fs,omitempty"` EnvironmentVariables []*ProtoEnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=env,proto3" json:"environment_variables,omitempty"` Action *ProtoAction `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"` @@ -107,7 +104,9 @@ type ProtoTaskDefinition struct { ImagePassword string `protobuf:"bytes,24,opt,name=image_password,proto3" json:"image_password,omitempty"` ImageLayers []*ProtoImageLayer `protobuf:"bytes,25,rep,name=image_layers,proto3" json:"image_layers,omitempty"` LogRateLimit *ProtoLogRateLimit `protobuf:"bytes,26,opt,name=log_rate_limit,proto3" json:"log_rate_limit,omitempty"` - MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,27,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricTags map[string]*ProtoMetricTagValue `protobuf:"bytes,27,rep,name=metric_tags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoTaskDefinition) Reset() { @@ -331,23 +330,22 @@ func (x *ProtoTaskDefinition) GetMetricTags() map[string]*ProtoMetricTagValue { } type ProtoTask struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TaskDefinition *ProtoTaskDefinition `protobuf:"bytes,1,opt,name=task_definition,proto3" json:"task_definition,omitempty"` - TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,proto3" json:"task_guid,omitempty"` - Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` - CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,proto3" json:"created_at,omitempty"` - UpdatedAt int64 `protobuf:"varint,5,opt,name=updated_at,proto3" json:"updated_at,omitempty"` - FirstCompletedAt int64 `protobuf:"varint,6,opt,name=first_completed_at,proto3" json:"first_completed_at,omitempty"` - State ProtoTask_State `protobuf:"varint,7,opt,name=state,proto3,enum=models.ProtoTask_State" json:"state,omitempty"` - CellId string `protobuf:"bytes,8,opt,name=cell_id,proto3" json:"cell_id,omitempty"` - Result string `protobuf:"bytes,9,opt,name=result,proto3" json:"result,omitempty"` - Failed bool `protobuf:"varint,10,opt,name=failed,proto3" json:"failed,omitempty"` - FailureReason string `protobuf:"bytes,11,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` - RejectionCount int32 `protobuf:"varint,12,opt,name=rejection_count,proto3" json:"rejection_count,omitempty"` - RejectionReason string `protobuf:"bytes,13,opt,name=rejection_reason,proto3" json:"rejection_reason,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + TaskDefinition *ProtoTaskDefinition `protobuf:"bytes,1,opt,name=task_definition,proto3" json:"task_definition,omitempty"` + TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,proto3" json:"created_at,omitempty"` + UpdatedAt int64 `protobuf:"varint,5,opt,name=updated_at,proto3" json:"updated_at,omitempty"` + FirstCompletedAt int64 `protobuf:"varint,6,opt,name=first_completed_at,proto3" json:"first_completed_at,omitempty"` + State ProtoTask_State `protobuf:"varint,7,opt,name=state,proto3,enum=models.ProtoTask_State" json:"state,omitempty"` + CellId string `protobuf:"bytes,8,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + Result string `protobuf:"bytes,9,opt,name=result,proto3" json:"result,omitempty"` + Failed bool `protobuf:"varint,10,opt,name=failed,proto3" json:"failed,omitempty"` + FailureReason string `protobuf:"bytes,11,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` + RejectionCount int32 `protobuf:"varint,12,opt,name=rejection_count,proto3" json:"rejection_count,omitempty"` + RejectionReason string `protobuf:"bytes,13,opt,name=rejection_reason,proto3" json:"rejection_reason,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoTask) Reset() { diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 1d6574ff..d56eac2b 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index 80703bf4..48297d71 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: task_requests.proto package models @@ -21,11 +21,10 @@ const ( ) type ProtoTaskLifecycleResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskLifecycleResponse) Reset() { @@ -66,13 +65,12 @@ func (x *ProtoTaskLifecycleResponse) GetError() *ProtoError { } type ProtoDesireTaskRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TaskDefinition *ProtoTaskDefinition `protobuf:"bytes,1,opt,name=task_definition,proto3" json:"task_definition,omitempty"` - TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,proto3" json:"task_guid,omitempty"` - Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + TaskDefinition *ProtoTaskDefinition `protobuf:"bytes,1,opt,name=task_definition,proto3" json:"task_definition,omitempty"` + TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoDesireTaskRequest) Reset() { @@ -127,12 +125,11 @@ func (x *ProtoDesireTaskRequest) GetDomain() string { } type ProtoStartTaskRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` unknownFields protoimpl.UnknownFields - - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoStartTaskRequest) Reset() { @@ -180,12 +177,11 @@ func (x *ProtoStartTaskRequest) GetCellId() string { } type ProtoStartTaskResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + ShouldStart bool `protobuf:"varint,2,opt,name=should_start,proto3" json:"should_start,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - ShouldStart bool `protobuf:"varint,2,opt,name=should_start,proto3" json:"should_start,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoStartTaskResponse) Reset() { @@ -234,12 +230,11 @@ func (x *ProtoStartTaskResponse) GetShouldStart() bool { // Deprecated: Marked as deprecated in task_requests.proto. type ProtoFailTaskRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + FailureReason string `protobuf:"bytes,2,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` unknownFields protoimpl.UnknownFields - - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` - FailureReason string `protobuf:"bytes,2,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoFailTaskRequest) Reset() { @@ -287,12 +282,11 @@ func (x *ProtoFailTaskRequest) GetFailureReason() string { } type ProtoRejectTaskRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` - RejectionReason string `protobuf:"bytes,2,opt,name=rejection_reason,proto3" json:"rejection_reason,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + RejectionReason string `protobuf:"bytes,2,opt,name=rejection_reason,proto3" json:"rejection_reason,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoRejectTaskRequest) Reset() { @@ -340,11 +334,10 @@ func (x *ProtoRejectTaskRequest) GetRejectionReason() string { } type ProtoTaskGuidRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` unknownFields protoimpl.UnknownFields - - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskGuidRequest) Reset() { @@ -385,15 +378,14 @@ func (x *ProtoTaskGuidRequest) GetTaskGuid() string { } type ProtoCompleteTaskRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + Failed bool `protobuf:"varint,3,opt,name=failed,proto3" json:"failed,omitempty"` + FailureReason string `protobuf:"bytes,4,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` + Result string `protobuf:"bytes,5,opt,name=result,proto3" json:"result,omitempty"` unknownFields protoimpl.UnknownFields - - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` - Failed bool `protobuf:"varint,3,opt,name=failed,proto3" json:"failed,omitempty"` - FailureReason string `protobuf:"bytes,4,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` - Result string `protobuf:"bytes,5,opt,name=result,proto3" json:"result,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoCompleteTaskRequest) Reset() { @@ -462,16 +454,15 @@ func (x *ProtoCompleteTaskRequest) GetResult() string { } type ProtoTaskCallbackResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + Failed bool `protobuf:"varint,2,opt,name=failed,proto3" json:"failed,omitempty"` + FailureReason string `protobuf:"bytes,3,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` + Result string `protobuf:"bytes,4,opt,name=result,proto3" json:"result,omitempty"` + Annotation string `protobuf:"bytes,5,opt,name=annotation,proto3" json:"annotation,omitempty"` + CreatedAt int64 `protobuf:"varint,6,opt,name=created_at,proto3" json:"created_at,omitempty"` unknownFields protoimpl.UnknownFields - - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` - Failed bool `protobuf:"varint,2,opt,name=failed,proto3" json:"failed,omitempty"` - FailureReason string `protobuf:"bytes,3,opt,name=failure_reason,proto3" json:"failure_reason,omitempty"` - Result string `protobuf:"bytes,4,opt,name=result,proto3" json:"result,omitempty"` - Annotation string `protobuf:"bytes,5,opt,name=annotation,proto3" json:"annotation,omitempty"` - CreatedAt int64 `protobuf:"varint,6,opt,name=created_at,proto3" json:"created_at,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskCallbackResponse) Reset() { @@ -547,12 +538,11 @@ func (x *ProtoTaskCallbackResponse) GetCreatedAt() int64 { } type ProtoTasksRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` + CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` unknownFields protoimpl.UnknownFields - - Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain,omitempty"` - CellId string `protobuf:"bytes,2,opt,name=cell_id,proto3" json:"cell_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTasksRequest) Reset() { @@ -600,12 +590,11 @@ func (x *ProtoTasksRequest) GetCellId() string { } type ProtoTasksResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Tasks []*ProtoTask `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Tasks []*ProtoTask `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTasksResponse) Reset() { @@ -653,11 +642,10 @@ func (x *ProtoTasksResponse) GetTasks() []*ProtoTask { } type ProtoTaskByGuidRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` unknownFields protoimpl.UnknownFields - - TaskGuid string `protobuf:"bytes,1,opt,name=task_guid,proto3" json:"task_guid,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskByGuidRequest) Reset() { @@ -698,12 +686,11 @@ func (x *ProtoTaskByGuidRequest) GetTaskGuid() string { } type ProtoTaskResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` + Task *ProtoTask `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"` unknownFields protoimpl.UnknownFields - - Error *ProtoError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` - Task *ProtoTask `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoTaskResponse) Reset() { diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 92e71a97..2ea6f45c 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index c8d21fc9..3c6d035a 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: volume_mount.proto package models @@ -21,12 +21,11 @@ const ( ) type ProtoSharedDevice struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + VolumeId string `protobuf:"bytes,1,opt,name=volume_id,proto3" json:"volume_id,omitempty"` + MountConfig string `protobuf:"bytes,2,opt,name=mount_config,proto3" json:"mount_config,omitempty"` unknownFields protoimpl.UnknownFields - - VolumeId string `protobuf:"bytes,1,opt,name=volume_id,proto3" json:"volume_id,omitempty"` - MountConfig string `protobuf:"bytes,2,opt,name=mount_config,proto3" json:"mount_config,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoSharedDevice) Reset() { @@ -74,15 +73,14 @@ func (x *ProtoSharedDevice) GetMountConfig() string { } type ProtoVolumeMount struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Driver string `protobuf:"bytes,1,opt,name=driver,proto3" json:"driver,omitempty"` - ContainerDir string `protobuf:"bytes,3,opt,name=container_dir,proto3" json:"container_dir,omitempty"` - Mode string `protobuf:"bytes,6,opt,name=mode,proto3" json:"mode,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Driver string `protobuf:"bytes,1,opt,name=driver,proto3" json:"driver,omitempty"` + ContainerDir string `protobuf:"bytes,3,opt,name=container_dir,proto3" json:"container_dir,omitempty"` + Mode string `protobuf:"bytes,6,opt,name=mode,proto3" json:"mode,omitempty"` // oneof device { - Shared *ProtoSharedDevice `protobuf:"bytes,7,opt,name=shared,proto3" json:"shared,omitempty"` // } + Shared *ProtoSharedDevice `protobuf:"bytes,7,opt,name=shared,proto3" json:"shared,omitempty"` // } + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtoVolumeMount) Reset() { @@ -144,11 +142,10 @@ func (x *ProtoVolumeMount) GetShared() *ProtoSharedDevice { } type ProtoVolumePlacement struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DriverNames []string `protobuf:"bytes,1,rep,name=driver_names,proto3" json:"driver_names,omitempty"` unknownFields protoimpl.UnknownFields - - DriverNames []string `protobuf:"bytes,1,rep,name=driver_names,proto3" json:"driver_names,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProtoVolumePlacement) Reset() { diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 681ffbe7..54a9de81 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.28.2 +// - protoc v5.29.3 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 0d64493b..d768a89a 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: bbs.proto package main From d68708b4782e8d218026f17a0de4c87ab3a5e4b8 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 23 Jan 2025 20:01:36 +0000 Subject: [PATCH 129/155] InternalRoutesFromRoutingInfo now takes a pointer Regen protos --- db/sqldb/lrp_convergence.go | 2 +- handlers/desired_lrp_handlers.go | 2 +- models/actions.pb.go | 16 +- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 16 +- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 16 +- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 12 +- models/cached_dependency.pb.go | 16 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 16 +- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 16 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 16 +- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 191 ++++-------------------- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 16 +- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 16 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 16 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 16 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 16 +- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 16 +- models/events_bbs.pb.go | 2 +- models/image_layer.pb.go | 16 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 16 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 16 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 16 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 16 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 16 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 16 +- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 16 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 16 +- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 16 +- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 16 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 12 +- 54 files changed, 258 insertions(+), 395 deletions(-) diff --git a/db/sqldb/lrp_convergence.go b/db/sqldb/lrp_convergence.go index 7033e141..1f3fa0b0 100644 --- a/db/sqldb/lrp_convergence.go +++ b/db/sqldb/lrp_convergence.go @@ -221,7 +221,7 @@ func (c *convergence) lrpsWithInternalRouteChanges(ctx context.Context, logger l } } - desiredInternalRoutes, err := internalroutes.InternalRoutesFromRoutingInfo(desiredRoutes) + desiredInternalRoutes, err := internalroutes.InternalRoutesFromRoutingInfo(&desiredRoutes) if err != nil { logger.Error("failed-getting-internal-routes-from-desired", err) continue diff --git a/handlers/desired_lrp_handlers.go b/handlers/desired_lrp_handlers.go index 6cfb32e2..e6634088 100644 --- a/handlers/desired_lrp_handlers.go +++ b/handlers/desired_lrp_handlers.go @@ -507,7 +507,7 @@ func (h *DesiredLRPHandler) updateInstances(ctx context.Context, logger lager.Lo var internalRoutes internalroutes.InternalRoutes if internalRoutesUpdated { - internalRoutes, err = internalroutes.InternalRoutesFromRoutingInfo(*update.Routes) + internalRoutes, err = internalroutes.InternalRoutesFromRoutingInfo(update.Routes) if err != nil { logger.Error("getting-internal-routes-failed", err) continue diff --git a/models/actions.pb.go b/models/actions.pb.go index 29771f26..e3c91eb2 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: actions.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -825,7 +826,7 @@ func (x *ProtoResourceLimits) GetNproc() uint64 { var File_actions_proto protoreflect.FileDescriptor -var file_actions_proto_rawDesc = []byte{ +var file_actions_proto_rawDesc = string([]byte{ 0x0a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, @@ -974,16 +975,16 @@ var file_actions_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_actions_proto_rawDescOnce sync.Once - file_actions_proto_rawDescData = file_actions_proto_rawDesc + file_actions_proto_rawDescData []byte ) func file_actions_proto_rawDescGZIP() []byte { file_actions_proto_rawDescOnce.Do(func() { - file_actions_proto_rawDescData = protoimpl.X.CompressGZIP(file_actions_proto_rawDescData) + file_actions_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_actions_proto_rawDesc), len(file_actions_proto_rawDesc))) }) return file_actions_proto_rawDescData } @@ -1040,7 +1041,7 @@ func file_actions_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_actions_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_actions_proto_rawDesc), len(file_actions_proto_rawDesc)), NumEnums: 0, NumMessages: 11, NumExtensions: 0, @@ -1051,7 +1052,6 @@ func file_actions_proto_init() { MessageInfos: file_actions_proto_msgTypes, }.Build() File_actions_proto = out.File - file_actions_proto_rawDesc = nil file_actions_proto_goTypes = nil file_actions_proto_depIdxs = nil } diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 65130fc5..4282991b 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 08c9004f..dd98e4be 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: actual_lrp.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -613,7 +614,7 @@ func (x *ProtoActualLRP) GetAvailabilityZone() string { var File_actual_lrp_proto protoreflect.FileDescriptor -var file_actual_lrp_proto_rawDesc = []byte{ +var file_actual_lrp_proto_rawDesc = string([]byte{ 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, @@ -750,16 +751,16 @@ var file_actual_lrp_proto_rawDesc = []byte{ 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_actual_lrp_proto_rawDescOnce sync.Once - file_actual_lrp_proto_rawDescData = file_actual_lrp_proto_rawDesc + file_actual_lrp_proto_rawDescData []byte ) func file_actual_lrp_proto_rawDescGZIP() []byte { file_actual_lrp_proto_rawDescOnce.Do(func() { - file_actual_lrp_proto_rawDescData = protoimpl.X.CompressGZIP(file_actual_lrp_proto_rawDescData) + file_actual_lrp_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_actual_lrp_proto_rawDesc), len(file_actual_lrp_proto_rawDesc))) }) return file_actual_lrp_proto_rawDescData } @@ -810,7 +811,7 @@ func file_actual_lrp_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_actual_lrp_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_actual_lrp_proto_rawDesc), len(file_actual_lrp_proto_rawDesc)), NumEnums: 2, NumMessages: 8, NumExtensions: 0, @@ -822,7 +823,6 @@ func file_actual_lrp_proto_init() { MessageInfos: file_actual_lrp_proto_msgTypes, }.Build() File_actual_lrp_proto = out.File - file_actual_lrp_proto_rawDesc = nil file_actual_lrp_proto_goTypes = nil file_actual_lrp_proto_depIdxs = nil } diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 4e77848d..6e160bb9 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 770ac934..4a5c0c34 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: actual_lrp_requests.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -811,7 +812,7 @@ func (x *ProtoActualLRPsRequest) GetIndex() int32 { var File_actual_lrp_requests_proto protoreflect.FileDescriptor -var file_actual_lrp_requests_proto_rawDesc = []byte{ +var file_actual_lrp_requests_proto_rawDesc = string([]byte{ 0x0a, 0x19, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, @@ -974,16 +975,16 @@ var file_actual_lrp_requests_proto_rawDesc = []byte{ 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_actual_lrp_requests_proto_rawDescOnce sync.Once - file_actual_lrp_requests_proto_rawDescData = file_actual_lrp_requests_proto_rawDesc + file_actual_lrp_requests_proto_rawDescData []byte ) func file_actual_lrp_requests_proto_rawDescGZIP() []byte { file_actual_lrp_requests_proto_rawDescOnce.Do(func() { - file_actual_lrp_requests_proto_rawDescData = protoimpl.X.CompressGZIP(file_actual_lrp_requests_proto_rawDescData) + file_actual_lrp_requests_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_actual_lrp_requests_proto_rawDesc), len(file_actual_lrp_requests_proto_rawDesc))) }) return file_actual_lrp_requests_proto_rawDescData } @@ -1053,7 +1054,7 @@ func file_actual_lrp_requests_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_actual_lrp_requests_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_actual_lrp_requests_proto_rawDesc), len(file_actual_lrp_requests_proto_rawDesc)), NumEnums: 0, NumMessages: 15, NumExtensions: 0, @@ -1064,7 +1065,6 @@ func file_actual_lrp_requests_proto_init() { MessageInfos: file_actual_lrp_requests_proto_msgTypes, }.Build() File_actual_lrp_requests_proto = out.File - file_actual_lrp_requests_proto_rawDesc = nil file_actual_lrp_requests_proto_goTypes = nil file_actual_lrp_requests_proto_depIdxs = nil } diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 32fbf179..cbf42256 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 65b523d8..000c0f57 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: bbs.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" + unsafe "unsafe" ) const ( @@ -83,7 +84,7 @@ var ( var File_bbs_proto protoreflect.FileDescriptor -var file_bbs_proto_rawDesc = []byte{ +var file_bbs_proto_rawDesc = string([]byte{ 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, @@ -116,7 +117,7 @@ var file_bbs_proto_rawDesc = []byte{ 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var file_bbs_proto_goTypes = []any{ (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions @@ -144,7 +145,7 @@ func file_bbs_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_bbs_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_bbs_proto_rawDesc), len(file_bbs_proto_rawDesc)), NumEnums: 0, NumMessages: 0, NumExtensions: 5, @@ -155,7 +156,6 @@ func file_bbs_proto_init() { ExtensionInfos: file_bbs_proto_extTypes, }.Build() File_bbs_proto = out.File - file_bbs_proto_rawDesc = nil file_bbs_proto_goTypes = nil file_bbs_proto_depIdxs = nil } diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 01e78ea6..60b122f1 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: cached_dependency.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -114,7 +115,7 @@ func (x *ProtoCachedDependency) GetChecksumValue() string { var File_cached_dependency_proto protoreflect.FileDescriptor -var file_cached_dependency_proto_rawDesc = []byte{ +var file_cached_dependency_proto_rawDesc = string([]byte{ 0x0a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, @@ -137,16 +138,16 @@ var file_cached_dependency_proto_rawDesc = []byte{ 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_cached_dependency_proto_rawDescOnce sync.Once - file_cached_dependency_proto_rawDescData = file_cached_dependency_proto_rawDesc + file_cached_dependency_proto_rawDescData []byte ) func file_cached_dependency_proto_rawDescGZIP() []byte { file_cached_dependency_proto_rawDescOnce.Do(func() { - file_cached_dependency_proto_rawDescData = protoimpl.X.CompressGZIP(file_cached_dependency_proto_rawDescData) + file_cached_dependency_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_cached_dependency_proto_rawDesc), len(file_cached_dependency_proto_rawDesc))) }) return file_cached_dependency_proto_rawDescData } @@ -173,7 +174,7 @@ func file_cached_dependency_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cached_dependency_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_cached_dependency_proto_rawDesc), len(file_cached_dependency_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -184,7 +185,6 @@ func file_cached_dependency_proto_init() { MessageInfos: file_cached_dependency_proto_msgTypes, }.Build() File_cached_dependency_proto = out.File - file_cached_dependency_proto_rawDesc = nil file_cached_dependency_proto_goTypes = nil file_cached_dependency_proto_depIdxs = nil } diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index dc7383a3..bec4931d 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index 1c8fa224..bb442a36 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: cells.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -286,7 +287,7 @@ func (x *ProtoCellsResponse) GetCells() []*ProtoCellPresence { var File_cells_proto protoreflect.FileDescriptor -var file_cells_proto_rawDesc = []byte{ +var file_cells_proto_rawDesc = string([]byte{ 0x0a, 0x0b, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7a, 0x0a, @@ -336,16 +337,16 @@ var file_cells_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_cells_proto_rawDescOnce sync.Once - file_cells_proto_rawDescData = file_cells_proto_rawDesc + file_cells_proto_rawDescData []byte ) func file_cells_proto_rawDescGZIP() []byte { file_cells_proto_rawDescOnce.Do(func() { - file_cells_proto_rawDescData = protoimpl.X.CompressGZIP(file_cells_proto_rawDescData) + file_cells_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_cells_proto_rawDesc), len(file_cells_proto_rawDesc))) }) return file_cells_proto_rawDescData } @@ -381,7 +382,7 @@ func file_cells_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cells_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_cells_proto_rawDesc), len(file_cells_proto_rawDesc)), NumEnums: 0, NumMessages: 4, NumExtensions: 0, @@ -392,7 +393,6 @@ func file_cells_proto_init() { MessageInfos: file_cells_proto_msgTypes, }.Build() File_cells_proto = out.File - file_cells_proto_rawDesc = nil file_cells_proto_goTypes = nil file_cells_proto_depIdxs = nil } diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 437bf91e..1bd65af2 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 799fec0b..ed368075 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: certificate_properties.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -66,7 +67,7 @@ func (x *ProtoCertificateProperties) GetOrganizationalUnit() []string { var File_certificate_properties_proto protoreflect.FileDescriptor -var file_certificate_properties_proto_rawDesc = []byte{ +var file_certificate_properties_proto_rawDesc = string([]byte{ 0x0a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x4e, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, @@ -78,16 +79,16 @@ var file_certificate_properties_proto_rawDesc = []byte{ 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_certificate_properties_proto_rawDescOnce sync.Once - file_certificate_properties_proto_rawDescData = file_certificate_properties_proto_rawDesc + file_certificate_properties_proto_rawDescData []byte ) func file_certificate_properties_proto_rawDescGZIP() []byte { file_certificate_properties_proto_rawDescOnce.Do(func() { - file_certificate_properties_proto_rawDescData = protoimpl.X.CompressGZIP(file_certificate_properties_proto_rawDescData) + file_certificate_properties_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_certificate_properties_proto_rawDesc), len(file_certificate_properties_proto_rawDesc))) }) return file_certificate_properties_proto_rawDescData } @@ -113,7 +114,7 @@ func file_certificate_properties_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_certificate_properties_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_certificate_properties_proto_rawDesc), len(file_certificate_properties_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -124,7 +125,6 @@ func file_certificate_properties_proto_init() { MessageInfos: file_certificate_properties_proto_msgTypes, }.Build() File_certificate_properties_proto = out.File - file_certificate_properties_proto_rawDesc = nil file_certificate_properties_proto_goTypes = nil file_certificate_properties_proto_depIdxs = nil } diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index fbb21069..189f6d04 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 43a0b3a2..bcd1bc7c 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: check_definition.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -264,7 +265,7 @@ func (x *ProtoHTTPCheck) GetIntervalMs() uint64 { var File_check_definition_proto protoreflect.FileDescriptor -var file_check_definition_proto_rawDesc = []byte{ +var file_check_definition_proto_rawDesc = string([]byte{ 0x0a, 0x16, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7, 0x01, 0x0a, 0x14, @@ -306,16 +307,16 @@ var file_check_definition_proto_rawDesc = []byte{ 0x5f, 0x6d, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_check_definition_proto_rawDescOnce sync.Once - file_check_definition_proto_rawDescData = file_check_definition_proto_rawDesc + file_check_definition_proto_rawDescData []byte ) func file_check_definition_proto_rawDescGZIP() []byte { file_check_definition_proto_rawDescOnce.Do(func() { - file_check_definition_proto_rawDescData = protoimpl.X.CompressGZIP(file_check_definition_proto_rawDescData) + file_check_definition_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_check_definition_proto_rawDesc), len(file_check_definition_proto_rawDesc))) }) return file_check_definition_proto_rawDescData } @@ -349,7 +350,7 @@ func file_check_definition_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_check_definition_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_check_definition_proto_rawDesc), len(file_check_definition_proto_rawDesc)), NumEnums: 0, NumMessages: 4, NumExtensions: 0, @@ -360,7 +361,6 @@ func file_check_definition_proto_init() { MessageInfos: file_check_definition_proto_msgTypes, }.Build() File_check_definition_proto = out.File - file_check_definition_proto_rawDesc = nil file_check_definition_proto_goTypes = nil file_check_definition_proto_depIdxs = nil } diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 15cad6d8..b44ea4c6 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index b7030979..a2bd80dc 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: desired_lrp.proto package models @@ -9,6 +9,7 @@ package models import ( reflect "reflect" sync "sync" + unsafe "unsafe" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -961,7 +962,7 @@ func (x *ProtoDesiredLRP) GetLogRateLimit() *ProtoLogRateLimit { var File_desired_lrp_proto protoreflect.FileDescriptor -var file_desired_lrp_proto_rawDesc = []byte{ +var file_desired_lrp_proto_rawDesc = string([]byte{ 0x0a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, @@ -1141,172 +1142,35 @@ var file_desired_lrp_proto_rawDesc = []byte{ 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, - 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7b, 0x0a, 0x12, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, - 0x79, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, - 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, - 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, - 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, - 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, - 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, - 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, - 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, - 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0xe2, 0x0f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, - 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, - 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x21, 0x0a, - 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, - 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, - 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, - 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, - 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, - 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, - 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, - 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, - 0x62, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, - 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, - 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, - 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, - 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, - 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, - 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, - 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, - 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x05, 0xc0, 0x3e, 0x01, - 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, - 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, - 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, - 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, - 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, - 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, - 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, - 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, - 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, - 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, - 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, - 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, - 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, - 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, - 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, - 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, - 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, - 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, - 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, - 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, - 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, - 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, - 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, - 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} + 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, + 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, + 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, + 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, + 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, + 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, + 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, + 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +}) var ( file_desired_lrp_proto_rawDescOnce sync.Once - file_desired_lrp_proto_rawDescData = file_desired_lrp_proto_rawDesc + file_desired_lrp_proto_rawDescData []byte ) func file_desired_lrp_proto_rawDescGZIP() []byte { file_desired_lrp_proto_rawDescOnce.Do(func() { - file_desired_lrp_proto_rawDescData = protoimpl.X.CompressGZIP(file_desired_lrp_proto_rawDescData) + file_desired_lrp_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_desired_lrp_proto_rawDesc), len(file_desired_lrp_proto_rawDesc))) }) return file_desired_lrp_proto_rawDescData } @@ -1415,7 +1279,7 @@ func file_desired_lrp_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_desired_lrp_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_desired_lrp_proto_rawDesc), len(file_desired_lrp_proto_rawDesc)), NumEnums: 0, NumMessages: 11, NumExtensions: 0, @@ -1426,7 +1290,6 @@ func file_desired_lrp_proto_init() { MessageInfos: file_desired_lrp_proto_msgTypes, }.Build() File_desired_lrp_proto = out.File - file_desired_lrp_proto_rawDesc = nil file_desired_lrp_proto_goTypes = nil file_desired_lrp_proto_depIdxs = nil } diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 49174978..6900dbdb 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index e15258cd..c9e919d9 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: desired_lrp_requests.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -510,7 +511,7 @@ func (x *ProtoRemoveDesiredLRPRequest) GetProcessGuid() string { var File_desired_lrp_requests_proto protoreflect.FileDescriptor -var file_desired_lrp_requests_proto_rawDesc = []byte{ +var file_desired_lrp_requests_proto_rawDesc = string([]byte{ 0x0a, 0x1a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, @@ -594,16 +595,16 @@ var file_desired_lrp_requests_proto_rawDesc = []byte{ 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_desired_lrp_requests_proto_rawDescOnce sync.Once - file_desired_lrp_requests_proto_rawDescData = file_desired_lrp_requests_proto_rawDesc + file_desired_lrp_requests_proto_rawDescData []byte ) func file_desired_lrp_requests_proto_rawDescGZIP() []byte { file_desired_lrp_requests_proto_rawDescOnce.Do(func() { - file_desired_lrp_requests_proto_rawDescData = protoimpl.X.CompressGZIP(file_desired_lrp_requests_proto_rawDescData) + file_desired_lrp_requests_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_desired_lrp_requests_proto_rawDesc), len(file_desired_lrp_requests_proto_rawDesc))) }) return file_desired_lrp_requests_proto_rawDescData } @@ -656,7 +657,7 @@ func file_desired_lrp_requests_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_desired_lrp_requests_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_desired_lrp_requests_proto_rawDesc), len(file_desired_lrp_requests_proto_rawDesc)), NumEnums: 0, NumMessages: 10, NumExtensions: 0, @@ -667,7 +668,6 @@ func file_desired_lrp_requests_proto_init() { MessageInfos: file_desired_lrp_requests_proto_msgTypes, }.Build() File_desired_lrp_requests_proto = out.File - file_desired_lrp_requests_proto_rawDesc = nil file_desired_lrp_requests_proto_goTypes = nil file_desired_lrp_requests_proto_depIdxs = nil } diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index 9b3bdd19..6dc37574 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index db25aaa2..27744b8d 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: domain.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -170,7 +171,7 @@ func (x *ProtoUpsertDomainRequest) GetTtl() uint32 { var File_domain_proto protoreflect.FileDescriptor -var file_domain_proto_rawDesc = []byte{ +var file_domain_proto_rawDesc = string([]byte{ 0x0a, 0x0c, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5a, @@ -192,16 +193,16 @@ var file_domain_proto_rawDesc = []byte{ 0x6c, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_domain_proto_rawDescOnce sync.Once - file_domain_proto_rawDescData = file_domain_proto_rawDesc + file_domain_proto_rawDescData []byte ) func file_domain_proto_rawDescGZIP() []byte { file_domain_proto_rawDescOnce.Do(func() { - file_domain_proto_rawDescData = protoimpl.X.CompressGZIP(file_domain_proto_rawDescData) + file_domain_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_domain_proto_rawDesc), len(file_domain_proto_rawDesc))) }) return file_domain_proto_rawDescData } @@ -234,7 +235,7 @@ func file_domain_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_domain_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_domain_proto_rawDesc), len(file_domain_proto_rawDesc)), NumEnums: 0, NumMessages: 3, NumExtensions: 0, @@ -245,7 +246,6 @@ func file_domain_proto_init() { MessageInfos: file_domain_proto_msgTypes, }.Build() File_domain_proto = out.File - file_domain_proto_rawDesc = nil file_domain_proto_goTypes = nil file_domain_proto_depIdxs = nil } diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index e24cea9c..07e1738e 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 406c0393..8647cb07 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: environment_variables.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -74,7 +75,7 @@ func (x *ProtoEnvironmentVariable) GetValue() string { var File_environment_variables_proto protoreflect.FileDescriptor -var file_environment_variables_proto_rawDesc = []byte{ +var file_environment_variables_proto_rawDesc = string([]byte{ 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, @@ -86,16 +87,16 @@ var file_environment_variables_proto_rawDesc = []byte{ 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_environment_variables_proto_rawDescOnce sync.Once - file_environment_variables_proto_rawDescData = file_environment_variables_proto_rawDesc + file_environment_variables_proto_rawDescData []byte ) func file_environment_variables_proto_rawDescGZIP() []byte { file_environment_variables_proto_rawDescOnce.Do(func() { - file_environment_variables_proto_rawDescData = protoimpl.X.CompressGZIP(file_environment_variables_proto_rawDescData) + file_environment_variables_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_environment_variables_proto_rawDesc), len(file_environment_variables_proto_rawDesc))) }) return file_environment_variables_proto_rawDescData } @@ -122,7 +123,7 @@ func file_environment_variables_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_environment_variables_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_environment_variables_proto_rawDesc), len(file_environment_variables_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -133,7 +134,6 @@ func file_environment_variables_proto_init() { MessageInfos: file_environment_variables_proto_msgTypes, }.Build() File_environment_variables_proto = out.File - file_environment_variables_proto_rawDesc = nil file_environment_variables_proto_goTypes = nil file_environment_variables_proto_depIdxs = nil } diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 6674e9c9..b93fe006 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index 9c85869e..766949be 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: error.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -189,7 +190,7 @@ func (x *ProtoError) GetMessage() string { var File_error_proto protoreflect.FileDescriptor -var file_error_proto_rawDesc = []byte{ +var file_error_proto_rawDesc = string([]byte{ 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcc, 0x05, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, @@ -240,16 +241,16 @@ var file_error_proto_rawDesc = []byte{ 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_error_proto_rawDescOnce sync.Once - file_error_proto_rawDescData = file_error_proto_rawDesc + file_error_proto_rawDescData []byte ) func file_error_proto_rawDescGZIP() []byte { file_error_proto_rawDescOnce.Do(func() { - file_error_proto_rawDescData = protoimpl.X.CompressGZIP(file_error_proto_rawDescData) + file_error_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_error_proto_rawDesc), len(file_error_proto_rawDesc))) }) return file_error_proto_rawDescData } @@ -279,7 +280,7 @@ func file_error_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_error_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_error_proto_rawDesc), len(file_error_proto_rawDesc)), NumEnums: 1, NumMessages: 1, NumExtensions: 0, @@ -291,7 +292,6 @@ func file_error_proto_init() { MessageInfos: file_error_proto_msgTypes, }.Build() File_error_proto = out.File - file_error_proto_rawDesc = nil file_error_proto_goTypes = nil file_error_proto_depIdxs = nil } diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index ebeca099..5a605922 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 3100b217..1c99a39d 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: evacuation.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -426,7 +427,7 @@ func (x *ProtoRemoveEvacuatingActualLRPResponse) GetError() *ProtoError { var File_evacuation_proto protoreflect.FileDescriptor -var file_evacuation_proto_rawDesc = []byte{ +var file_evacuation_proto_rawDesc = string([]byte{ 0x0a, 0x10, 0x65, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, @@ -540,16 +541,16 @@ var file_evacuation_proto_rawDesc = []byte{ 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_evacuation_proto_rawDescOnce sync.Once - file_evacuation_proto_rawDescData = file_evacuation_proto_rawDesc + file_evacuation_proto_rawDescData []byte ) func file_evacuation_proto_rawDescGZIP() []byte { file_evacuation_proto_rawDescOnce.Do(func() { - file_evacuation_proto_rawDescData = protoimpl.X.CompressGZIP(file_evacuation_proto_rawDescData) + file_evacuation_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_evacuation_proto_rawDesc), len(file_evacuation_proto_rawDesc))) }) return file_evacuation_proto_rawDescData } @@ -606,7 +607,7 @@ func file_evacuation_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_evacuation_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_evacuation_proto_rawDesc), len(file_evacuation_proto_rawDesc)), NumEnums: 0, NumMessages: 8, NumExtensions: 0, @@ -617,7 +618,6 @@ func file_evacuation_proto_init() { MessageInfos: file_evacuation_proto_msgTypes, }.Build() File_evacuation_proto = out.File - file_evacuation_proto_rawDesc = nil file_evacuation_proto_goTypes = nil file_evacuation_proto_depIdxs = nil } diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 7846f9b2..6bc147cf 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index 43ea18af..d45a24cd 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: events.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -929,7 +930,7 @@ func (x *ProtoFakeEvent) GetToken() string { var File_events_proto protoreflect.FileDescriptor -var file_events_proto_rawDesc = []byte{ +var file_events_proto_rawDesc = string([]byte{ 0x0a, 0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, @@ -1098,16 +1099,16 @@ var file_events_proto_rawDesc = []byte{ 0x6e, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_events_proto_rawDescOnce sync.Once - file_events_proto_rawDescData = file_events_proto_rawDesc + file_events_proto_rawDescData []byte ) func file_events_proto_rawDescGZIP() []byte { file_events_proto_rawDescOnce.Do(func() { - file_events_proto_rawDescData = protoimpl.X.CompressGZIP(file_events_proto_rawDescData) + file_events_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_events_proto_rawDesc), len(file_events_proto_rawDesc))) }) return file_events_proto_rawDescData } @@ -1186,7 +1187,7 @@ func file_events_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_events_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_events_proto_rawDesc), len(file_events_proto_rawDesc)), NumEnums: 0, NumMessages: 16, NumExtensions: 0, @@ -1197,7 +1198,6 @@ func file_events_proto_init() { MessageInfos: file_events_proto_msgTypes, }.Build() File_events_proto = out.File - file_events_proto_rawDesc = nil file_events_proto_goTypes = nil file_events_proto_depIdxs = nil } diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index a63e0a93..d2014fb2 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: events.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 5e31fd17..e451c3f1 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: image_layer.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -265,7 +266,7 @@ func (x *ProtoImageLayer) GetDigestValue() string { var File_image_layer_proto protoreflect.FileDescriptor -var file_image_layer_proto_rawDesc = []byte{ +var file_image_layer_proto_rawDesc = string([]byte{ 0x0a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc3, 0x05, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, @@ -316,16 +317,16 @@ var file_image_layer_proto_rawDesc = []byte{ 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_image_layer_proto_rawDescOnce sync.Once - file_image_layer_proto_rawDescData = file_image_layer_proto_rawDesc + file_image_layer_proto_rawDescData []byte ) func file_image_layer_proto_rawDescGZIP() []byte { file_image_layer_proto_rawDescOnce.Do(func() { - file_image_layer_proto_rawDescData = protoimpl.X.CompressGZIP(file_image_layer_proto_rawDescData) + file_image_layer_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_image_layer_proto_rawDesc), len(file_image_layer_proto_rawDesc))) }) return file_image_layer_proto_rawDescData } @@ -359,7 +360,7 @@ func file_image_layer_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_image_layer_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_image_layer_proto_rawDesc), len(file_image_layer_proto_rawDesc)), NumEnums: 3, NumMessages: 1, NumExtensions: 0, @@ -371,7 +372,6 @@ func file_image_layer_proto_init() { MessageInfos: file_image_layer_proto_msgTypes, }.Build() File_image_layer_proto = out.File - file_image_layer_proto_rawDesc = nil file_image_layer_proto_goTypes = nil file_image_layer_proto_depIdxs = nil } diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 8e8bcd10..4425d929 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index 56be60da..932b8e93 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: log_rate_limit.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -66,7 +67,7 @@ func (x *ProtoLogRateLimit) GetBytesPerSecond() int64 { var File_log_rate_limit_proto protoreflect.FileDescriptor -var file_log_rate_limit_proto_rawDesc = []byte{ +var file_log_rate_limit_proto_rawDesc = string([]byte{ 0x0a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x3f, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, @@ -76,16 +77,16 @@ var file_log_rate_limit_proto_rawDesc = []byte{ 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_log_rate_limit_proto_rawDescOnce sync.Once - file_log_rate_limit_proto_rawDescData = file_log_rate_limit_proto_rawDesc + file_log_rate_limit_proto_rawDescData []byte ) func file_log_rate_limit_proto_rawDescGZIP() []byte { file_log_rate_limit_proto_rawDescOnce.Do(func() { - file_log_rate_limit_proto_rawDescData = protoimpl.X.CompressGZIP(file_log_rate_limit_proto_rawDescData) + file_log_rate_limit_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_log_rate_limit_proto_rawDesc), len(file_log_rate_limit_proto_rawDesc))) }) return file_log_rate_limit_proto_rawDescData } @@ -111,7 +112,7 @@ func file_log_rate_limit_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_log_rate_limit_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_log_rate_limit_proto_rawDesc), len(file_log_rate_limit_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -122,7 +123,6 @@ func file_log_rate_limit_proto_init() { MessageInfos: file_log_rate_limit_proto_msgTypes, }.Build() File_log_rate_limit_proto = out.File - file_log_rate_limit_proto_rawDesc = nil file_log_rate_limit_proto_goTypes = nil file_log_rate_limit_proto_depIdxs = nil } diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 8d9e1bb6..1b3b34ee 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index fde4c759..4eac30e4 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: metric_tags.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -125,7 +126,7 @@ func (x *ProtoMetricTagValue) GetDynamic() ProtoMetricTagValue_DynamicValue { var File_metric_tags_proto protoreflect.FileDescriptor -var file_metric_tags_proto_rawDesc = []byte{ +var file_metric_tags_proto_rawDesc = string([]byte{ 0x0a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, @@ -148,16 +149,16 @@ var file_metric_tags_proto_rawDesc = []byte{ 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_metric_tags_proto_rawDescOnce sync.Once - file_metric_tags_proto_rawDescData = file_metric_tags_proto_rawDesc + file_metric_tags_proto_rawDescData []byte ) func file_metric_tags_proto_rawDescGZIP() []byte { file_metric_tags_proto_rawDescOnce.Do(func() { - file_metric_tags_proto_rawDescData = protoimpl.X.CompressGZIP(file_metric_tags_proto_rawDescData) + file_metric_tags_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_metric_tags_proto_rawDesc), len(file_metric_tags_proto_rawDesc))) }) return file_metric_tags_proto_rawDescData } @@ -187,7 +188,7 @@ func file_metric_tags_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_metric_tags_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_metric_tags_proto_rawDesc), len(file_metric_tags_proto_rawDesc)), NumEnums: 1, NumMessages: 1, NumExtensions: 0, @@ -199,7 +200,6 @@ func file_metric_tags_proto_init() { MessageInfos: file_metric_tags_proto_msgTypes, }.Build() File_metric_tags_proto = out.File - file_metric_tags_proto_rawDesc = nil file_metric_tags_proto_goTypes = nil file_metric_tags_proto_depIdxs = nil } diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 93388ef0..ab3063fb 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 1b8f6ba8..dd136efa 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: modification_tag.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -74,7 +75,7 @@ func (x *ProtoModificationTag) GetIndex() uint32 { var File_modification_tag_proto protoreflect.FileDescriptor -var file_modification_tag_proto_rawDesc = []byte{ +var file_modification_tag_proto_rawDesc = string([]byte{ 0x0a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4c, 0x0a, 0x14, 0x50, @@ -86,16 +87,16 @@ var file_modification_tag_proto_rawDesc = []byte{ 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_modification_tag_proto_rawDescOnce sync.Once - file_modification_tag_proto_rawDescData = file_modification_tag_proto_rawDesc + file_modification_tag_proto_rawDescData []byte ) func file_modification_tag_proto_rawDescGZIP() []byte { file_modification_tag_proto_rawDescOnce.Do(func() { - file_modification_tag_proto_rawDescData = protoimpl.X.CompressGZIP(file_modification_tag_proto_rawDescData) + file_modification_tag_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_modification_tag_proto_rawDesc), len(file_modification_tag_proto_rawDesc))) }) return file_modification_tag_proto_rawDescData } @@ -122,7 +123,7 @@ func file_modification_tag_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_modification_tag_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_modification_tag_proto_rawDesc), len(file_modification_tag_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -133,7 +134,6 @@ func file_modification_tag_proto_init() { MessageInfos: file_modification_tag_proto_msgTypes, }.Build() File_modification_tag_proto = out.File - file_modification_tag_proto_rawDesc = nil file_modification_tag_proto_goTypes = nil file_modification_tag_proto_depIdxs = nil } diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 390043ba..14826aa1 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index e0387803..c53d032b 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: network.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -66,7 +67,7 @@ func (x *ProtoNetwork) GetProperties() map[string]string { var File_network_proto protoreflect.FileDescriptor -var file_network_proto_rawDesc = []byte{ +var file_network_proto_rawDesc = string([]byte{ 0x0a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x44, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, @@ -81,16 +82,16 @@ var file_network_proto_rawDesc = []byte{ 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_network_proto_rawDescOnce sync.Once - file_network_proto_rawDescData = file_network_proto_rawDesc + file_network_proto_rawDescData []byte ) func file_network_proto_rawDescGZIP() []byte { file_network_proto_rawDescOnce.Do(func() { - file_network_proto_rawDescData = protoimpl.X.CompressGZIP(file_network_proto_rawDescData) + file_network_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_network_proto_rawDesc), len(file_network_proto_rawDesc))) }) return file_network_proto_rawDescData } @@ -118,7 +119,7 @@ func file_network_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_network_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_network_proto_rawDesc), len(file_network_proto_rawDesc)), NumEnums: 0, NumMessages: 2, NumExtensions: 0, @@ -129,7 +130,6 @@ func file_network_proto_init() { MessageInfos: file_network_proto_msgTypes, }.Build() File_network_proto = out.File - file_network_proto_rawDesc = nil file_network_proto_goTypes = nil file_network_proto_depIdxs = nil } diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 2eb11a23..7dbd02f8 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 38b8c35c..0e944f6b 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: ping.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -66,7 +67,7 @@ func (x *ProtoPingResponse) GetAvailable() bool { var File_ping_proto protoreflect.FileDescriptor -var file_ping_proto_rawDesc = []byte{ +var file_ping_proto_rawDesc = string([]byte{ 0x0a, 0x0a, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x36, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, @@ -76,16 +77,16 @@ var file_ping_proto_rawDesc = []byte{ 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_ping_proto_rawDescOnce sync.Once - file_ping_proto_rawDescData = file_ping_proto_rawDesc + file_ping_proto_rawDescData []byte ) func file_ping_proto_rawDescGZIP() []byte { file_ping_proto_rawDescOnce.Do(func() { - file_ping_proto_rawDescData = protoimpl.X.CompressGZIP(file_ping_proto_rawDescData) + file_ping_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_ping_proto_rawDesc), len(file_ping_proto_rawDesc))) }) return file_ping_proto_rawDescData } @@ -112,7 +113,7 @@ func file_ping_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_ping_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_ping_proto_rawDesc), len(file_ping_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -123,7 +124,6 @@ func file_ping_proto_init() { MessageInfos: file_ping_proto_msgTypes, }.Build() File_ping_proto = out.File - file_ping_proto_rawDesc = nil file_ping_proto_goTypes = nil file_ping_proto_depIdxs = nil } diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 36891686..48f0bce5 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index 781289d8..23ac3123 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: security_group.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -218,7 +219,7 @@ func (x *ProtoSecurityGroupRule) GetAnnotations() []string { var File_security_group_proto protoreflect.FileDescriptor -var file_security_group_proto_rawDesc = []byte{ +var file_security_group_proto_rawDesc = string([]byte{ 0x0a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x42, 0x0a, 0x0e, 0x50, 0x72, 0x6f, @@ -251,16 +252,16 @@ var file_security_group_proto_rawDesc = []byte{ 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_security_group_proto_rawDescOnce sync.Once - file_security_group_proto_rawDescData = file_security_group_proto_rawDesc + file_security_group_proto_rawDescData []byte ) func file_security_group_proto_rawDescGZIP() []byte { file_security_group_proto_rawDescOnce.Do(func() { - file_security_group_proto_rawDescData = protoimpl.X.CompressGZIP(file_security_group_proto_rawDescData) + file_security_group_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_security_group_proto_rawDesc), len(file_security_group_proto_rawDesc))) }) return file_security_group_proto_rawDescData } @@ -291,7 +292,7 @@ func file_security_group_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_security_group_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_security_group_proto_rawDesc), len(file_security_group_proto_rawDesc)), NumEnums: 0, NumMessages: 3, NumExtensions: 0, @@ -302,7 +303,6 @@ func file_security_group_proto_init() { MessageInfos: file_security_group_proto_msgTypes, }.Build() File_security_group_proto = out.File - file_security_group_proto_rawDesc = nil file_security_group_proto_goTypes = nil file_security_group_proto_depIdxs = nil } diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 80ce0147..166a194a 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 456b722e..4ddf2176 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: sidecar.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -82,7 +83,7 @@ func (x *ProtoSidecar) GetMemoryMb() int32 { var File_sidecar_proto protoreflect.FileDescriptor -var file_sidecar_proto_rawDesc = []byte{ +var file_sidecar_proto_rawDesc = string([]byte{ 0x0a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, @@ -97,16 +98,16 @@ var file_sidecar_proto_rawDesc = []byte{ 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_sidecar_proto_rawDescOnce sync.Once - file_sidecar_proto_rawDescData = file_sidecar_proto_rawDesc + file_sidecar_proto_rawDescData []byte ) func file_sidecar_proto_rawDescGZIP() []byte { file_sidecar_proto_rawDescOnce.Do(func() { - file_sidecar_proto_rawDescData = protoimpl.X.CompressGZIP(file_sidecar_proto_rawDescData) + file_sidecar_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_sidecar_proto_rawDesc), len(file_sidecar_proto_rawDesc))) }) return file_sidecar_proto_rawDescData } @@ -136,7 +137,7 @@ func file_sidecar_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_sidecar_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_sidecar_proto_rawDesc), len(file_sidecar_proto_rawDesc)), NumEnums: 0, NumMessages: 1, NumExtensions: 0, @@ -147,7 +148,6 @@ func file_sidecar_proto_init() { MessageInfos: file_sidecar_proto_msgTypes, }.Build() File_sidecar_proto = out.File - file_sidecar_proto_rawDesc = nil file_sidecar_proto_goTypes = nil file_sidecar_proto_depIdxs = nil } diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index a29deb38..d192df0b 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index d638e287..f500caa3 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: task.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -471,7 +472,7 @@ func (x *ProtoTask) GetRejectionReason() string { var File_task_proto protoreflect.FileDescriptor -var file_task_proto_rawDesc = []byte{ +var file_task_proto_rawDesc = string([]byte{ 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, @@ -624,16 +625,16 @@ var file_task_proto_rawDesc = []byte{ 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_task_proto_rawDescOnce sync.Once - file_task_proto_rawDescData = file_task_proto_rawDesc + file_task_proto_rawDescData []byte ) func file_task_proto_rawDescGZIP() []byte { file_task_proto_rawDescOnce.Do(func() { - file_task_proto_rawDescData = protoimpl.X.CompressGZIP(file_task_proto_rawDescData) + file_task_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_task_proto_rawDesc), len(file_task_proto_rawDesc))) }) return file_task_proto_rawDescData } @@ -697,7 +698,7 @@ func file_task_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_task_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_task_proto_rawDesc), len(file_task_proto_rawDesc)), NumEnums: 1, NumMessages: 3, NumExtensions: 0, @@ -709,7 +710,6 @@ func file_task_proto_init() { MessageInfos: file_task_proto_msgTypes, }.Build() File_task_proto = out.File - file_task_proto_rawDesc = nil file_task_proto_goTypes = nil file_task_proto_depIdxs = nil } diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index d56eac2b..806ddd65 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index 48297d71..e694ed25 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: task_requests.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -739,7 +740,7 @@ func (x *ProtoTaskResponse) GetTask() *ProtoTask { var File_task_requests_proto protoreflect.FileDescriptor -var file_task_requests_proto_rawDesc = []byte{ +var file_task_requests_proto_rawDesc = string([]byte{ 0x0a, 0x13, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, @@ -841,16 +842,16 @@ var file_task_requests_proto_rawDesc = []byte{ 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_task_requests_proto_rawDescOnce sync.Once - file_task_requests_proto_rawDescData = file_task_requests_proto_rawDesc + file_task_requests_proto_rawDescData []byte ) func file_task_requests_proto_rawDescGZIP() []byte { file_task_requests_proto_rawDescOnce.Do(func() { - file_task_requests_proto_rawDescData = protoimpl.X.CompressGZIP(file_task_requests_proto_rawDescData) + file_task_requests_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_task_requests_proto_rawDesc), len(file_task_requests_proto_rawDesc))) }) return file_task_requests_proto_rawDescData } @@ -901,7 +902,7 @@ func file_task_requests_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_task_requests_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_task_requests_proto_rawDesc), len(file_task_requests_proto_rawDesc)), NumEnums: 0, NumMessages: 13, NumExtensions: 0, @@ -912,7 +913,6 @@ func file_task_requests_proto_init() { MessageInfos: file_task_requests_proto_msgTypes, }.Build() File_task_requests_proto = out.File - file_task_requests_proto_rawDesc = nil file_task_requests_proto_goTypes = nil file_task_requests_proto_depIdxs = nil } diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 2ea6f45c..6209746d 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 3c6d035a..60c93024 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: volume_mount.proto package models @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -187,7 +188,7 @@ func (x *ProtoVolumePlacement) GetDriverNames() []string { var File_volume_mount_proto protoreflect.FileDescriptor -var file_volume_mount_proto_rawDesc = []byte{ +var file_volume_mount_proto_rawDesc = string([]byte{ 0x0a, 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5f, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, @@ -216,16 +217,16 @@ var file_volume_mount_proto_rawDesc = []byte{ 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_volume_mount_proto_rawDescOnce sync.Once - file_volume_mount_proto_rawDescData = file_volume_mount_proto_rawDesc + file_volume_mount_proto_rawDescData []byte ) func file_volume_mount_proto_rawDescGZIP() []byte { file_volume_mount_proto_rawDescOnce.Do(func() { - file_volume_mount_proto_rawDescData = protoimpl.X.CompressGZIP(file_volume_mount_proto_rawDescData) + file_volume_mount_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_volume_mount_proto_rawDesc), len(file_volume_mount_proto_rawDesc))) }) return file_volume_mount_proto_rawDescData } @@ -255,7 +256,7 @@ func file_volume_mount_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_volume_mount_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_volume_mount_proto_rawDesc), len(file_volume_mount_proto_rawDesc)), NumEnums: 0, NumMessages: 3, NumExtensions: 0, @@ -266,7 +267,6 @@ func file_volume_mount_proto_init() { MessageInfos: file_volume_mount_proto_msgTypes, }.Build() File_volume_mount_proto = out.File - file_volume_mount_proto_rawDesc = nil file_volume_mount_proto_goTypes = nil file_volume_mount_proto_depIdxs = nil } diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 54a9de81..a406afc5 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.3 +// - protoc v4.25.6 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index d768a89a..1ec3f9d6 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.3 -// protoc v5.29.3 +// protoc-gen-go v1.36.4 +// protoc v4.25.6 // source: bbs.proto package main @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" + unsafe "unsafe" ) const ( @@ -83,7 +84,7 @@ var ( var File_bbs_proto protoreflect.FileDescriptor -var file_bbs_proto_rawDesc = []byte{ +var file_bbs_proto_rawDesc = string([]byte{ 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, @@ -116,7 +117,7 @@ var file_bbs_proto_rawDesc = []byte{ 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var file_bbs_proto_goTypes = []any{ (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions @@ -144,7 +145,7 @@ func file_bbs_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_bbs_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_bbs_proto_rawDesc), len(file_bbs_proto_rawDesc)), NumEnums: 0, NumMessages: 0, NumExtensions: 5, @@ -155,7 +156,6 @@ func file_bbs_proto_init() { ExtensionInfos: file_bbs_proto_extTypes, }.Build() File_bbs_proto = out.File - file_bbs_proto_rawDesc = nil file_bbs_proto_goTypes = nil file_bbs_proto_depIdxs = nil } From 92a449b7f354b032fa50152eac2e777c475d9387 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 6 Feb 2025 22:31:24 +0000 Subject: [PATCH 130/155] Add new custom proto field bbs_default_value Regen protos --- models/actions.pb.go | 21 ++++++------ models/actions.proto | 4 +-- models/actions_bbs.pb.go | 8 ++--- models/actual_lrp.pb.go | 2 +- models/actual_lrp_requests.pb.go | 2 +- models/bbs.pb.go | 52 +++++++++++++++++++---------- models/cached_dependency.pb.go | 2 +- models/cells.pb.go | 2 +- models/certificate_properties.pb.go | 2 +- models/check_definition.pb.go | 2 +- models/desired_lrp.pb.go | 2 +- models/desired_lrp_requests.pb.go | 2 +- models/domain.pb.go | 2 +- models/environment_variables.pb.go | 2 +- models/error.pb.go | 2 +- models/evacuation.pb.go | 2 +- models/events.pb.go | 2 +- models/image_layer.pb.go | 2 +- models/log_rate_limit.pb.go | 2 +- models/metric_tags.pb.go | 2 +- models/modification_tag.pb.go | 2 +- models/network.pb.go | 2 +- models/ping.pb.go | 2 +- models/security_group.pb.go | 2 +- models/sidecar.pb.go | 2 +- models/task.pb.go | 2 +- models/task_requests.pb.go | 2 +- models/volume_mount.pb.go | 2 +- protoc-gen-go-bbs/bbs.go | 14 ++++++++ protoc-gen-go-bbs/bbs.pb.go | 52 +++++++++++++++++++---------- protoc-gen-go-bbs/bbs.proto | 1 + 31 files changed, 122 insertions(+), 78 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index e3c91eb2..af9161d5 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: actions.proto @@ -965,16 +965,17 @@ var file_actions_proto_rawDesc = string([]byte{ 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x66, 0x0a, 0x13, + 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x74, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x73, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, - 0x12, 0x1d, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, - 0x02, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, - 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, - 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, - 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, - 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x04, 0x42, 0x06, 0x82, 0x41, 0x03, 0x6e, 0x69, 0x6c, 0x48, 0x00, 0x52, 0x06, 0x6e, + 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, + 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x08, 0x82, 0x41, 0x03, 0x6e, 0x69, 0x6c, 0x18, + 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, + 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x70, 0x72, + 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, + 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) var ( diff --git a/models/actions.proto b/models/actions.proto index 4ab01a47..1d9ade9e 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -94,6 +94,6 @@ message ProtoCodependentAction { } message ProtoResourceLimits { - optional uint64 nofile = 1; - optional uint64 nproc = 2 [deprecated=true]; + optional uint64 nofile = 1 [(bbs.bbs_default_value) = "nil"]; + optional uint64 nproc = 2 [deprecated = true, (bbs.bbs_default_value) = "nil"]; } diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 4282991b..e78eac96 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1717,9 +1717,7 @@ func (m *ResourceLimits) GetNofile() *uint64 { if m != nil && m.Nofile != nil { return m.Nofile } - var defaultValue uint64 - defaultValue = 0 - return &defaultValue + return nil } func (m *ResourceLimits) SetNofile(value *uint64) { if m != nil { @@ -1735,9 +1733,7 @@ func (m *ResourceLimits) GetNproc() *uint64 { if m != nil && m.Nproc != nil { return m.Nproc } - var defaultValue uint64 - defaultValue = 0 - return &defaultValue + return nil } // Deprecated: marked deprecated in actions.proto diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index dd98e4be..240e716f 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: actual_lrp.proto diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 4a5c0c34..6a25ecc1 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: actual_lrp_requests.proto diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 000c0f57..c6c0ef88 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: bbs.proto @@ -54,6 +54,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "bytes,1030,opt,name=bbs_custom_type", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1040, + Name: "bbs.bbs_default_value", + Tag: "bytes,1040,opt,name=bbs_default_value", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -74,12 +82,14 @@ var ( E_BbsExcludeFromEqual = &file_bbs_proto_extTypes[2] // optional string bbs_custom_type = 1030; E_BbsCustomType = &file_bbs_proto_extTypes[3] + // optional string bbs_default_value = 1040; + E_BbsDefaultValue = &file_bbs_proto_extTypes[4] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[4] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[5] ) var File_bbs_proto protoreflect.FileDescriptor @@ -107,16 +117,21 @@ var file_bbs_proto_rawDesc = string([]byte{ 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x62, - 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, - 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, - 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x4d, + 0x0a, 0x11, 0x62, 0x62, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0x90, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x62, 0x62, 0x73, 0x44, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, + 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, + 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, + 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, + 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) var file_bbs_proto_goTypes = []any{ @@ -128,11 +143,12 @@ var file_bbs_proto_depIdxs = []int32{ 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions 0, // 2: bbs.bbs_exclude_from_equal:extendee -> google.protobuf.FieldOptions 0, // 3: bbs.bbs_custom_type:extendee -> google.protobuf.FieldOptions - 1, // 4: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 0, // [0:5] is the sub-list for extension extendee + 0, // 4: bbs.bbs_default_value:extendee -> google.protobuf.FieldOptions + 1, // 5: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 0, // [0:6] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -148,7 +164,7 @@ func file_bbs_proto_init() { RawDescriptor: unsafe.Slice(unsafe.StringData(file_bbs_proto_rawDesc), len(file_bbs_proto_rawDesc)), NumEnums: 0, NumMessages: 0, - NumExtensions: 5, + NumExtensions: 6, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 60b122f1..89fd2f54 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: cached_dependency.proto diff --git a/models/cells.pb.go b/models/cells.pb.go index bb442a36..92d2e323 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: cells.proto diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index ed368075..1b112764 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: certificate_properties.proto diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index bcd1bc7c..0be3e9c0 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: check_definition.proto diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index a2bd80dc..c61685ef 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: desired_lrp.proto diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index c9e919d9..501575de 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: desired_lrp_requests.proto diff --git a/models/domain.pb.go b/models/domain.pb.go index 27744b8d..524b20de 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: domain.proto diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 8647cb07..f34afbbe 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: environment_variables.proto diff --git a/models/error.pb.go b/models/error.pb.go index 766949be..21cc384b 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: error.proto diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 1c99a39d..cf316a05 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: evacuation.proto diff --git a/models/events.pb.go b/models/events.pb.go index d45a24cd..7f61bb47 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: events.proto diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index e451c3f1..842dd505 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: image_layer.proto diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index 932b8e93..c1ef7509 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: log_rate_limit.proto diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 4eac30e4..5fe219e5 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: metric_tags.proto diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index dd136efa..3697b2f4 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: modification_tag.proto diff --git a/models/network.pb.go b/models/network.pb.go index c53d032b..d0280cf1 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: network.proto diff --git a/models/ping.pb.go b/models/ping.pb.go index 0e944f6b..4a78c1c7 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: ping.proto diff --git a/models/security_group.pb.go b/models/security_group.pb.go index 23ac3123..6336b92f 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: security_group.proto diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 4ddf2176..ee796692 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: sidecar.proto diff --git a/models/task.pb.go b/models/task.pb.go index f500caa3..4dbd1e9b 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: task.proto diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index e694ed25..61146c55 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: task_requests.proto diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 60c93024..2ec024f6 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: volume_mount.proto diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index b879ce6a..98b27b29 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -280,7 +280,21 @@ func genSetter(g *protogen.GeneratedFile, copysafeName string, fieldName string, g.P("}") } +func hasDefaultValue(field *protogen.Field) bool { + defaultValue := proto.GetExtension(field.Desc.Options().(*descriptorpb.FieldOptions), E_BbsDefaultValue) + return len(defaultValue.(string)) > 0 +} + +func getDefaultValue(field *protogen.Field) string { + defaultValue := proto.GetExtension(field.Desc.Options().(*descriptorpb.FieldOptions), E_BbsDefaultValue) + return defaultValue.(string) +} + func getDefaultValueString(field *protogen.Field) string { + if hasDefaultValue(field) { + return getDefaultValue(field) + } + if field.Desc.Cardinality() == protoreflect.Repeated { return "nil" } diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 1ec3f9d6..0fd7d3b9 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.4 +// protoc-gen-go v1.36.5 // protoc v4.25.6 // source: bbs.proto @@ -54,6 +54,14 @@ var file_bbs_proto_extTypes = []protoimpl.ExtensionInfo{ Tag: "bytes,1030,opt,name=bbs_custom_type", Filename: "bbs.proto", }, + { + ExtendedType: (*descriptorpb.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1040, + Name: "bbs.bbs_default_value", + Tag: "bytes,1040,opt,name=bbs_default_value", + Filename: "bbs.proto", + }, { ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*string)(nil), @@ -74,12 +82,14 @@ var ( E_BbsExcludeFromEqual = &file_bbs_proto_extTypes[2] // optional string bbs_custom_type = 1030; E_BbsCustomType = &file_bbs_proto_extTypes[3] + // optional string bbs_default_value = 1040; + E_BbsDefaultValue = &file_bbs_proto_extTypes[4] ) // Extension fields to descriptorpb.EnumValueOptions. var ( // optional string bbs_enumvalue_customname = 2000; - E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[4] + E_BbsEnumvalueCustomname = &file_bbs_proto_extTypes[5] ) var File_bbs_proto protoreflect.FileDescriptor @@ -107,16 +117,21 @@ var file_bbs_proto_rawDesc = string([]byte{ 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x62, - 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, - 0x0a, 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, - 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, - 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x4d, + 0x0a, 0x11, 0x62, 0x62, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0x90, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x62, 0x62, 0x73, 0x44, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, + 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, + 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, + 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, + 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) var file_bbs_proto_goTypes = []any{ @@ -128,11 +143,12 @@ var file_bbs_proto_depIdxs = []int32{ 0, // 1: bbs.bbs_by_value:extendee -> google.protobuf.FieldOptions 0, // 2: bbs.bbs_exclude_from_equal:extendee -> google.protobuf.FieldOptions 0, // 3: bbs.bbs_custom_type:extendee -> google.protobuf.FieldOptions - 1, // 4: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 0, // [0:5] is the sub-list for extension extendee + 0, // 4: bbs.bbs_default_value:extendee -> google.protobuf.FieldOptions + 1, // 5: bbs.bbs_enumvalue_customname:extendee -> google.protobuf.EnumValueOptions + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 0, // [0:6] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name } @@ -148,7 +164,7 @@ func file_bbs_proto_init() { RawDescriptor: unsafe.Slice(unsafe.StringData(file_bbs_proto_rawDesc), len(file_bbs_proto_rawDesc)), NumEnums: 0, NumMessages: 0, - NumExtensions: 5, + NumExtensions: 6, NumServices: 0, }, GoTypes: file_bbs_proto_goTypes, diff --git a/protoc-gen-go-bbs/bbs.proto b/protoc-gen-go-bbs/bbs.proto index ec2aa078..788d08c5 100644 --- a/protoc-gen-go-bbs/bbs.proto +++ b/protoc-gen-go-bbs/bbs.proto @@ -10,6 +10,7 @@ extend google.protobuf.FieldOptions { optional bool bbs_by_value = 1010; optional bool bbs_exclude_from_equal = 1020; optional string bbs_custom_type = 1030; + optional string bbs_default_value = 1040; } extend google.protobuf.EnumValueOptions { From 4046871f49129a324e7b9aba2bbd7935f8b4f46c Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 7 Feb 2025 22:47:14 +0000 Subject: [PATCH 131/155] Fix typo from rebase Regen protos --- models/desired_lrp.pb.go | 219 +++++++++++++++++++++++++++++++-------- models/desired_lrp.proto | 2 +- 2 files changed, 179 insertions(+), 42 deletions(-) diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index c61685ef..e4020fa1 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -7,12 +7,11 @@ package models import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" unsafe "unsafe" - - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -360,6 +359,7 @@ func (x *ProtoDesiredLRPRunInfo) GetImageLayers() []*ProtoImageLayer { return nil } +// Deprecated: Marked as deprecated in desired_lrp.proto. func (x *ProtoDesiredLRPRunInfo) GetMetricTags() map[string]*ProtoMetricTagValue { if x != nil { return x.MetricTags @@ -1015,7 +1015,7 @@ var file_desired_lrp_proto_rawDesc = string([]byte{ 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x22, 0xff, 0x0c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, + 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x22, 0x83, 0x0d, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4c, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, @@ -1099,48 +1099,185 @@ var file_desired_lrp_proto_rawDesc = string([]byte{ 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x0b, 0x6d, + 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x54, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, - 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, - 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, - 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, - 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, - 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, + 0x42, 0x02, 0x18, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, + 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, + 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, + 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, + 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, + 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, + 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, + 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, - 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xeb, 0x02, - 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, - 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, - 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0xeb, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, + 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, + 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, + 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, + 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x7b, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, + 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1f, 0x0a, 0x08, 0x6c, + 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x9a, 0x01, 0x0a, + 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, + 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1d, 0x0a, 0x07, 0x64, + 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, + 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, + 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0xe2, 0x0f, 0x0a, 0x0f, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x27, 0x0a, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, + 0x73, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x73, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, + 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, + 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, + 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, + 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, + 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, + 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, + 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, + 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, + 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, + 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, + 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, + 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x23, 0x0a, + 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, + 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, + 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, + 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, + 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x0c, 0x6d, 0x65, 0x74, + 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x61, + 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, + 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, + 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x48, 0x0a, + 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, + 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, + 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, + 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, + 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, + 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, + 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, + 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, + 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, + 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, + 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, + 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, + 0x1d, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, + 0x70, 0x69, 0x64, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, + 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, + 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, + 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, + 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, + 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index 9133fe63..86e00f5f 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -67,7 +67,7 @@ message ProtoDesiredLRPRunInfo { repeated ProtoImageLayer image_layers = 24 [json_name = "image_layers"]; - map metric_tags = 25 [json_name = "metric_tags", deprecated=true]]; + map metric_tags = 25 [json_name = "metric_tags", deprecated=true]; repeated ProtoSidecar sidecars = 26; ProtoLogRateLimit log_rate_limit = 27 [json_name = "log_rate_limit"]; From 055e495b9608e74e7a9bdf6967d08dadc27a0a07 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 10 Feb 2025 15:53:34 +0000 Subject: [PATCH 132/155] Fix merge issues --- db/sqldb/desired_lrp_db.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/sqldb/desired_lrp_db.go b/db/sqldb/desired_lrp_db.go index 83113587..a2bd1104 100644 --- a/db/sqldb/desired_lrp_db.go +++ b/db/sqldb/desired_lrp_db.go @@ -493,29 +493,18 @@ func (db *SQLDB) fetchDesiredLRPRoutingInfo(logger lager.Logger, scanner helpers } routingInfo.Routes = &routes -<<<<<<< HEAD var metricTags map[string]*models.MetricTagValue decodedDesiredData, err := db.encoder.Decode(metricTagsData) -======= - var runInfo models.DesiredLRPRunInfo - var protoRunInfo models.ProtoDesiredLRPRunInfo - err = db.deserializeModel(logger, runInfoData, &protoRunInfo) ->>>>>>> 0576c2d9 (Struct and naming changes due to new protobuf) if err != nil { logger.Error("failed-decrypting-metric-tags", err) return nil, err } -<<<<<<< HEAD err = json.Unmarshal(decodedDesiredData, &metricTags) if err != nil { logger.Error("failed-parsing-metric-tags", err) return nil, err } routingInfo.MetricTags = metricTags -======= - runInfo = *protoRunInfo.FromProto() - routingInfo.MetricTags = runInfo.MetricTags ->>>>>>> 0576c2d9 (Struct and naming changes due to new protobuf) routingInfo.ModificationTag = &models.ModificationTag{Epoch: modificationTagEpoch, Index: modificationTagIndex} return routingInfo, nil From 22f6036265e1c05784dc364e7f649f6112e7cc7c Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 10 Feb 2025 16:22:26 +0000 Subject: [PATCH 133/155] Final removal of old protobuf models --- protomodels/desired_lrp.gogoproto.go | 7242 -------------------------- 1 file changed, 7242 deletions(-) delete mode 100644 protomodels/desired_lrp.gogoproto.go diff --git a/protomodels/desired_lrp.gogoproto.go b/protomodels/desired_lrp.gogoproto.go deleted file mode 100644 index ce9de5c6..00000000 --- a/protomodels/desired_lrp.gogoproto.go +++ /dev/null @@ -1,7242 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: desired_lrp.proto - -package protomodels - -import ( - bytes "bytes" - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - io "io" - math "math" - math_bits "math/bits" - reflect "reflect" - strings "strings" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -type DesiredLRPSchedulingInfo struct { - DesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,json=desiredLrpKey,proto3,embedded=desired_lrp_key" json:""` - Annotation string `protobuf:"bytes,2,opt,name=annotation,proto3" json:"annotation"` - Instances int32 `protobuf:"varint,3,opt,name=instances,proto3" json:"instances"` - DesiredLRPResource `protobuf:"bytes,4,opt,name=desired_lrp_resource,json=desiredLrpResource,proto3,embedded=desired_lrp_resource" json:""` - Routes Routes `protobuf:"bytes,5,opt,name=routes,proto3,customtype=Routes" json:"routes"` - ModificationTag `protobuf:"bytes,6,opt,name=modification_tag,json=modificationTag,proto3,embedded=modification_tag" json:""` - VolumePlacement *VolumePlacement `protobuf:"bytes,7,opt,name=volume_placement,json=volumePlacement,proto3" json:"volume_placement,omitempty"` - PlacementTags []string `protobuf:"bytes,8,rep,name=PlacementTags,proto3" json:"placement_tags,omitempty"` -} - -func (m *DesiredLRPSchedulingInfo) Reset() { *m = DesiredLRPSchedulingInfo{} } -func (*DesiredLRPSchedulingInfo) ProtoMessage() {} -func (*DesiredLRPSchedulingInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_f592e9299b63d68c, []int{0} -} -func (m *DesiredLRPSchedulingInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPSchedulingInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPSchedulingInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPSchedulingInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPSchedulingInfo.Merge(m, src) -} -func (m *DesiredLRPSchedulingInfo) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPSchedulingInfo) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPSchedulingInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPSchedulingInfo proto.InternalMessageInfo - -func (m *DesiredLRPSchedulingInfo) GetAnnotation() string { - if m != nil { - return m.Annotation - } - return "" -} - -func (m *DesiredLRPSchedulingInfo) GetInstances() int32 { - if m != nil { - return m.Instances - } - return 0 -} - -func (m *DesiredLRPSchedulingInfo) GetVolumePlacement() *VolumePlacement { - if m != nil { - return m.VolumePlacement - } - return nil -} - -func (m *DesiredLRPSchedulingInfo) GetPlacementTags() []string { - if m != nil { - return m.PlacementTags - } - return nil -} - -type DesiredLRPRunInfo struct { - DesiredLRPKey `protobuf:"bytes,1,opt,name=desired_lrp_key,json=desiredLrpKey,proto3,embedded=desired_lrp_key" json:""` - EnvironmentVariables []EnvironmentVariable `protobuf:"bytes,2,rep,name=environment_variables,json=environmentVariables,proto3" json:"env"` - Setup *Action `protobuf:"bytes,3,opt,name=setup,proto3" json:"setup,omitempty"` - Action *Action `protobuf:"bytes,4,opt,name=action,proto3" json:"action,omitempty"` - Monitor *Action `protobuf:"bytes,5,opt,name=monitor,proto3" json:"monitor,omitempty"` - DeprecatedStartTimeoutS uint32 `protobuf:"varint,6,opt,name=deprecated_start_timeout_s,json=deprecatedStartTimeoutS,proto3" json:"start_timeout,omitempty"` // Deprecated: Do not use. - Privileged bool `protobuf:"varint,7,opt,name=privileged,proto3" json:"privileged"` - CpuWeight uint32 `protobuf:"varint,8,opt,name=cpu_weight,json=cpuWeight,proto3" json:"cpu_weight"` - Ports []uint32 `protobuf:"varint,9,rep,name=ports,proto3" json:"ports,omitempty"` - EgressRules []SecurityGroupRule `protobuf:"bytes,10,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules"` - LogSource string `protobuf:"bytes,11,opt,name=log_source,json=logSource,proto3" json:"log_source"` - MetricsGuid string `protobuf:"bytes,12,opt,name=metrics_guid,json=metricsGuid,proto3" json:"metrics_guid"` // Deprecated: Do not use. - CreatedAt int64 `protobuf:"varint,13,opt,name=created_at,json=createdAt,proto3" json:"created_at"` - CachedDependencies []*CachedDependency `protobuf:"bytes,14,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` - LegacyDownloadUser string `protobuf:"bytes,15,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` // Deprecated: Do not use. - TrustedSystemCertificatesPath string `protobuf:"bytes,16,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*VolumeMount `protobuf:"bytes,17,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` - Network *Network `protobuf:"bytes,18,opt,name=network,proto3" json:"network,omitempty"` - StartTimeoutMs int64 `protobuf:"varint,19,opt,name=start_timeout_ms,json=startTimeoutMs,proto3" json:"start_timeout_ms"` - CertificateProperties *CertificateProperties `protobuf:"bytes,20,opt,name=certificate_properties,json=certificateProperties,proto3" json:"certificate_properties,omitempty"` - ImageUsername string `protobuf:"bytes,21,opt,name=image_username,json=imageUsername,proto3" json:"image_username,omitempty"` - ImagePassword string `protobuf:"bytes,22,opt,name=image_password,json=imagePassword,proto3" json:"image_password,omitempty"` - CheckDefinition *CheckDefinition `protobuf:"bytes,23,opt,name=check_definition,json=checkDefinition,proto3" json:"check_definition,omitempty"` - ImageLayers []*ImageLayer `protobuf:"bytes,24,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` - MetricTags map[string]*MetricTagValue `protobuf:"bytes,25,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. - Sidecars []*Sidecar `protobuf:"bytes,26,rep,name=sidecars,proto3" json:"sidecars,omitempty"` - LogRateLimit *LogRateLimit `protobuf:"bytes,27,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` -} - -func (m *DesiredLRPRunInfo) Reset() { *m = DesiredLRPRunInfo{} } -func (*DesiredLRPRunInfo) ProtoMessage() {} -func (*DesiredLRPRunInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_f592e9299b63d68c, []int{1} -} -func (m *DesiredLRPRunInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPRunInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPRunInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPRunInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPRunInfo.Merge(m, src) -} -func (m *DesiredLRPRunInfo) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPRunInfo) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPRunInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPRunInfo proto.InternalMessageInfo - -func (m *DesiredLRPRunInfo) GetEnvironmentVariables() []EnvironmentVariable { - if m != nil { - return m.EnvironmentVariables - } - return nil -} - -func (m *DesiredLRPRunInfo) GetSetup() *Action { - if m != nil { - return m.Setup - } - return nil -} - -func (m *DesiredLRPRunInfo) GetAction() *Action { - if m != nil { - return m.Action - } - return nil -} - -func (m *DesiredLRPRunInfo) GetMonitor() *Action { - if m != nil { - return m.Monitor - } - return nil -} - -// Deprecated: Do not use. -func (m *DesiredLRPRunInfo) GetDeprecatedStartTimeoutS() uint32 { - if m != nil { - return m.DeprecatedStartTimeoutS - } - return 0 -} - -func (m *DesiredLRPRunInfo) GetPrivileged() bool { - if m != nil { - return m.Privileged - } - return false -} - -func (m *DesiredLRPRunInfo) GetCpuWeight() uint32 { - if m != nil { - return m.CpuWeight - } - return 0 -} - -func (m *DesiredLRPRunInfo) GetPorts() []uint32 { - if m != nil { - return m.Ports - } - return nil -} - -func (m *DesiredLRPRunInfo) GetEgressRules() []SecurityGroupRule { - if m != nil { - return m.EgressRules - } - return nil -} - -func (m *DesiredLRPRunInfo) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -// Deprecated: Do not use. -func (m *DesiredLRPRunInfo) GetMetricsGuid() string { - if m != nil { - return m.MetricsGuid - } - return "" -} - -func (m *DesiredLRPRunInfo) GetCreatedAt() int64 { - if m != nil { - return m.CreatedAt - } - return 0 -} - -func (m *DesiredLRPRunInfo) GetCachedDependencies() []*CachedDependency { - if m != nil { - return m.CachedDependencies - } - return nil -} - -// Deprecated: Do not use. -func (m *DesiredLRPRunInfo) GetLegacyDownloadUser() string { - if m != nil { - return m.LegacyDownloadUser - } - return "" -} - -func (m *DesiredLRPRunInfo) GetTrustedSystemCertificatesPath() string { - if m != nil { - return m.TrustedSystemCertificatesPath - } - return "" -} - -func (m *DesiredLRPRunInfo) GetVolumeMounts() []*VolumeMount { - if m != nil { - return m.VolumeMounts - } - return nil -} - -func (m *DesiredLRPRunInfo) GetNetwork() *Network { - if m != nil { - return m.Network - } - return nil -} - -func (m *DesiredLRPRunInfo) GetStartTimeoutMs() int64 { - if m != nil { - return m.StartTimeoutMs - } - return 0 -} - -func (m *DesiredLRPRunInfo) GetCertificateProperties() *CertificateProperties { - if m != nil { - return m.CertificateProperties - } - return nil -} - -func (m *DesiredLRPRunInfo) GetImageUsername() string { - if m != nil { - return m.ImageUsername - } - return "" -} - -func (m *DesiredLRPRunInfo) GetImagePassword() string { - if m != nil { - return m.ImagePassword - } - return "" -} - -func (m *DesiredLRPRunInfo) GetCheckDefinition() *CheckDefinition { - if m != nil { - return m.CheckDefinition - } - return nil -} - -func (m *DesiredLRPRunInfo) GetImageLayers() []*ImageLayer { - if m != nil { - return m.ImageLayers - } - return nil -} - -// Deprecated: Do not use. -func (m *DesiredLRPRunInfo) GetMetricTags() map[string]*MetricTagValue { - if m != nil { - return m.MetricTags - } - return nil -} - -func (m *DesiredLRPRunInfo) GetSidecars() []*Sidecar { - if m != nil { - return m.Sidecars - } - return nil -} - -func (m *DesiredLRPRunInfo) GetLogRateLimit() *LogRateLimit { - if m != nil { - return m.LogRateLimit - } - return nil -} - -// helper message for marshalling routes -type ProtoRoutes struct { - Routes map[string][]byte `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` -} - -func (m *ProtoRoutes) Reset() { *m = ProtoRoutes{} } -func (*ProtoRoutes) ProtoMessage() {} -func (*ProtoRoutes) Descriptor() ([]byte, []int) { - return fileDescriptor_f592e9299b63d68c, []int{2} -} -func (m *ProtoRoutes) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ProtoRoutes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ProtoRoutes.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ProtoRoutes) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProtoRoutes.Merge(m, src) -} -func (m *ProtoRoutes) XXX_Size() int { - return m.Size() -} -func (m *ProtoRoutes) XXX_DiscardUnknown() { - xxx_messageInfo_ProtoRoutes.DiscardUnknown(m) -} - -var xxx_messageInfo_ProtoRoutes proto.InternalMessageInfo - -func (m *ProtoRoutes) GetRoutes() map[string][]byte { - if m != nil { - return m.Routes - } - return nil -} - -type DesiredLRPUpdate struct { - // Types that are valid to be assigned to OptionalInstances: - // - // *DesiredLRPUpdate_Instances - OptionalInstances isDesiredLRPUpdate_OptionalInstances `protobuf_oneof:"optional_instances"` - Routes *Routes `protobuf:"bytes,2,opt,name=routes,proto3,customtype=Routes" json:"routes,omitempty"` - // Types that are valid to be assigned to OptionalAnnotation: - // - // *DesiredLRPUpdate_Annotation - OptionalAnnotation isDesiredLRPUpdate_OptionalAnnotation `protobuf_oneof:"optional_annotation"` - MetricTags map[string]*MetricTagValue `protobuf:"bytes,4,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` -} - -func (m *DesiredLRPUpdate) Reset() { *m = DesiredLRPUpdate{} } -func (*DesiredLRPUpdate) ProtoMessage() {} -func (*DesiredLRPUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_f592e9299b63d68c, []int{3} -} -func (m *DesiredLRPUpdate) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPUpdate.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPUpdate) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPUpdate.Merge(m, src) -} -func (m *DesiredLRPUpdate) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPUpdate) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPUpdate.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPUpdate proto.InternalMessageInfo - -type isDesiredLRPUpdate_OptionalInstances interface { - isDesiredLRPUpdate_OptionalInstances() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} -type isDesiredLRPUpdate_OptionalAnnotation interface { - isDesiredLRPUpdate_OptionalAnnotation() - Equal(interface{}) bool - MarshalTo([]byte) (int, error) - Size() int -} - -type DesiredLRPUpdate_Instances struct { - Instances int32 `protobuf:"varint,1,opt,name=instances,proto3,oneof" json:"instances,omitempty"` -} -type DesiredLRPUpdate_Annotation struct { - Annotation string `protobuf:"bytes,3,opt,name=annotation,proto3,oneof" json:"annotation,omitempty"` -} - -func (*DesiredLRPUpdate_Instances) isDesiredLRPUpdate_OptionalInstances() {} -func (*DesiredLRPUpdate_Annotation) isDesiredLRPUpdate_OptionalAnnotation() {} - -func (m *DesiredLRPUpdate) GetOptionalInstances() isDesiredLRPUpdate_OptionalInstances { - if m != nil { - return m.OptionalInstances - } - return nil -} -func (m *DesiredLRPUpdate) GetOptionalAnnotation() isDesiredLRPUpdate_OptionalAnnotation { - if m != nil { - return m.OptionalAnnotation - } - return nil -} - -func (m *DesiredLRPUpdate) GetInstances() int32 { - if x, ok := m.GetOptionalInstances().(*DesiredLRPUpdate_Instances); ok { - return x.Instances - } - return 0 -} - -func (m *DesiredLRPUpdate) GetAnnotation() string { - if x, ok := m.GetOptionalAnnotation().(*DesiredLRPUpdate_Annotation); ok { - return x.Annotation - } - return "" -} - -func (m *DesiredLRPUpdate) GetMetricTags() map[string]*MetricTagValue { - if m != nil { - return m.MetricTags - } - return nil -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*DesiredLRPUpdate) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*DesiredLRPUpdate_Instances)(nil), - (*DesiredLRPUpdate_Annotation)(nil), - } -} - -type DesiredLRPKey struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain"` - LogGuid string `protobuf:"bytes,3,opt,name=log_guid,json=logGuid,proto3" json:"log_guid"` -} - -func (m *DesiredLRPKey) Reset() { *m = DesiredLRPKey{} } -func (*DesiredLRPKey) ProtoMessage() {} -func (*DesiredLRPKey) Descriptor() ([]byte, []int) { - return fileDescriptor_f592e9299b63d68c, []int{4} -} -func (m *DesiredLRPKey) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPKey.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPKey) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPKey.Merge(m, src) -} -func (m *DesiredLRPKey) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPKey) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPKey.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPKey proto.InternalMessageInfo - -func (m *DesiredLRPKey) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *DesiredLRPKey) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *DesiredLRPKey) GetLogGuid() string { - if m != nil { - return m.LogGuid - } - return "" -} - -type DesiredLRPResource struct { - MemoryMb int32 `protobuf:"varint,1,opt,name=memory_mb,json=memoryMb,proto3" json:"memory_mb"` - DiskMb int32 `protobuf:"varint,2,opt,name=disk_mb,json=diskMb,proto3" json:"disk_mb"` - RootFs string `protobuf:"bytes,3,opt,name=root_fs,json=rootFs,proto3" json:"rootfs"` - MaxPids int32 `protobuf:"varint,4,opt,name=max_pids,json=maxPids,proto3" json:"max_pids"` -} - -func (m *DesiredLRPResource) Reset() { *m = DesiredLRPResource{} } -func (*DesiredLRPResource) ProtoMessage() {} -func (*DesiredLRPResource) Descriptor() ([]byte, []int) { - return fileDescriptor_f592e9299b63d68c, []int{5} -} -func (m *DesiredLRPResource) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRPResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRPResource.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRPResource) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRPResource.Merge(m, src) -} -func (m *DesiredLRPResource) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRPResource) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRPResource.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRPResource proto.InternalMessageInfo - -func (m *DesiredLRPResource) GetMemoryMb() int32 { - if m != nil { - return m.MemoryMb - } - return 0 -} - -func (m *DesiredLRPResource) GetDiskMb() int32 { - if m != nil { - return m.DiskMb - } - return 0 -} - -func (m *DesiredLRPResource) GetRootFs() string { - if m != nil { - return m.RootFs - } - return "" -} - -func (m *DesiredLRPResource) GetMaxPids() int32 { - if m != nil { - return m.MaxPids - } - return 0 -} - -type DesiredLRP struct { - ProcessGuid string `protobuf:"bytes,1,opt,name=process_guid,json=processGuid,proto3" json:"process_guid"` - Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain"` - RootFs string `protobuf:"bytes,3,opt,name=root_fs,json=rootFs,proto3" json:"rootfs"` - Instances int32 `protobuf:"varint,4,opt,name=instances,proto3" json:"instances"` - EnvironmentVariables []*EnvironmentVariable `protobuf:"bytes,5,rep,name=environment_variables,json=environmentVariables,proto3" json:"env"` - Setup *Action `protobuf:"bytes,6,opt,name=setup,proto3" json:"setup,omitempty"` - Action *Action `protobuf:"bytes,7,opt,name=action,proto3" json:"action,omitempty"` - StartTimeoutMs int64 `protobuf:"varint,27,opt,name=start_timeout_ms,json=startTimeoutMs,proto3" json:"start_timeout_ms"` - DeprecatedStartTimeoutS uint32 `protobuf:"varint,8,opt,name=deprecated_start_timeout_s,json=deprecatedStartTimeoutS,proto3" json:"deprecated_timeout_ns,omitempty"` // Deprecated: Do not use. - Monitor *Action `protobuf:"bytes,9,opt,name=monitor,proto3" json:"monitor,omitempty"` - DiskMb int32 `protobuf:"varint,10,opt,name=disk_mb,json=diskMb,proto3" json:"disk_mb"` - MemoryMb int32 `protobuf:"varint,11,opt,name=memory_mb,json=memoryMb,proto3" json:"memory_mb"` - CpuWeight uint32 `protobuf:"varint,12,opt,name=cpu_weight,json=cpuWeight,proto3" json:"cpu_weight"` - Privileged bool `protobuf:"varint,13,opt,name=privileged,proto3" json:"privileged"` - Ports []uint32 `protobuf:"varint,14,rep,name=ports,proto3" json:"ports,omitempty"` - Routes *Routes `protobuf:"bytes,15,opt,name=routes,proto3,customtype=Routes" json:"routes,omitempty"` - LogSource string `protobuf:"bytes,16,opt,name=log_source,json=logSource,proto3" json:"log_source"` - LogGuid string `protobuf:"bytes,17,opt,name=log_guid,json=logGuid,proto3" json:"log_guid"` - MetricsGuid string `protobuf:"bytes,18,opt,name=metrics_guid,json=metricsGuid,proto3" json:"metrics_guid"` // Deprecated: Do not use. - Annotation string `protobuf:"bytes,19,opt,name=annotation,proto3" json:"annotation"` - EgressRules []*SecurityGroupRule `protobuf:"bytes,20,rep,name=egress_rules,json=egressRules,proto3" json:"egress_rules,omitempty"` - ModificationTag *ModificationTag `protobuf:"bytes,21,opt,name=modification_tag,json=modificationTag,proto3" json:"modification_tag,omitempty"` - CachedDependencies []*CachedDependency `protobuf:"bytes,22,rep,name=cached_dependencies,json=cachedDependencies,proto3" json:"cached_dependencies,omitempty"` - LegacyDownloadUser string `protobuf:"bytes,23,opt,name=legacy_download_user,json=legacyDownloadUser,proto3" json:"legacy_download_user,omitempty"` // Deprecated: Do not use. - TrustedSystemCertificatesPath string `protobuf:"bytes,24,opt,name=trusted_system_certificates_path,json=trustedSystemCertificatesPath,proto3" json:"trusted_system_certificates_path,omitempty"` - VolumeMounts []*VolumeMount `protobuf:"bytes,25,rep,name=volume_mounts,json=volumeMounts,proto3" json:"volume_mounts,omitempty"` - Network *Network `protobuf:"bytes,26,opt,name=network,proto3" json:"network,omitempty"` - PlacementTags []string `protobuf:"bytes,28,rep,name=PlacementTags,proto3" json:"placement_tags,omitempty"` - MaxPids int32 `protobuf:"varint,29,opt,name=max_pids,json=maxPids,proto3" json:"max_pids"` - CertificateProperties *CertificateProperties `protobuf:"bytes,30,opt,name=certificate_properties,json=certificateProperties,proto3" json:"certificate_properties,omitempty"` - ImageUsername string `protobuf:"bytes,31,opt,name=image_username,json=imageUsername,proto3" json:"image_username,omitempty"` - ImagePassword string `protobuf:"bytes,32,opt,name=image_password,json=imagePassword,proto3" json:"image_password,omitempty"` - CheckDefinition *CheckDefinition `protobuf:"bytes,33,opt,name=check_definition,json=checkDefinition,proto3" json:"check_definition,omitempty"` - ImageLayers []*ImageLayer `protobuf:"bytes,34,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` - MetricTags map[string]*MetricTagValue `protobuf:"bytes,35,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Sidecars []*Sidecar `protobuf:"bytes,36,rep,name=sidecars,proto3" json:"sidecars,omitempty"` - LogRateLimit *LogRateLimit `protobuf:"bytes,37,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` -} - -func (m *DesiredLRP) Reset() { *m = DesiredLRP{} } -func (*DesiredLRP) ProtoMessage() {} -func (*DesiredLRP) Descriptor() ([]byte, []int) { - return fileDescriptor_f592e9299b63d68c, []int{6} -} -func (m *DesiredLRP) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DesiredLRP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DesiredLRP.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *DesiredLRP) XXX_Merge(src proto.Message) { - xxx_messageInfo_DesiredLRP.Merge(m, src) -} -func (m *DesiredLRP) XXX_Size() int { - return m.Size() -} -func (m *DesiredLRP) XXX_DiscardUnknown() { - xxx_messageInfo_DesiredLRP.DiscardUnknown(m) -} - -var xxx_messageInfo_DesiredLRP proto.InternalMessageInfo - -func (m *DesiredLRP) GetProcessGuid() string { - if m != nil { - return m.ProcessGuid - } - return "" -} - -func (m *DesiredLRP) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *DesiredLRP) GetRootFs() string { - if m != nil { - return m.RootFs - } - return "" -} - -func (m *DesiredLRP) GetInstances() int32 { - if m != nil { - return m.Instances - } - return 0 -} - -func (m *DesiredLRP) GetEnvironmentVariables() []*EnvironmentVariable { - if m != nil { - return m.EnvironmentVariables - } - return nil -} - -func (m *DesiredLRP) GetSetup() *Action { - if m != nil { - return m.Setup - } - return nil -} - -func (m *DesiredLRP) GetAction() *Action { - if m != nil { - return m.Action - } - return nil -} - -func (m *DesiredLRP) GetStartTimeoutMs() int64 { - if m != nil { - return m.StartTimeoutMs - } - return 0 -} - -// Deprecated: Do not use. -func (m *DesiredLRP) GetDeprecatedStartTimeoutS() uint32 { - if m != nil { - return m.DeprecatedStartTimeoutS - } - return 0 -} - -func (m *DesiredLRP) GetMonitor() *Action { - if m != nil { - return m.Monitor - } - return nil -} - -func (m *DesiredLRP) GetDiskMb() int32 { - if m != nil { - return m.DiskMb - } - return 0 -} - -func (m *DesiredLRP) GetMemoryMb() int32 { - if m != nil { - return m.MemoryMb - } - return 0 -} - -func (m *DesiredLRP) GetCpuWeight() uint32 { - if m != nil { - return m.CpuWeight - } - return 0 -} - -func (m *DesiredLRP) GetPrivileged() bool { - if m != nil { - return m.Privileged - } - return false -} - -func (m *DesiredLRP) GetPorts() []uint32 { - if m != nil { - return m.Ports - } - return nil -} - -func (m *DesiredLRP) GetLogSource() string { - if m != nil { - return m.LogSource - } - return "" -} - -func (m *DesiredLRP) GetLogGuid() string { - if m != nil { - return m.LogGuid - } - return "" -} - -// Deprecated: Do not use. -func (m *DesiredLRP) GetMetricsGuid() string { - if m != nil { - return m.MetricsGuid - } - return "" -} - -func (m *DesiredLRP) GetAnnotation() string { - if m != nil { - return m.Annotation - } - return "" -} - -func (m *DesiredLRP) GetEgressRules() []*SecurityGroupRule { - if m != nil { - return m.EgressRules - } - return nil -} - -func (m *DesiredLRP) GetModificationTag() *ModificationTag { - if m != nil { - return m.ModificationTag - } - return nil -} - -func (m *DesiredLRP) GetCachedDependencies() []*CachedDependency { - if m != nil { - return m.CachedDependencies - } - return nil -} - -// Deprecated: Do not use. -func (m *DesiredLRP) GetLegacyDownloadUser() string { - if m != nil { - return m.LegacyDownloadUser - } - return "" -} - -func (m *DesiredLRP) GetTrustedSystemCertificatesPath() string { - if m != nil { - return m.TrustedSystemCertificatesPath - } - return "" -} - -func (m *DesiredLRP) GetVolumeMounts() []*VolumeMount { - if m != nil { - return m.VolumeMounts - } - return nil -} - -func (m *DesiredLRP) GetNetwork() *Network { - if m != nil { - return m.Network - } - return nil -} - -func (m *DesiredLRP) GetPlacementTags() []string { - if m != nil { - return m.PlacementTags - } - return nil -} - -func (m *DesiredLRP) GetMaxPids() int32 { - if m != nil { - return m.MaxPids - } - return 0 -} - -func (m *DesiredLRP) GetCertificateProperties() *CertificateProperties { - if m != nil { - return m.CertificateProperties - } - return nil -} - -func (m *DesiredLRP) GetImageUsername() string { - if m != nil { - return m.ImageUsername - } - return "" -} - -func (m *DesiredLRP) GetImagePassword() string { - if m != nil { - return m.ImagePassword - } - return "" -} - -func (m *DesiredLRP) GetCheckDefinition() *CheckDefinition { - if m != nil { - return m.CheckDefinition - } - return nil -} - -func (m *DesiredLRP) GetImageLayers() []*ImageLayer { - if m != nil { - return m.ImageLayers - } - return nil -} - -func (m *DesiredLRP) GetMetricTags() map[string]*MetricTagValue { - if m != nil { - return m.MetricTags - } - return nil -} - -func (m *DesiredLRP) GetSidecars() []*Sidecar { - if m != nil { - return m.Sidecars - } - return nil -} - -func (m *DesiredLRP) GetLogRateLimit() *LogRateLimit { - if m != nil { - return m.LogRateLimit - } - return nil -} - -func init() { - proto.RegisterType((*DesiredLRPSchedulingInfo)(nil), "models.DesiredLRPSchedulingInfo") - proto.RegisterType((*DesiredLRPRunInfo)(nil), "models.DesiredLRPRunInfo") - proto.RegisterMapType((map[string]*MetricTagValue)(nil), "models.DesiredLRPRunInfo.MetricTagsEntry") - proto.RegisterType((*ProtoRoutes)(nil), "models.ProtoRoutes") - proto.RegisterMapType((map[string][]byte)(nil), "models.ProtoRoutes.RoutesEntry") - proto.RegisterType((*DesiredLRPUpdate)(nil), "models.DesiredLRPUpdate") - proto.RegisterMapType((map[string]*MetricTagValue)(nil), "models.DesiredLRPUpdate.MetricTagsEntry") - proto.RegisterType((*DesiredLRPKey)(nil), "models.DesiredLRPKey") - proto.RegisterType((*DesiredLRPResource)(nil), "models.DesiredLRPResource") - proto.RegisterType((*DesiredLRP)(nil), "models.DesiredLRP") - proto.RegisterMapType((map[string]*MetricTagValue)(nil), "models.DesiredLRP.MetricTagsEntry") -} - -func init() { proto.RegisterFile("desired_lrp.proto", fileDescriptor_f592e9299b63d68c) } - -var fileDescriptor_f592e9299b63d68c = []byte{ - // 1797 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xe7, 0xea, 0x0f, 0x29, 0x0e, 0x49, 0x89, 0x1a, 0x51, 0xd2, 0x98, 0xb6, 0xb9, 0x2c, 0x63, - 0xb7, 0x4c, 0x93, 0x28, 0x80, 0x93, 0xa2, 0x69, 0x5a, 0x14, 0xc8, 0xda, 0xa9, 0x63, 0x58, 0x0a, - 0x84, 0x91, 0xed, 0xa2, 0x01, 0x8a, 0xc5, 0x6a, 0x77, 0xb4, 0x5a, 0x78, 0x77, 0x67, 0xb1, 0x33, - 0x2b, 0x87, 0xb7, 0xf6, 0xd8, 0x5b, 0xfb, 0x2d, 0xfa, 0x01, 0x0a, 0xf4, 0xd4, 0x7b, 0x8e, 0x3e, - 0x06, 0x3d, 0x10, 0xb1, 0x7c, 0x29, 0x78, 0xca, 0x47, 0x28, 0x66, 0xf6, 0x3f, 0x49, 0x53, 0x74, - 0x62, 0x23, 0x27, 0xce, 0xfc, 0xde, 0x9f, 0x7d, 0xf3, 0xe6, 0xed, 0x7b, 0xbf, 0x25, 0xd8, 0xb6, - 0x08, 0x73, 0x42, 0x62, 0xe9, 0x6e, 0x18, 0x1c, 0x04, 0x21, 0xe5, 0x14, 0x56, 0x3d, 0x6a, 0x11, - 0x97, 0x75, 0x3f, 0xb0, 0x1d, 0x7e, 0x1e, 0x9d, 0x1e, 0x98, 0xd4, 0xfb, 0xd0, 0xa6, 0x36, 0xfd, - 0x50, 0x8a, 0x4f, 0xa3, 0x33, 0xb9, 0x93, 0x1b, 0xb9, 0x8a, 0xcd, 0xba, 0x2d, 0xc3, 0xe4, 0x0e, - 0xf5, 0x59, 0xb2, 0xdd, 0x37, 0x0d, 0xf3, 0x9c, 0x58, 0xba, 0x45, 0x02, 0xe2, 0x5b, 0xc4, 0x37, - 0x47, 0x89, 0xe0, 0x86, 0x49, 0x42, 0xee, 0x9c, 0x39, 0xa6, 0xc1, 0x89, 0x1e, 0x84, 0x34, 0x10, - 0x5b, 0x92, 0x9a, 0x5d, 0x27, 0xfe, 0x85, 0x13, 0x52, 0xdf, 0x23, 0x3e, 0xd7, 0x2f, 0x8c, 0xd0, - 0x31, 0x4e, 0xdd, 0x4c, 0xb8, 0xe7, 0x51, 0x2b, 0xb6, 0x74, 0xa8, 0xaf, 0x73, 0xc3, 0x4e, 0x1f, - 0xed, 0x13, 0xfe, 0x8c, 0x86, 0x4f, 0x93, 0x6d, 0x87, 0x11, 0x33, 0x0a, 0x1d, 0x3e, 0xd2, 0xed, - 0x90, 0x46, 0xc9, 0xb1, 0xba, 0xf0, 0x82, 0xba, 0x91, 0x47, 0x74, 0x8f, 0x46, 0x3e, 0x4f, 0x1d, - 0x9a, 0xe7, 0xc4, 0x7c, 0xaa, 0x5b, 0xe4, 0xcc, 0xf1, 0x1d, 0xe1, 0x34, 0xc1, 0xb7, 0x1d, 0xcf, - 0xb0, 0x89, 0xee, 0x1a, 0x23, 0x12, 0xa6, 0x90, 0x47, 0x78, 0xe8, 0x98, 0xe2, 0xa9, 0x69, 0x38, - 0x2d, 0xe6, 0x58, 0xc4, 0x34, 0x52, 0x8d, 0x8e, 0x4b, 0x6d, 0x3d, 0x14, 0xa7, 0x72, 0x1d, 0xcf, - 0x49, 0x1e, 0x31, 0xf8, 0xf7, 0x1a, 0x40, 0xf7, 0xe2, 0x1c, 0x1f, 0xe2, 0xe3, 0x13, 0x91, 0x93, - 0xc8, 0x75, 0x7c, 0xfb, 0x81, 0x7f, 0x46, 0xe1, 0x43, 0xb0, 0x55, 0xc8, 0xbf, 0xfe, 0x94, 0x8c, - 0x90, 0xd2, 0x57, 0x86, 0x8d, 0x3b, 0xbb, 0x07, 0xf1, 0x25, 0x1c, 0xe4, 0xa6, 0x0f, 0xc9, 0x48, - 0x6b, 0x7e, 0x33, 0x56, 0x2b, 0xcf, 0xc7, 0xaa, 0x32, 0x19, 0xab, 0x15, 0xdc, 0x4a, 0x6c, 0x0f, - 0xc3, 0xe0, 0x21, 0x19, 0xc1, 0x03, 0x00, 0x0c, 0xdf, 0xa7, 0x5c, 0x66, 0x07, 0xad, 0xf4, 0x95, - 0x61, 0x5d, 0xdb, 0x9c, 0x8c, 0xd5, 0x02, 0x8a, 0x0b, 0x6b, 0xf8, 0x1e, 0xa8, 0x3b, 0x3e, 0xe3, - 0x86, 0x6f, 0x12, 0x86, 0x56, 0xfb, 0xca, 0x70, 0x5d, 0x6b, 0x4d, 0xc6, 0x6a, 0x0e, 0xe2, 0x7c, - 0x09, 0xbf, 0x02, 0x9d, 0x62, 0xa4, 0x21, 0x61, 0x34, 0x0a, 0x4d, 0x82, 0xd6, 0x64, 0xb8, 0xdd, - 0xd9, 0x70, 0x71, 0xa2, 0x31, 0x15, 0x33, 0xcc, 0x63, 0x4e, 0x35, 0xe0, 0x6f, 0x41, 0x35, 0xa4, - 0x11, 0x27, 0x0c, 0xad, 0x4b, 0x6f, 0x3b, 0xa9, 0xb7, 0x63, 0x91, 0x41, 0x2c, 0x45, 0xda, 0xa6, - 0x70, 0xf3, 0xdf, 0xb1, 0x5a, 0x8d, 0xf7, 0x38, 0x31, 0x81, 0xc7, 0xa0, 0x3d, 0x5d, 0x15, 0xa8, - 0x2a, 0xdd, 0xec, 0xa7, 0x6e, 0x8e, 0x0a, 0xf2, 0x47, 0x86, 0x3d, 0x15, 0xd1, 0x96, 0x57, 0x16, - 0x43, 0x0d, 0xb4, 0x93, 0x52, 0x09, 0x5c, 0xc3, 0x24, 0xa2, 0x12, 0x51, 0xad, 0xec, 0xf1, 0x89, - 0x94, 0x1f, 0xa7, 0x62, 0xbc, 0x75, 0x51, 0x06, 0xa0, 0x06, 0x5a, 0xd9, 0xe6, 0x91, 0x61, 0x33, - 0xb4, 0xd1, 0x5f, 0x1d, 0xd6, 0xb5, 0x1b, 0x93, 0xb1, 0x8a, 0x32, 0xaf, 0xb2, 0x96, 0xde, 0xa7, - 0x9e, 0xc3, 0x89, 0x17, 0xf0, 0x11, 0x2e, 0x9b, 0x0c, 0xfe, 0xd6, 0x02, 0xdb, 0x85, 0x7c, 0x46, - 0xfe, 0x9b, 0x2f, 0x99, 0x3f, 0x83, 0xdd, 0xb9, 0xef, 0x1b, 0x5a, 0xe9, 0xaf, 0x0e, 0x1b, 0x77, - 0xae, 0xa7, 0x2e, 0x3f, 0xcf, 0x95, 0x9e, 0x24, 0x3a, 0x5a, 0x43, 0x38, 0x9e, 0x8c, 0xd5, 0x55, - 0xe2, 0x5f, 0xe0, 0x0e, 0x99, 0xd5, 0x60, 0xf0, 0x16, 0x58, 0x67, 0x84, 0x47, 0x81, 0xac, 0xae, - 0xc6, 0x9d, 0xcd, 0xd4, 0xdd, 0x67, 0xb2, 0x53, 0xe0, 0x58, 0x08, 0x7f, 0x0e, 0xaa, 0x71, 0xeb, - 0x48, 0x8a, 0x69, 0x5a, 0x2d, 0x91, 0xc2, 0x21, 0xa8, 0x79, 0xd4, 0x77, 0x38, 0x0d, 0x93, 0x3a, - 0x99, 0x56, 0x4c, 0xc5, 0xf0, 0x2b, 0xd0, 0xb5, 0x48, 0x10, 0x12, 0xd1, 0x62, 0x2c, 0x9d, 0x71, - 0x23, 0xe4, 0x3a, 0x77, 0x3c, 0x42, 0x23, 0xae, 0x33, 0x59, 0x1d, 0x2d, 0xed, 0xe6, 0x64, 0xac, - 0xee, 0x97, 0x44, 0xf9, 0x4d, 0x20, 0x05, 0xef, 0xe7, 0x0e, 0x4e, 0x84, 0xd2, 0xa3, 0x58, 0xe7, - 0x44, 0xbc, 0x65, 0x41, 0xe8, 0x5c, 0x38, 0x2e, 0xb1, 0x89, 0x25, 0xeb, 0x62, 0x23, 0x7e, 0xcb, - 0x72, 0x14, 0x17, 0xd6, 0xf0, 0x03, 0x00, 0xcc, 0x20, 0xd2, 0x9f, 0x11, 0xc7, 0x3e, 0xe7, 0x68, - 0x43, 0x3e, 0x5b, 0xea, 0xe7, 0x28, 0xae, 0x9b, 0x41, 0xf4, 0x47, 0xb9, 0x84, 0x08, 0xac, 0x07, - 0x34, 0xe4, 0x0c, 0xd5, 0xfb, 0xab, 0xc3, 0x96, 0xb6, 0xd2, 0xae, 0xe0, 0x18, 0x80, 0x1a, 0x68, - 0x12, 0x3b, 0x24, 0x8c, 0xe9, 0x61, 0x24, 0xae, 0x08, 0xc8, 0x2b, 0xba, 0x96, 0xe6, 0xe0, 0x24, - 0xe9, 0x79, 0xf7, 0x45, 0xcb, 0xc3, 0x91, 0x4b, 0xb4, 0x35, 0x71, 0x41, 0xb8, 0x11, 0x1b, 0x09, - 0x84, 0x89, 0x60, 0x44, 0x93, 0x4a, 0xde, 0xdd, 0x46, 0xde, 0x22, 0x72, 0x14, 0xd7, 0x5d, 0x6a, - 0x9f, 0xc4, 0x2f, 0xe6, 0xaf, 0x40, 0x33, 0xee, 0x7a, 0x4c, 0xb7, 0x23, 0xc7, 0x42, 0x4d, 0x69, - 0x00, 0x27, 0x63, 0xb5, 0x8c, 0x2b, 0xb8, 0x91, 0xec, 0xef, 0x47, 0x4e, 0x7c, 0xe4, 0x90, 0xc8, - 0xdc, 0x1b, 0x1c, 0xb5, 0xfa, 0xca, 0x70, 0x35, 0x39, 0x72, 0x86, 0xe2, 0x7a, 0xb2, 0xfe, 0x8c, - 0xc3, 0x07, 0x60, 0x67, 0x7a, 0x56, 0x38, 0x84, 0xa1, 0x4d, 0x79, 0x3e, 0x94, 0x9e, 0xef, 0xae, - 0x54, 0xb9, 0x97, 0x4d, 0x13, 0x0c, 0xcd, 0x32, 0xe2, 0x10, 0x06, 0x3f, 0x06, 0x1d, 0x97, 0xd8, - 0x86, 0x39, 0xd2, 0x2d, 0xfa, 0xcc, 0x77, 0xa9, 0x61, 0xe9, 0x11, 0x23, 0x21, 0xda, 0x92, 0x81, - 0xaf, 0x20, 0x05, 0xc3, 0x58, 0x7e, 0x2f, 0x11, 0x3f, 0x66, 0x24, 0x84, 0xf7, 0x41, 0x9f, 0x87, - 0x11, 0x93, 0xb5, 0x32, 0x62, 0x9c, 0x78, 0x7a, 0x61, 0x44, 0x31, 0x3d, 0x30, 0xf8, 0x39, 0x6a, - 0x0b, 0x0f, 0xf8, 0x66, 0xa2, 0x77, 0x22, 0xd5, 0xee, 0x16, 0xb4, 0x8e, 0x0d, 0x7e, 0x0e, 0x3f, - 0x01, 0xad, 0xe2, 0x90, 0x61, 0x68, 0x5b, 0x9e, 0x61, 0xa7, 0xdc, 0x36, 0x8e, 0x84, 0x0c, 0x37, - 0x2f, 0xf2, 0x0d, 0x83, 0xef, 0x82, 0x5a, 0x32, 0xc3, 0x10, 0x94, 0xb5, 0xbd, 0x95, 0xda, 0x7c, - 0x19, 0xc3, 0x38, 0x95, 0xc3, 0xdf, 0x83, 0x76, 0xb9, 0xa2, 0x3d, 0x86, 0x76, 0x64, 0x8e, 0x3b, - 0x93, 0xb1, 0x3a, 0x23, 0xc3, 0x9b, 0xac, 0x50, 0xbf, 0x47, 0xa2, 0x93, 0xef, 0xcd, 0x9f, 0xc0, - 0xa8, 0x23, 0x9f, 0x7c, 0x33, 0xcb, 0x78, 0xae, 0x75, 0x9c, 0x29, 0xc9, 0xaa, 0x52, 0xf0, 0xae, - 0x39, 0x4f, 0x08, 0x6f, 0x83, 0xcd, 0x78, 0x72, 0x8a, 0xac, 0xfb, 0x86, 0x47, 0xd0, 0xae, 0xcc, - 0x5b, 0x4b, 0xa2, 0x8f, 0x13, 0x30, 0x57, 0x0b, 0x0c, 0xc6, 0x9e, 0xd1, 0xd0, 0x42, 0x7b, 0x05, - 0xb5, 0xe3, 0x04, 0x14, 0x8d, 0x78, 0x7a, 0x3e, 0xa3, 0xfd, 0x72, 0x23, 0xbe, 0x2b, 0xe4, 0xf7, - 0x32, 0x31, 0xde, 0x32, 0xcb, 0x80, 0x28, 0xe1, 0xc2, 0x2c, 0x67, 0x08, 0xc9, 0x1b, 0x81, 0xa9, - 0xfd, 0x03, 0x21, 0x3b, 0x14, 0x22, 0xdc, 0x70, 0xb2, 0x35, 0x83, 0x5f, 0x82, 0x46, 0x61, 0xde, - 0xa3, 0x6b, 0xd2, 0xea, 0xdd, 0x39, 0x53, 0x2e, 0xee, 0xca, 0x07, 0x47, 0x52, 0x59, 0xb4, 0xed, - 0xcf, 0x7d, 0x1e, 0x8e, 0x64, 0xa9, 0x01, 0x2f, 0x03, 0xe1, 0x7b, 0x60, 0x23, 0x21, 0x0b, 0x0c, - 0x75, 0xa5, 0xb3, 0xec, 0x82, 0x4f, 0x62, 0x1c, 0x67, 0x0a, 0xf0, 0x53, 0xb0, 0x59, 0xa6, 0x12, - 0xe8, 0xba, 0x3c, 0x75, 0x27, 0x35, 0x39, 0xa4, 0x36, 0x36, 0x38, 0x39, 0x14, 0x32, 0xdc, 0x74, - 0x0b, 0xbb, 0xee, 0x63, 0xb0, 0x35, 0x15, 0x0b, 0x6c, 0x83, 0xd5, 0x74, 0x4a, 0xd4, 0xb1, 0x58, - 0xc2, 0xf7, 0xc1, 0xfa, 0x85, 0xe1, 0x46, 0x44, 0x92, 0x84, 0xc6, 0x9d, 0xbd, 0x6c, 0x50, 0xa6, - 0x96, 0x4f, 0x84, 0x14, 0xc7, 0x4a, 0x9f, 0xae, 0x7c, 0xa2, 0x0c, 0xfe, 0xaa, 0x80, 0x46, 0x61, - 0x1a, 0xc3, 0x5f, 0x67, 0x23, 0x5b, 0x91, 0xa7, 0x51, 0xe7, 0x8c, 0xec, 0x83, 0xf8, 0x47, 0x06, - 0x91, 0x8e, 0xeb, 0xee, 0x6f, 0x40, 0xa3, 0x00, 0xcf, 0x89, 0xad, 0x53, 0x8c, 0xad, 0x59, 0x8c, - 0xe1, 0xbb, 0x15, 0xd0, 0xce, 0x33, 0xff, 0x38, 0xb0, 0x0c, 0x4e, 0x60, 0xaf, 0x48, 0x62, 0x84, - 0x9b, 0xf5, 0x2f, 0x2a, 0x45, 0xde, 0x92, 0x73, 0x8b, 0x95, 0xc5, 0xdc, 0x42, 0x99, 0xc3, 0x2d, - 0xfa, 0x25, 0x46, 0x25, 0x86, 0x58, 0xfd, 0x0b, 0xa5, 0xc4, 0xa1, 0x1e, 0x94, 0xeb, 0x64, 0x4d, - 0x26, 0x63, 0x38, 0x5b, 0x27, 0x71, 0xb4, 0xd3, 0x65, 0x52, 0x2c, 0x91, 0xb7, 0x74, 0x73, 0x5a, - 0x07, 0x40, 0x1a, 0x88, 0x58, 0x0d, 0x57, 0xcf, 0xd2, 0xa2, 0xed, 0x82, 0x9d, 0x0c, 0xcd, 0x8f, - 0x33, 0xf8, 0x87, 0x02, 0x5a, 0x25, 0xfa, 0x00, 0x3f, 0x02, 0xcd, 0x20, 0xa4, 0xa6, 0x18, 0x3b, - 0x71, 0xab, 0x97, 0x9d, 0xb4, 0x2d, 0x46, 0x40, 0x11, 0xc7, 0x8d, 0x64, 0x27, 0x07, 0xc0, 0x00, - 0x54, 0x2d, 0xea, 0x19, 0x4e, 0xca, 0x42, 0xc1, 0x64, 0xac, 0x26, 0x08, 0x4e, 0x7e, 0xe1, 0x2f, - 0xc0, 0x86, 0x28, 0x72, 0xe9, 0x54, 0x66, 0x56, 0x6b, 0x4e, 0xc6, 0x6a, 0x86, 0xe1, 0x9a, 0x4b, - 0x6d, 0xe1, 0x6c, 0xf0, 0x2f, 0x05, 0xc0, 0x59, 0x5a, 0x09, 0x7f, 0x09, 0xea, 0x1e, 0xf1, 0x68, - 0x38, 0xd2, 0xbd, 0xd3, 0xf8, 0xe2, 0x63, 0xf6, 0x9a, 0x81, 0x78, 0x23, 0x5e, 0x1e, 0x9d, 0xc2, - 0x5b, 0xa0, 0x66, 0x39, 0xec, 0xa9, 0xd0, 0x5c, 0x91, 0x9a, 0x8d, 0xc9, 0x58, 0x4d, 0x21, 0x5c, - 0x15, 0x8b, 0xa3, 0x53, 0xf8, 0x0e, 0xa8, 0x85, 0x94, 0x72, 0xfd, 0x8c, 0x25, 0x01, 0xc9, 0xb0, - 0x05, 0x74, 0x26, 0x4b, 0x82, 0xf2, 0x3f, 0x30, 0x11, 0xb6, 0x67, 0x7c, 0xad, 0x07, 0x8e, 0xc5, - 0x24, 0x5d, 0x59, 0x8f, 0xc3, 0x4e, 0x31, 0x5c, 0xf3, 0x8c, 0xaf, 0x8f, 0x1d, 0x8b, 0x0d, 0xfe, - 0xd3, 0x06, 0x20, 0x0f, 0xfb, 0xed, 0xe5, 0x71, 0xa9, 0xa8, 0x4b, 0x54, 0x7f, 0xed, 0x0a, 0xaa, - 0xff, 0xa7, 0x57, 0x91, 0xc2, 0xf5, 0xab, 0x49, 0x61, 0x6d, 0x49, 0x42, 0x58, 0x5d, 0x8e, 0x10, - 0xd6, 0x16, 0x12, 0xc2, 0x79, 0x93, 0xf0, 0xfa, 0x6b, 0x4c, 0xc2, 0xd3, 0x85, 0x34, 0x31, 0xa6, - 0x6a, 0xb7, 0x27, 0x63, 0x55, 0x2d, 0x68, 0xa5, 0x72, 0x9f, 0x2d, 0x47, 0x17, 0x0b, 0xa4, 0xb5, - 0xbe, 0x98, 0xb4, 0x16, 0x8a, 0x14, 0xbc, 0xba, 0x48, 0x4b, 0x65, 0xdf, 0x58, 0x5c, 0xf6, 0x65, - 0xea, 0xd9, 0xbc, 0x8a, 0x7a, 0x96, 0x99, 0x6d, 0xeb, 0x4a, 0x66, 0x9b, 0x51, 0xd5, 0xcd, 0x69, - 0xaa, 0x9a, 0x37, 0xdd, 0xad, 0xd7, 0x6f, 0xba, 0x65, 0x8e, 0xda, 0xbe, 0x8a, 0xa3, 0x16, 0xfb, - 0xc8, 0xf6, 0x82, 0x3e, 0x32, 0x43, 0x66, 0xe1, 0x72, 0x64, 0xb6, 0xfc, 0x55, 0xbd, 0x73, 0xe5, - 0x57, 0xf5, 0xef, 0xa6, 0x68, 0x7a, 0xe7, 0x0a, 0x9a, 0x5e, 0x26, 0xe8, 0xda, 0x9c, 0xaf, 0xd9, - 0xdd, 0x85, 0x5f, 0xb3, 0xb3, 0xdf, 0xaf, 0xaf, 0xe0, 0xd3, 0x7b, 0x6f, 0x90, 0x4f, 0xef, 0xff, - 0x68, 0x3e, 0x8d, 0x7e, 0x10, 0x9f, 0xbe, 0xf6, 0x03, 0xf8, 0x74, 0xf7, 0x0a, 0x3e, 0x3d, 0xf3, - 0xa9, 0x7e, 0xe3, 0xb5, 0x3f, 0xd5, 0x4b, 0x53, 0xe1, 0xe6, 0x82, 0xa9, 0xb0, 0x80, 0x7c, 0xf7, - 0xde, 0x02, 0xf9, 0x56, 0x97, 0x23, 0xdf, 0xfd, 0x65, 0xc9, 0xf7, 0xcf, 0x7e, 0x24, 0xf9, 0x1e, - 0x2c, 0x47, 0xbe, 0xef, 0x96, 0x49, 0xd5, 0x3b, 0xd2, 0x6a, 0x30, 0x4b, 0xaa, 0x16, 0xd1, 0xa9, - 0x12, 0xe3, 0xbe, 0xf5, 0xfa, 0x8c, 0xfb, 0xf6, 0x4f, 0xcc, 0xb8, 0xb5, 0x8f, 0x9f, 0xbf, 0xe8, - 0x55, 0xbe, 0x7d, 0xd1, 0xab, 0x7c, 0xff, 0xa2, 0xa7, 0xfc, 0xe5, 0xb2, 0xa7, 0xfc, 0xf3, 0xb2, - 0xa7, 0x7c, 0x73, 0xd9, 0x53, 0x9e, 0x5f, 0xf6, 0x94, 0xef, 0x2e, 0x7b, 0xca, 0xff, 0x2e, 0x7b, - 0x95, 0xef, 0x2f, 0x7b, 0xca, 0xdf, 0x5f, 0xf6, 0x2a, 0xcf, 0x5f, 0xf6, 0x2a, 0xdf, 0xbe, 0xec, - 0x55, 0x4e, 0xab, 0xf2, 0x4f, 0xc7, 0x8f, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x51, 0xbe, 0xb3, - 0x10, 0xd7, 0x15, 0x00, 0x00, -} - -func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPSchedulingInfo) - if !ok { - that2, ok := that.(DesiredLRPSchedulingInfo) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.DesiredLRPKey.Equal(&that1.DesiredLRPKey) { - return false - } - if this.Annotation != that1.Annotation { - return false - } - if this.Instances != that1.Instances { - return false - } - if !this.DesiredLRPResource.Equal(&that1.DesiredLRPResource) { - return false - } - if !this.Routes.Equal(that1.Routes) { - return false - } - if !this.ModificationTag.Equal(&that1.ModificationTag) { - return false - } - if !this.VolumePlacement.Equal(that1.VolumePlacement) { - return false - } - if len(this.PlacementTags) != len(that1.PlacementTags) { - return false - } - for i := range this.PlacementTags { - if this.PlacementTags[i] != that1.PlacementTags[i] { - return false - } - } - return true -} -func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPRunInfo) - if !ok { - that2, ok := that.(DesiredLRPRunInfo) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.DesiredLRPKey.Equal(&that1.DesiredLRPKey) { - return false - } - if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { - return false - } - for i := range this.EnvironmentVariables { - if !this.EnvironmentVariables[i].Equal(&that1.EnvironmentVariables[i]) { - return false - } - } - if !this.Setup.Equal(that1.Setup) { - return false - } - if !this.Action.Equal(that1.Action) { - return false - } - if !this.Monitor.Equal(that1.Monitor) { - return false - } - if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { - return false - } - if this.Privileged != that1.Privileged { - return false - } - if this.CpuWeight != that1.CpuWeight { - return false - } - if len(this.Ports) != len(that1.Ports) { - return false - } - for i := range this.Ports { - if this.Ports[i] != that1.Ports[i] { - return false - } - } - if len(this.EgressRules) != len(that1.EgressRules) { - return false - } - for i := range this.EgressRules { - if !this.EgressRules[i].Equal(&that1.EgressRules[i]) { - return false - } - } - if this.LogSource != that1.LogSource { - return false - } - if this.MetricsGuid != that1.MetricsGuid { - return false - } - if this.CreatedAt != that1.CreatedAt { - return false - } - if len(this.CachedDependencies) != len(that1.CachedDependencies) { - return false - } - for i := range this.CachedDependencies { - if !this.CachedDependencies[i].Equal(that1.CachedDependencies[i]) { - return false - } - } - if this.LegacyDownloadUser != that1.LegacyDownloadUser { - return false - } - if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { - return false - } - if len(this.VolumeMounts) != len(that1.VolumeMounts) { - return false - } - for i := range this.VolumeMounts { - if !this.VolumeMounts[i].Equal(that1.VolumeMounts[i]) { - return false - } - } - if !this.Network.Equal(that1.Network) { - return false - } - if this.StartTimeoutMs != that1.StartTimeoutMs { - return false - } - if !this.CertificateProperties.Equal(that1.CertificateProperties) { - return false - } - if this.ImageUsername != that1.ImageUsername { - return false - } - if this.ImagePassword != that1.ImagePassword { - return false - } - if !this.CheckDefinition.Equal(that1.CheckDefinition) { - return false - } - if len(this.ImageLayers) != len(that1.ImageLayers) { - return false - } - for i := range this.ImageLayers { - if !this.ImageLayers[i].Equal(that1.ImageLayers[i]) { - return false - } - } - if len(this.MetricTags) != len(that1.MetricTags) { - return false - } - for i := range this.MetricTags { - if !this.MetricTags[i].Equal(that1.MetricTags[i]) { - return false - } - } - if len(this.Sidecars) != len(that1.Sidecars) { - return false - } - for i := range this.Sidecars { - if !this.Sidecars[i].Equal(that1.Sidecars[i]) { - return false - } - } - if !this.LogRateLimit.Equal(that1.LogRateLimit) { - return false - } - return true -} -func (this *ProtoRoutes) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ProtoRoutes) - if !ok { - that2, ok := that.(ProtoRoutes) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if len(this.Routes) != len(that1.Routes) { - return false - } - for i := range this.Routes { - if !bytes.Equal(this.Routes[i], that1.Routes[i]) { - return false - } - } - return true -} -func (this *DesiredLRPUpdate) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPUpdate) - if !ok { - that2, ok := that.(DesiredLRPUpdate) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if that1.OptionalInstances == nil { - if this.OptionalInstances != nil { - return false - } - } else if this.OptionalInstances == nil { - return false - } else if !this.OptionalInstances.Equal(that1.OptionalInstances) { - return false - } - if that1.Routes == nil { - if this.Routes != nil { - return false - } - } else if !this.Routes.Equal(*that1.Routes) { - return false - } - if that1.OptionalAnnotation == nil { - if this.OptionalAnnotation != nil { - return false - } - } else if this.OptionalAnnotation == nil { - return false - } else if !this.OptionalAnnotation.Equal(that1.OptionalAnnotation) { - return false - } - if len(this.MetricTags) != len(that1.MetricTags) { - return false - } - for i := range this.MetricTags { - if !this.MetricTags[i].Equal(that1.MetricTags[i]) { - return false - } - } - return true -} -func (this *DesiredLRPUpdate_Instances) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPUpdate_Instances) - if !ok { - that2, ok := that.(DesiredLRPUpdate_Instances) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Instances != that1.Instances { - return false - } - return true -} -func (this *DesiredLRPUpdate_Annotation) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPUpdate_Annotation) - if !ok { - that2, ok := that.(DesiredLRPUpdate_Annotation) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.Annotation != that1.Annotation { - return false - } - return true -} -func (this *DesiredLRPKey) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPKey) - if !ok { - that2, ok := that.(DesiredLRPKey) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if this.Domain != that1.Domain { - return false - } - if this.LogGuid != that1.LogGuid { - return false - } - return true -} -func (this *DesiredLRPResource) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRPResource) - if !ok { - that2, ok := that.(DesiredLRPResource) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.MemoryMb != that1.MemoryMb { - return false - } - if this.DiskMb != that1.DiskMb { - return false - } - if this.RootFs != that1.RootFs { - return false - } - if this.MaxPids != that1.MaxPids { - return false - } - return true -} -func (this *DesiredLRP) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*DesiredLRP) - if !ok { - that2, ok := that.(DesiredLRP) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ProcessGuid != that1.ProcessGuid { - return false - } - if this.Domain != that1.Domain { - return false - } - if this.RootFs != that1.RootFs { - return false - } - if this.Instances != that1.Instances { - return false - } - if len(this.EnvironmentVariables) != len(that1.EnvironmentVariables) { - return false - } - for i := range this.EnvironmentVariables { - if !this.EnvironmentVariables[i].Equal(that1.EnvironmentVariables[i]) { - return false - } - } - if !this.Setup.Equal(that1.Setup) { - return false - } - if !this.Action.Equal(that1.Action) { - return false - } - if this.StartTimeoutMs != that1.StartTimeoutMs { - return false - } - if this.DeprecatedStartTimeoutS != that1.DeprecatedStartTimeoutS { - return false - } - if !this.Monitor.Equal(that1.Monitor) { - return false - } - if this.DiskMb != that1.DiskMb { - return false - } - if this.MemoryMb != that1.MemoryMb { - return false - } - if this.CpuWeight != that1.CpuWeight { - return false - } - if this.Privileged != that1.Privileged { - return false - } - if len(this.Ports) != len(that1.Ports) { - return false - } - for i := range this.Ports { - if this.Ports[i] != that1.Ports[i] { - return false - } - } - if that1.Routes == nil { - if this.Routes != nil { - return false - } - } else if !this.Routes.Equal(*that1.Routes) { - return false - } - if this.LogSource != that1.LogSource { - return false - } - if this.LogGuid != that1.LogGuid { - return false - } - if this.MetricsGuid != that1.MetricsGuid { - return false - } - if this.Annotation != that1.Annotation { - return false - } - if len(this.EgressRules) != len(that1.EgressRules) { - return false - } - for i := range this.EgressRules { - if !this.EgressRules[i].Equal(that1.EgressRules[i]) { - return false - } - } - if !this.ModificationTag.Equal(that1.ModificationTag) { - return false - } - if len(this.CachedDependencies) != len(that1.CachedDependencies) { - return false - } - for i := range this.CachedDependencies { - if !this.CachedDependencies[i].Equal(that1.CachedDependencies[i]) { - return false - } - } - if this.LegacyDownloadUser != that1.LegacyDownloadUser { - return false - } - if this.TrustedSystemCertificatesPath != that1.TrustedSystemCertificatesPath { - return false - } - if len(this.VolumeMounts) != len(that1.VolumeMounts) { - return false - } - for i := range this.VolumeMounts { - if !this.VolumeMounts[i].Equal(that1.VolumeMounts[i]) { - return false - } - } - if !this.Network.Equal(that1.Network) { - return false - } - if len(this.PlacementTags) != len(that1.PlacementTags) { - return false - } - for i := range this.PlacementTags { - if this.PlacementTags[i] != that1.PlacementTags[i] { - return false - } - } - if this.MaxPids != that1.MaxPids { - return false - } - if !this.CertificateProperties.Equal(that1.CertificateProperties) { - return false - } - if this.ImageUsername != that1.ImageUsername { - return false - } - if this.ImagePassword != that1.ImagePassword { - return false - } - if !this.CheckDefinition.Equal(that1.CheckDefinition) { - return false - } - if len(this.ImageLayers) != len(that1.ImageLayers) { - return false - } - for i := range this.ImageLayers { - if !this.ImageLayers[i].Equal(that1.ImageLayers[i]) { - return false - } - } - if len(this.MetricTags) != len(that1.MetricTags) { - return false - } - for i := range this.MetricTags { - if !this.MetricTags[i].Equal(that1.MetricTags[i]) { - return false - } - } - if len(this.Sidecars) != len(that1.Sidecars) { - return false - } - for i := range this.Sidecars { - if !this.Sidecars[i].Equal(that1.Sidecars[i]) { - return false - } - } - if !this.LogRateLimit.Equal(that1.LogRateLimit) { - return false - } - return true -} -func (this *DesiredLRPSchedulingInfo) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 12) - s = append(s, "&models.DesiredLRPSchedulingInfo{") - s = append(s, "DesiredLRPKey: "+strings.Replace(this.DesiredLRPKey.GoString(), `&`, ``, 1)+",\n") - s = append(s, "Annotation: "+fmt.Sprintf("%#v", this.Annotation)+",\n") - s = append(s, "Instances: "+fmt.Sprintf("%#v", this.Instances)+",\n") - s = append(s, "DesiredLRPResource: "+strings.Replace(this.DesiredLRPResource.GoString(), `&`, ``, 1)+",\n") - s = append(s, "Routes: "+fmt.Sprintf("%#v", this.Routes)+",\n") - s = append(s, "ModificationTag: "+strings.Replace(this.ModificationTag.GoString(), `&`, ``, 1)+",\n") - if this.VolumePlacement != nil { - s = append(s, "VolumePlacement: "+fmt.Sprintf("%#v", this.VolumePlacement)+",\n") - } - s = append(s, "PlacementTags: "+fmt.Sprintf("%#v", this.PlacementTags)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPRunInfo) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 31) - s = append(s, "&models.DesiredLRPRunInfo{") - s = append(s, "DesiredLRPKey: "+strings.Replace(this.DesiredLRPKey.GoString(), `&`, ``, 1)+",\n") - if this.EnvironmentVariables != nil { - vs := make([]EnvironmentVariable, len(this.EnvironmentVariables)) - for i := range vs { - vs[i] = this.EnvironmentVariables[i] - } - s = append(s, "EnvironmentVariables: "+fmt.Sprintf("%#v", vs)+",\n") - } - if this.Setup != nil { - s = append(s, "Setup: "+fmt.Sprintf("%#v", this.Setup)+",\n") - } - if this.Action != nil { - s = append(s, "Action: "+fmt.Sprintf("%#v", this.Action)+",\n") - } - if this.Monitor != nil { - s = append(s, "Monitor: "+fmt.Sprintf("%#v", this.Monitor)+",\n") - } - s = append(s, "DeprecatedStartTimeoutS: "+fmt.Sprintf("%#v", this.DeprecatedStartTimeoutS)+",\n") - s = append(s, "Privileged: "+fmt.Sprintf("%#v", this.Privileged)+",\n") - s = append(s, "CpuWeight: "+fmt.Sprintf("%#v", this.CpuWeight)+",\n") - s = append(s, "Ports: "+fmt.Sprintf("%#v", this.Ports)+",\n") - if this.EgressRules != nil { - vs := make([]SecurityGroupRule, len(this.EgressRules)) - for i := range vs { - vs[i] = this.EgressRules[i] - } - s = append(s, "EgressRules: "+fmt.Sprintf("%#v", vs)+",\n") - } - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "MetricsGuid: "+fmt.Sprintf("%#v", this.MetricsGuid)+",\n") - s = append(s, "CreatedAt: "+fmt.Sprintf("%#v", this.CreatedAt)+",\n") - if this.CachedDependencies != nil { - s = append(s, "CachedDependencies: "+fmt.Sprintf("%#v", this.CachedDependencies)+",\n") - } - s = append(s, "LegacyDownloadUser: "+fmt.Sprintf("%#v", this.LegacyDownloadUser)+",\n") - s = append(s, "TrustedSystemCertificatesPath: "+fmt.Sprintf("%#v", this.TrustedSystemCertificatesPath)+",\n") - if this.VolumeMounts != nil { - s = append(s, "VolumeMounts: "+fmt.Sprintf("%#v", this.VolumeMounts)+",\n") - } - if this.Network != nil { - s = append(s, "Network: "+fmt.Sprintf("%#v", this.Network)+",\n") - } - s = append(s, "StartTimeoutMs: "+fmt.Sprintf("%#v", this.StartTimeoutMs)+",\n") - if this.CertificateProperties != nil { - s = append(s, "CertificateProperties: "+fmt.Sprintf("%#v", this.CertificateProperties)+",\n") - } - s = append(s, "ImageUsername: "+fmt.Sprintf("%#v", this.ImageUsername)+",\n") - s = append(s, "ImagePassword: "+fmt.Sprintf("%#v", this.ImagePassword)+",\n") - if this.CheckDefinition != nil { - s = append(s, "CheckDefinition: "+fmt.Sprintf("%#v", this.CheckDefinition)+",\n") - } - if this.ImageLayers != nil { - s = append(s, "ImageLayers: "+fmt.Sprintf("%#v", this.ImageLayers)+",\n") - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%#v: %#v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - if this.MetricTags != nil { - s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") - } - if this.Sidecars != nil { - s = append(s, "Sidecars: "+fmt.Sprintf("%#v", this.Sidecars)+",\n") - } - if this.LogRateLimit != nil { - s = append(s, "LogRateLimit: "+fmt.Sprintf("%#v", this.LogRateLimit)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *ProtoRoutes) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 5) - s = append(s, "&models.ProtoRoutes{") - keysForRoutes := make([]string, 0, len(this.Routes)) - for k, _ := range this.Routes { - keysForRoutes = append(keysForRoutes, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForRoutes) - mapStringForRoutes := "map[string][]byte{" - for _, k := range keysForRoutes { - mapStringForRoutes += fmt.Sprintf("%#v: %#v,", k, this.Routes[k]) - } - mapStringForRoutes += "}" - if this.Routes != nil { - s = append(s, "Routes: "+mapStringForRoutes+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPUpdate) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.DesiredLRPUpdate{") - if this.OptionalInstances != nil { - s = append(s, "OptionalInstances: "+fmt.Sprintf("%#v", this.OptionalInstances)+",\n") - } - s = append(s, "Routes: "+fmt.Sprintf("%#v", this.Routes)+",\n") - if this.OptionalAnnotation != nil { - s = append(s, "OptionalAnnotation: "+fmt.Sprintf("%#v", this.OptionalAnnotation)+",\n") - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%#v: %#v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - if this.MetricTags != nil { - s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPUpdate_Instances) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.DesiredLRPUpdate_Instances{` + - `Instances:` + fmt.Sprintf("%#v", this.Instances) + `}`}, ", ") - return s -} -func (this *DesiredLRPUpdate_Annotation) GoString() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&models.DesiredLRPUpdate_Annotation{` + - `Annotation:` + fmt.Sprintf("%#v", this.Annotation) + `}`}, ", ") - return s -} -func (this *DesiredLRPKey) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 7) - s = append(s, "&models.DesiredLRPKey{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "LogGuid: "+fmt.Sprintf("%#v", this.LogGuid)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRPResource) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&models.DesiredLRPResource{") - s = append(s, "MemoryMb: "+fmt.Sprintf("%#v", this.MemoryMb)+",\n") - s = append(s, "DiskMb: "+fmt.Sprintf("%#v", this.DiskMb)+",\n") - s = append(s, "RootFs: "+fmt.Sprintf("%#v", this.RootFs)+",\n") - s = append(s, "MaxPids: "+fmt.Sprintf("%#v", this.MaxPids)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} -func (this *DesiredLRP) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 41) - s = append(s, "&models.DesiredLRP{") - s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") - s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") - s = append(s, "RootFs: "+fmt.Sprintf("%#v", this.RootFs)+",\n") - s = append(s, "Instances: "+fmt.Sprintf("%#v", this.Instances)+",\n") - if this.EnvironmentVariables != nil { - s = append(s, "EnvironmentVariables: "+fmt.Sprintf("%#v", this.EnvironmentVariables)+",\n") - } - if this.Setup != nil { - s = append(s, "Setup: "+fmt.Sprintf("%#v", this.Setup)+",\n") - } - if this.Action != nil { - s = append(s, "Action: "+fmt.Sprintf("%#v", this.Action)+",\n") - } - s = append(s, "StartTimeoutMs: "+fmt.Sprintf("%#v", this.StartTimeoutMs)+",\n") - s = append(s, "DeprecatedStartTimeoutS: "+fmt.Sprintf("%#v", this.DeprecatedStartTimeoutS)+",\n") - if this.Monitor != nil { - s = append(s, "Monitor: "+fmt.Sprintf("%#v", this.Monitor)+",\n") - } - s = append(s, "DiskMb: "+fmt.Sprintf("%#v", this.DiskMb)+",\n") - s = append(s, "MemoryMb: "+fmt.Sprintf("%#v", this.MemoryMb)+",\n") - s = append(s, "CpuWeight: "+fmt.Sprintf("%#v", this.CpuWeight)+",\n") - s = append(s, "Privileged: "+fmt.Sprintf("%#v", this.Privileged)+",\n") - s = append(s, "Ports: "+fmt.Sprintf("%#v", this.Ports)+",\n") - s = append(s, "Routes: "+fmt.Sprintf("%#v", this.Routes)+",\n") - s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") - s = append(s, "LogGuid: "+fmt.Sprintf("%#v", this.LogGuid)+",\n") - s = append(s, "MetricsGuid: "+fmt.Sprintf("%#v", this.MetricsGuid)+",\n") - s = append(s, "Annotation: "+fmt.Sprintf("%#v", this.Annotation)+",\n") - if this.EgressRules != nil { - s = append(s, "EgressRules: "+fmt.Sprintf("%#v", this.EgressRules)+",\n") - } - if this.ModificationTag != nil { - s = append(s, "ModificationTag: "+fmt.Sprintf("%#v", this.ModificationTag)+",\n") - } - if this.CachedDependencies != nil { - s = append(s, "CachedDependencies: "+fmt.Sprintf("%#v", this.CachedDependencies)+",\n") - } - s = append(s, "LegacyDownloadUser: "+fmt.Sprintf("%#v", this.LegacyDownloadUser)+",\n") - s = append(s, "TrustedSystemCertificatesPath: "+fmt.Sprintf("%#v", this.TrustedSystemCertificatesPath)+",\n") - if this.VolumeMounts != nil { - s = append(s, "VolumeMounts: "+fmt.Sprintf("%#v", this.VolumeMounts)+",\n") - } - if this.Network != nil { - s = append(s, "Network: "+fmt.Sprintf("%#v", this.Network)+",\n") - } - s = append(s, "PlacementTags: "+fmt.Sprintf("%#v", this.PlacementTags)+",\n") - s = append(s, "MaxPids: "+fmt.Sprintf("%#v", this.MaxPids)+",\n") - if this.CertificateProperties != nil { - s = append(s, "CertificateProperties: "+fmt.Sprintf("%#v", this.CertificateProperties)+",\n") - } - s = append(s, "ImageUsername: "+fmt.Sprintf("%#v", this.ImageUsername)+",\n") - s = append(s, "ImagePassword: "+fmt.Sprintf("%#v", this.ImagePassword)+",\n") - if this.CheckDefinition != nil { - s = append(s, "CheckDefinition: "+fmt.Sprintf("%#v", this.CheckDefinition)+",\n") - } - if this.ImageLayers != nil { - s = append(s, "ImageLayers: "+fmt.Sprintf("%#v", this.ImageLayers)+",\n") - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%#v: %#v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - if this.MetricTags != nil { - s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") - } - if this.Sidecars != nil { - s = append(s, "Sidecars: "+fmt.Sprintf("%#v", this.Sidecars)+",\n") - } - if this.LogRateLimit != nil { - s = append(s, "LogRateLimit: "+fmt.Sprintf("%#v", this.LogRateLimit)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringDesiredLrp(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func (m *DesiredLRPSchedulingInfo) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPSchedulingInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPSchedulingInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.PlacementTags) > 0 { - for iNdEx := len(m.PlacementTags) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.PlacementTags[iNdEx]) - copy(dAtA[i:], m.PlacementTags[iNdEx]) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.PlacementTags[iNdEx]))) - i-- - dAtA[i] = 0x42 - } - } - if m.VolumePlacement != nil { - { - size, err := m.VolumePlacement.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } - { - size, err := m.ModificationTag.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - { - size := m.Routes.Size() - i -= size - if _, err := m.Routes.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - { - size, err := m.DesiredLRPResource.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - if m.Instances != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.Instances)) - i-- - dAtA[i] = 0x18 - } - if len(m.Annotation) > 0 { - i -= len(m.Annotation) - copy(dAtA[i:], m.Annotation) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.Annotation))) - i-- - dAtA[i] = 0x12 - } - { - size, err := m.DesiredLRPKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *DesiredLRPRunInfo) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPRunInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPRunInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.LogRateLimit != nil { - { - size, err := m.LogRateLimit.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xda - } - if len(m.Sidecars) > 0 { - for iNdEx := len(m.Sidecars) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Sidecars[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd2 - } - } - if len(m.MetricTags) > 0 { - for k := range m.MetricTags { - v := m.MetricTags[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDesiredLrp(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xca - } - } - if len(m.ImageLayers) > 0 { - for iNdEx := len(m.ImageLayers) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ImageLayers[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xc2 - } - } - if m.CheckDefinition != nil { - { - size, err := m.CheckDefinition.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xba - } - if len(m.ImagePassword) > 0 { - i -= len(m.ImagePassword) - copy(dAtA[i:], m.ImagePassword) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.ImagePassword))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb2 - } - if len(m.ImageUsername) > 0 { - i -= len(m.ImageUsername) - copy(dAtA[i:], m.ImageUsername) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.ImageUsername))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xaa - } - if m.CertificateProperties != nil { - { - size, err := m.CertificateProperties.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa2 - } - if m.StartTimeoutMs != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.StartTimeoutMs)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x98 - } - if m.Network != nil { - { - size, err := m.Network.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x92 - } - if len(m.VolumeMounts) > 0 { - for iNdEx := len(m.VolumeMounts) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.VolumeMounts[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x8a - } - } - if len(m.TrustedSystemCertificatesPath) > 0 { - i -= len(m.TrustedSystemCertificatesPath) - copy(dAtA[i:], m.TrustedSystemCertificatesPath) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.TrustedSystemCertificatesPath))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 - } - if len(m.LegacyDownloadUser) > 0 { - i -= len(m.LegacyDownloadUser) - copy(dAtA[i:], m.LegacyDownloadUser) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.LegacyDownloadUser))) - i-- - dAtA[i] = 0x7a - } - if len(m.CachedDependencies) > 0 { - for iNdEx := len(m.CachedDependencies) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.CachedDependencies[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x72 - } - } - if m.CreatedAt != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.CreatedAt)) - i-- - dAtA[i] = 0x68 - } - if len(m.MetricsGuid) > 0 { - i -= len(m.MetricsGuid) - copy(dAtA[i:], m.MetricsGuid) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.MetricsGuid))) - i-- - dAtA[i] = 0x62 - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x5a - } - if len(m.EgressRules) > 0 { - for iNdEx := len(m.EgressRules) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.EgressRules[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x52 - } - } - if len(m.Ports) > 0 { - for iNdEx := len(m.Ports) - 1; iNdEx >= 0; iNdEx-- { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.Ports[iNdEx])) - i-- - dAtA[i] = 0x48 - } - } - if m.CpuWeight != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.CpuWeight)) - i-- - dAtA[i] = 0x40 - } - if m.Privileged { - i-- - if m.Privileged { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x38 - } - if m.DeprecatedStartTimeoutS != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.DeprecatedStartTimeoutS)) - i-- - dAtA[i] = 0x30 - } - if m.Monitor != nil { - { - size, err := m.Monitor.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - if m.Action != nil { - { - size, err := m.Action.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if m.Setup != nil { - { - size, err := m.Setup.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if len(m.EnvironmentVariables) > 0 { - for iNdEx := len(m.EnvironmentVariables) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.EnvironmentVariables[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - { - size, err := m.DesiredLRPKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *ProtoRoutes) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ProtoRoutes) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ProtoRoutes) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Routes) > 0 { - for k := range m.Routes { - v := m.Routes[k] - baseI := i - if len(v) > 0 { - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDesiredLrp(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPUpdate) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPUpdate) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.MetricTags) > 0 { - for k := range m.MetricTags { - v := m.MetricTags[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDesiredLrp(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x22 - } - } - if m.OptionalAnnotation != nil { - { - size := m.OptionalAnnotation.Size() - i -= size - if _, err := m.OptionalAnnotation.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if m.Routes != nil { - { - size := m.Routes.Size() - i -= size - if _, err := m.Routes.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.OptionalInstances != nil { - { - size := m.OptionalInstances.Size() - i -= size - if _, err := m.OptionalInstances.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPUpdate_Instances) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPUpdate_Instances) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.Instances)) - i-- - dAtA[i] = 0x8 - return len(dAtA) - i, nil -} -func (m *DesiredLRPUpdate_Annotation) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPUpdate_Annotation) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i -= len(m.Annotation) - copy(dAtA[i:], m.Annotation) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.Annotation))) - i-- - dAtA[i] = 0x1a - return len(dAtA) - i, nil -} -func (m *DesiredLRPKey) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPKey) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.LogGuid) > 0 { - i -= len(m.LogGuid) - copy(dAtA[i:], m.LogGuid) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.LogGuid))) - i-- - dAtA[i] = 0x1a - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0x12 - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRPResource) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRPResource) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRPResource) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.MaxPids != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.MaxPids)) - i-- - dAtA[i] = 0x20 - } - if len(m.RootFs) > 0 { - i -= len(m.RootFs) - copy(dAtA[i:], m.RootFs) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.RootFs))) - i-- - dAtA[i] = 0x1a - } - if m.DiskMb != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.DiskMb)) - i-- - dAtA[i] = 0x10 - } - if m.MemoryMb != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.MemoryMb)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *DesiredLRP) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DesiredLRP) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DesiredLRP) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.LogRateLimit != nil { - { - size, err := m.LogRateLimit.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xaa - } - if len(m.Sidecars) > 0 { - for iNdEx := len(m.Sidecars) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Sidecars[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0xa2 - } - } - if len(m.MetricTags) > 0 { - for k := range m.MetricTags { - v := m.MetricTags[k] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintDesiredLrp(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x9a - } - } - if len(m.ImageLayers) > 0 { - for iNdEx := len(m.ImageLayers) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ImageLayers[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x92 - } - } - if m.CheckDefinition != nil { - { - size, err := m.CheckDefinition.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x8a - } - if len(m.ImagePassword) > 0 { - i -= len(m.ImagePassword) - copy(dAtA[i:], m.ImagePassword) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.ImagePassword))) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x82 - } - if len(m.ImageUsername) > 0 { - i -= len(m.ImageUsername) - copy(dAtA[i:], m.ImageUsername) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.ImageUsername))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xfa - } - if m.CertificateProperties != nil { - { - size, err := m.CertificateProperties.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xf2 - } - if m.MaxPids != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.MaxPids)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe8 - } - if len(m.PlacementTags) > 0 { - for iNdEx := len(m.PlacementTags) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.PlacementTags[iNdEx]) - copy(dAtA[i:], m.PlacementTags[iNdEx]) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.PlacementTags[iNdEx]))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe2 - } - } - if m.StartTimeoutMs != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.StartTimeoutMs)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd8 - } - if m.Network != nil { - { - size, err := m.Network.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xd2 - } - if len(m.VolumeMounts) > 0 { - for iNdEx := len(m.VolumeMounts) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.VolumeMounts[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xca - } - } - if len(m.TrustedSystemCertificatesPath) > 0 { - i -= len(m.TrustedSystemCertificatesPath) - copy(dAtA[i:], m.TrustedSystemCertificatesPath) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.TrustedSystemCertificatesPath))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xc2 - } - if len(m.LegacyDownloadUser) > 0 { - i -= len(m.LegacyDownloadUser) - copy(dAtA[i:], m.LegacyDownloadUser) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.LegacyDownloadUser))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xba - } - if len(m.CachedDependencies) > 0 { - for iNdEx := len(m.CachedDependencies) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.CachedDependencies[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb2 - } - } - if m.ModificationTag != nil { - { - size, err := m.ModificationTag.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xaa - } - if len(m.EgressRules) > 0 { - for iNdEx := len(m.EgressRules) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.EgressRules[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa2 - } - } - if len(m.Annotation) > 0 { - i -= len(m.Annotation) - copy(dAtA[i:], m.Annotation) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.Annotation))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x9a - } - if len(m.MetricsGuid) > 0 { - i -= len(m.MetricsGuid) - copy(dAtA[i:], m.MetricsGuid) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.MetricsGuid))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x92 - } - if len(m.LogGuid) > 0 { - i -= len(m.LogGuid) - copy(dAtA[i:], m.LogGuid) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.LogGuid))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x8a - } - if len(m.LogSource) > 0 { - i -= len(m.LogSource) - copy(dAtA[i:], m.LogSource) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.LogSource))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 - } - if m.Routes != nil { - { - size := m.Routes.Size() - i -= size - if _, err := m.Routes.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - if len(m.Ports) > 0 { - for iNdEx := len(m.Ports) - 1; iNdEx >= 0; iNdEx-- { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.Ports[iNdEx])) - i-- - dAtA[i] = 0x70 - } - } - if m.Privileged { - i-- - if m.Privileged { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x68 - } - if m.CpuWeight != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.CpuWeight)) - i-- - dAtA[i] = 0x60 - } - if m.MemoryMb != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.MemoryMb)) - i-- - dAtA[i] = 0x58 - } - if m.DiskMb != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.DiskMb)) - i-- - dAtA[i] = 0x50 - } - if m.Monitor != nil { - { - size, err := m.Monitor.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - } - if m.DeprecatedStartTimeoutS != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.DeprecatedStartTimeoutS)) - i-- - dAtA[i] = 0x40 - } - if m.Action != nil { - { - size, err := m.Action.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } - if m.Setup != nil { - { - size, err := m.Setup.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - if len(m.EnvironmentVariables) > 0 { - for iNdEx := len(m.EnvironmentVariables) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.EnvironmentVariables[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - } - if m.Instances != 0 { - i = encodeVarintDesiredLrp(dAtA, i, uint64(m.Instances)) - i-- - dAtA[i] = 0x20 - } - if len(m.RootFs) > 0 { - i -= len(m.RootFs) - copy(dAtA[i:], m.RootFs) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.RootFs))) - i-- - dAtA[i] = 0x1a - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.Domain))) - i-- - dAtA[i] = 0x12 - } - if len(m.ProcessGuid) > 0 { - i -= len(m.ProcessGuid) - copy(dAtA[i:], m.ProcessGuid) - i = encodeVarintDesiredLrp(dAtA, i, uint64(len(m.ProcessGuid))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintDesiredLrp(dAtA []byte, offset int, v uint64) int { - offset -= sovDesiredLrp(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *DesiredLRPSchedulingInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.DesiredLRPKey.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - l = len(m.Annotation) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.Instances != 0 { - n += 1 + sovDesiredLrp(uint64(m.Instances)) - } - l = m.DesiredLRPResource.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - l = m.Routes.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - l = m.ModificationTag.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - if m.VolumePlacement != nil { - l = m.VolumePlacement.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if len(m.PlacementTags) > 0 { - for _, s := range m.PlacementTags { - l = len(s) - n += 1 + l + sovDesiredLrp(uint64(l)) - } - } - return n -} - -func (m *DesiredLRPRunInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.DesiredLRPKey.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - if len(m.EnvironmentVariables) > 0 { - for _, e := range m.EnvironmentVariables { - l = e.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - } - if m.Setup != nil { - l = m.Setup.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.Action != nil { - l = m.Action.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.Monitor != nil { - l = m.Monitor.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.DeprecatedStartTimeoutS != 0 { - n += 1 + sovDesiredLrp(uint64(m.DeprecatedStartTimeoutS)) - } - if m.Privileged { - n += 2 - } - if m.CpuWeight != 0 { - n += 1 + sovDesiredLrp(uint64(m.CpuWeight)) - } - if len(m.Ports) > 0 { - for _, e := range m.Ports { - n += 1 + sovDesiredLrp(uint64(e)) - } - } - if len(m.EgressRules) > 0 { - for _, e := range m.EgressRules { - l = e.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - } - l = len(m.LogSource) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.MetricsGuid) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.CreatedAt != 0 { - n += 1 + sovDesiredLrp(uint64(m.CreatedAt)) - } - if len(m.CachedDependencies) > 0 { - for _, e := range m.CachedDependencies { - l = e.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - } - l = len(m.LegacyDownloadUser) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.TrustedSystemCertificatesPath) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if len(m.VolumeMounts) > 0 { - for _, e := range m.VolumeMounts { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if m.Network != nil { - l = m.Network.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if m.StartTimeoutMs != 0 { - n += 2 + sovDesiredLrp(uint64(m.StartTimeoutMs)) - } - if m.CertificateProperties != nil { - l = m.CertificateProperties.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.ImageUsername) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.ImagePassword) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if m.CheckDefinition != nil { - l = m.CheckDefinition.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if len(m.ImageLayers) > 0 { - for _, e := range m.ImageLayers { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if len(m.MetricTags) > 0 { - for k, v := range m.MetricTags { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovDesiredLrp(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovDesiredLrp(uint64(len(k))) + l - n += mapEntrySize + 2 + sovDesiredLrp(uint64(mapEntrySize)) - } - } - if len(m.Sidecars) > 0 { - for _, e := range m.Sidecars { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if m.LogRateLimit != nil { - l = m.LogRateLimit.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - return n -} - -func (m *ProtoRoutes) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Routes) > 0 { - for k, v := range m.Routes { - _ = k - _ = v - l = 0 - if len(v) > 0 { - l = 1 + len(v) + sovDesiredLrp(uint64(len(v))) - } - mapEntrySize := 1 + len(k) + sovDesiredLrp(uint64(len(k))) + l - n += mapEntrySize + 1 + sovDesiredLrp(uint64(mapEntrySize)) - } - } - return n -} - -func (m *DesiredLRPUpdate) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.OptionalInstances != nil { - n += m.OptionalInstances.Size() - } - if m.Routes != nil { - l = m.Routes.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.OptionalAnnotation != nil { - n += m.OptionalAnnotation.Size() - } - if len(m.MetricTags) > 0 { - for k, v := range m.MetricTags { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovDesiredLrp(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovDesiredLrp(uint64(len(k))) + l - n += mapEntrySize + 1 + sovDesiredLrp(uint64(mapEntrySize)) - } - } - return n -} - -func (m *DesiredLRPUpdate_Instances) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 1 + sovDesiredLrp(uint64(m.Instances)) - return n -} -func (m *DesiredLRPUpdate_Annotation) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Annotation) - n += 1 + l + sovDesiredLrp(uint64(l)) - return n -} -func (m *DesiredLRPKey) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.LogGuid) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - return n -} - -func (m *DesiredLRPResource) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.MemoryMb != 0 { - n += 1 + sovDesiredLrp(uint64(m.MemoryMb)) - } - if m.DiskMb != 0 { - n += 1 + sovDesiredLrp(uint64(m.DiskMb)) - } - l = len(m.RootFs) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.MaxPids != 0 { - n += 1 + sovDesiredLrp(uint64(m.MaxPids)) - } - return n -} - -func (m *DesiredLRP) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ProcessGuid) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.Domain) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.RootFs) - if l > 0 { - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.Instances != 0 { - n += 1 + sovDesiredLrp(uint64(m.Instances)) - } - if len(m.EnvironmentVariables) > 0 { - for _, e := range m.EnvironmentVariables { - l = e.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - } - if m.Setup != nil { - l = m.Setup.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.Action != nil { - l = m.Action.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.DeprecatedStartTimeoutS != 0 { - n += 1 + sovDesiredLrp(uint64(m.DeprecatedStartTimeoutS)) - } - if m.Monitor != nil { - l = m.Monitor.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - if m.DiskMb != 0 { - n += 1 + sovDesiredLrp(uint64(m.DiskMb)) - } - if m.MemoryMb != 0 { - n += 1 + sovDesiredLrp(uint64(m.MemoryMb)) - } - if m.CpuWeight != 0 { - n += 1 + sovDesiredLrp(uint64(m.CpuWeight)) - } - if m.Privileged { - n += 2 - } - if len(m.Ports) > 0 { - for _, e := range m.Ports { - n += 1 + sovDesiredLrp(uint64(e)) - } - } - if m.Routes != nil { - l = m.Routes.Size() - n += 1 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.LogSource) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.LogGuid) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.MetricsGuid) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.Annotation) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if len(m.EgressRules) > 0 { - for _, e := range m.EgressRules { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if m.ModificationTag != nil { - l = m.ModificationTag.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if len(m.CachedDependencies) > 0 { - for _, e := range m.CachedDependencies { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - l = len(m.LegacyDownloadUser) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.TrustedSystemCertificatesPath) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if len(m.VolumeMounts) > 0 { - for _, e := range m.VolumeMounts { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if m.Network != nil { - l = m.Network.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if m.StartTimeoutMs != 0 { - n += 2 + sovDesiredLrp(uint64(m.StartTimeoutMs)) - } - if len(m.PlacementTags) > 0 { - for _, s := range m.PlacementTags { - l = len(s) - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if m.MaxPids != 0 { - n += 2 + sovDesiredLrp(uint64(m.MaxPids)) - } - if m.CertificateProperties != nil { - l = m.CertificateProperties.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.ImageUsername) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - l = len(m.ImagePassword) - if l > 0 { - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if m.CheckDefinition != nil { - l = m.CheckDefinition.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - if len(m.ImageLayers) > 0 { - for _, e := range m.ImageLayers { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if len(m.MetricTags) > 0 { - for k, v := range m.MetricTags { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovDesiredLrp(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovDesiredLrp(uint64(len(k))) + l - n += mapEntrySize + 2 + sovDesiredLrp(uint64(mapEntrySize)) - } - } - if len(m.Sidecars) > 0 { - for _, e := range m.Sidecars { - l = e.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - } - if m.LogRateLimit != nil { - l = m.LogRateLimit.Size() - n += 2 + l + sovDesiredLrp(uint64(l)) - } - return n -} - -func sovDesiredLrp(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozDesiredLrp(x uint64) (n int) { - return sovDesiredLrp(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *DesiredLRPSchedulingInfo) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPSchedulingInfo{`, - `DesiredLRPKey:` + strings.Replace(strings.Replace(this.DesiredLRPKey.String(), "DesiredLRPKey", "DesiredLRPKey", 1), `&`, ``, 1) + `,`, - `Annotation:` + fmt.Sprintf("%v", this.Annotation) + `,`, - `Instances:` + fmt.Sprintf("%v", this.Instances) + `,`, - `DesiredLRPResource:` + strings.Replace(strings.Replace(this.DesiredLRPResource.String(), "DesiredLRPResource", "DesiredLRPResource", 1), `&`, ``, 1) + `,`, - `Routes:` + fmt.Sprintf("%v", this.Routes) + `,`, - `ModificationTag:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ModificationTag), "ModificationTag", "ModificationTag", 1), `&`, ``, 1) + `,`, - `VolumePlacement:` + strings.Replace(fmt.Sprintf("%v", this.VolumePlacement), "VolumePlacement", "VolumePlacement", 1) + `,`, - `PlacementTags:` + fmt.Sprintf("%v", this.PlacementTags) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPRunInfo) String() string { - if this == nil { - return "nil" - } - repeatedStringForEnvironmentVariables := "[]EnvironmentVariable{" - for _, f := range this.EnvironmentVariables { - repeatedStringForEnvironmentVariables += fmt.Sprintf("%v", f) + "," - } - repeatedStringForEnvironmentVariables += "}" - repeatedStringForEgressRules := "[]SecurityGroupRule{" - for _, f := range this.EgressRules { - repeatedStringForEgressRules += fmt.Sprintf("%v", f) + "," - } - repeatedStringForEgressRules += "}" - repeatedStringForCachedDependencies := "[]*CachedDependency{" - for _, f := range this.CachedDependencies { - repeatedStringForCachedDependencies += strings.Replace(fmt.Sprintf("%v", f), "CachedDependency", "CachedDependency", 1) + "," - } - repeatedStringForCachedDependencies += "}" - repeatedStringForVolumeMounts := "[]*VolumeMount{" - for _, f := range this.VolumeMounts { - repeatedStringForVolumeMounts += strings.Replace(fmt.Sprintf("%v", f), "VolumeMount", "VolumeMount", 1) + "," - } - repeatedStringForVolumeMounts += "}" - repeatedStringForImageLayers := "[]*ImageLayer{" - for _, f := range this.ImageLayers { - repeatedStringForImageLayers += strings.Replace(fmt.Sprintf("%v", f), "ImageLayer", "ImageLayer", 1) + "," - } - repeatedStringForImageLayers += "}" - repeatedStringForSidecars := "[]*Sidecar{" - for _, f := range this.Sidecars { - repeatedStringForSidecars += strings.Replace(fmt.Sprintf("%v", f), "Sidecar", "Sidecar", 1) + "," - } - repeatedStringForSidecars += "}" - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%v: %v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - s := strings.Join([]string{`&DesiredLRPRunInfo{`, - `DesiredLRPKey:` + strings.Replace(strings.Replace(this.DesiredLRPKey.String(), "DesiredLRPKey", "DesiredLRPKey", 1), `&`, ``, 1) + `,`, - `EnvironmentVariables:` + repeatedStringForEnvironmentVariables + `,`, - `Setup:` + strings.Replace(fmt.Sprintf("%v", this.Setup), "Action", "Action", 1) + `,`, - `Action:` + strings.Replace(fmt.Sprintf("%v", this.Action), "Action", "Action", 1) + `,`, - `Monitor:` + strings.Replace(fmt.Sprintf("%v", this.Monitor), "Action", "Action", 1) + `,`, - `DeprecatedStartTimeoutS:` + fmt.Sprintf("%v", this.DeprecatedStartTimeoutS) + `,`, - `Privileged:` + fmt.Sprintf("%v", this.Privileged) + `,`, - `CpuWeight:` + fmt.Sprintf("%v", this.CpuWeight) + `,`, - `Ports:` + fmt.Sprintf("%v", this.Ports) + `,`, - `EgressRules:` + repeatedStringForEgressRules + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `MetricsGuid:` + fmt.Sprintf("%v", this.MetricsGuid) + `,`, - `CreatedAt:` + fmt.Sprintf("%v", this.CreatedAt) + `,`, - `CachedDependencies:` + repeatedStringForCachedDependencies + `,`, - `LegacyDownloadUser:` + fmt.Sprintf("%v", this.LegacyDownloadUser) + `,`, - `TrustedSystemCertificatesPath:` + fmt.Sprintf("%v", this.TrustedSystemCertificatesPath) + `,`, - `VolumeMounts:` + repeatedStringForVolumeMounts + `,`, - `Network:` + strings.Replace(fmt.Sprintf("%v", this.Network), "Network", "Network", 1) + `,`, - `StartTimeoutMs:` + fmt.Sprintf("%v", this.StartTimeoutMs) + `,`, - `CertificateProperties:` + strings.Replace(fmt.Sprintf("%v", this.CertificateProperties), "CertificateProperties", "CertificateProperties", 1) + `,`, - `ImageUsername:` + fmt.Sprintf("%v", this.ImageUsername) + `,`, - `ImagePassword:` + fmt.Sprintf("%v", this.ImagePassword) + `,`, - `CheckDefinition:` + strings.Replace(fmt.Sprintf("%v", this.CheckDefinition), "CheckDefinition", "CheckDefinition", 1) + `,`, - `ImageLayers:` + repeatedStringForImageLayers + `,`, - `MetricTags:` + mapStringForMetricTags + `,`, - `Sidecars:` + repeatedStringForSidecars + `,`, - `LogRateLimit:` + strings.Replace(fmt.Sprintf("%v", this.LogRateLimit), "LogRateLimit", "LogRateLimit", 1) + `,`, - `}`, - }, "") - return s -} -func (this *ProtoRoutes) String() string { - if this == nil { - return "nil" - } - keysForRoutes := make([]string, 0, len(this.Routes)) - for k, _ := range this.Routes { - keysForRoutes = append(keysForRoutes, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForRoutes) - mapStringForRoutes := "map[string][]byte{" - for _, k := range keysForRoutes { - mapStringForRoutes += fmt.Sprintf("%v: %v,", k, this.Routes[k]) - } - mapStringForRoutes += "}" - s := strings.Join([]string{`&ProtoRoutes{`, - `Routes:` + mapStringForRoutes + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPUpdate) String() string { - if this == nil { - return "nil" - } - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%v: %v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - s := strings.Join([]string{`&DesiredLRPUpdate{`, - `OptionalInstances:` + fmt.Sprintf("%v", this.OptionalInstances) + `,`, - `Routes:` + fmt.Sprintf("%v", this.Routes) + `,`, - `OptionalAnnotation:` + fmt.Sprintf("%v", this.OptionalAnnotation) + `,`, - `MetricTags:` + mapStringForMetricTags + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPUpdate_Instances) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPUpdate_Instances{`, - `Instances:` + fmt.Sprintf("%v", this.Instances) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPUpdate_Annotation) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPUpdate_Annotation{`, - `Annotation:` + fmt.Sprintf("%v", this.Annotation) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPKey) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPKey{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `LogGuid:` + fmt.Sprintf("%v", this.LogGuid) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRPResource) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&DesiredLRPResource{`, - `MemoryMb:` + fmt.Sprintf("%v", this.MemoryMb) + `,`, - `DiskMb:` + fmt.Sprintf("%v", this.DiskMb) + `,`, - `RootFs:` + fmt.Sprintf("%v", this.RootFs) + `,`, - `MaxPids:` + fmt.Sprintf("%v", this.MaxPids) + `,`, - `}`, - }, "") - return s -} -func (this *DesiredLRP) String() string { - if this == nil { - return "nil" - } - repeatedStringForEnvironmentVariables := "[]*EnvironmentVariable{" - for _, f := range this.EnvironmentVariables { - repeatedStringForEnvironmentVariables += strings.Replace(fmt.Sprintf("%v", f), "EnvironmentVariable", "EnvironmentVariable", 1) + "," - } - repeatedStringForEnvironmentVariables += "}" - repeatedStringForEgressRules := "[]*SecurityGroupRule{" - for _, f := range this.EgressRules { - repeatedStringForEgressRules += strings.Replace(fmt.Sprintf("%v", f), "SecurityGroupRule", "SecurityGroupRule", 1) + "," - } - repeatedStringForEgressRules += "}" - repeatedStringForCachedDependencies := "[]*CachedDependency{" - for _, f := range this.CachedDependencies { - repeatedStringForCachedDependencies += strings.Replace(fmt.Sprintf("%v", f), "CachedDependency", "CachedDependency", 1) + "," - } - repeatedStringForCachedDependencies += "}" - repeatedStringForVolumeMounts := "[]*VolumeMount{" - for _, f := range this.VolumeMounts { - repeatedStringForVolumeMounts += strings.Replace(fmt.Sprintf("%v", f), "VolumeMount", "VolumeMount", 1) + "," - } - repeatedStringForVolumeMounts += "}" - repeatedStringForImageLayers := "[]*ImageLayer{" - for _, f := range this.ImageLayers { - repeatedStringForImageLayers += strings.Replace(fmt.Sprintf("%v", f), "ImageLayer", "ImageLayer", 1) + "," - } - repeatedStringForImageLayers += "}" - repeatedStringForSidecars := "[]*Sidecar{" - for _, f := range this.Sidecars { - repeatedStringForSidecars += strings.Replace(fmt.Sprintf("%v", f), "Sidecar", "Sidecar", 1) + "," - } - repeatedStringForSidecars += "}" - keysForMetricTags := make([]string, 0, len(this.MetricTags)) - for k, _ := range this.MetricTags { - keysForMetricTags = append(keysForMetricTags, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMetricTags) - mapStringForMetricTags := "map[string]*MetricTagValue{" - for _, k := range keysForMetricTags { - mapStringForMetricTags += fmt.Sprintf("%v: %v,", k, this.MetricTags[k]) - } - mapStringForMetricTags += "}" - s := strings.Join([]string{`&DesiredLRP{`, - `ProcessGuid:` + fmt.Sprintf("%v", this.ProcessGuid) + `,`, - `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, - `RootFs:` + fmt.Sprintf("%v", this.RootFs) + `,`, - `Instances:` + fmt.Sprintf("%v", this.Instances) + `,`, - `EnvironmentVariables:` + repeatedStringForEnvironmentVariables + `,`, - `Setup:` + strings.Replace(fmt.Sprintf("%v", this.Setup), "Action", "Action", 1) + `,`, - `Action:` + strings.Replace(fmt.Sprintf("%v", this.Action), "Action", "Action", 1) + `,`, - `DeprecatedStartTimeoutS:` + fmt.Sprintf("%v", this.DeprecatedStartTimeoutS) + `,`, - `Monitor:` + strings.Replace(fmt.Sprintf("%v", this.Monitor), "Action", "Action", 1) + `,`, - `DiskMb:` + fmt.Sprintf("%v", this.DiskMb) + `,`, - `MemoryMb:` + fmt.Sprintf("%v", this.MemoryMb) + `,`, - `CpuWeight:` + fmt.Sprintf("%v", this.CpuWeight) + `,`, - `Privileged:` + fmt.Sprintf("%v", this.Privileged) + `,`, - `Ports:` + fmt.Sprintf("%v", this.Ports) + `,`, - `Routes:` + fmt.Sprintf("%v", this.Routes) + `,`, - `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, - `LogGuid:` + fmt.Sprintf("%v", this.LogGuid) + `,`, - `MetricsGuid:` + fmt.Sprintf("%v", this.MetricsGuid) + `,`, - `Annotation:` + fmt.Sprintf("%v", this.Annotation) + `,`, - `EgressRules:` + repeatedStringForEgressRules + `,`, - `ModificationTag:` + strings.Replace(fmt.Sprintf("%v", this.ModificationTag), "ModificationTag", "ModificationTag", 1) + `,`, - `CachedDependencies:` + repeatedStringForCachedDependencies + `,`, - `LegacyDownloadUser:` + fmt.Sprintf("%v", this.LegacyDownloadUser) + `,`, - `TrustedSystemCertificatesPath:` + fmt.Sprintf("%v", this.TrustedSystemCertificatesPath) + `,`, - `VolumeMounts:` + repeatedStringForVolumeMounts + `,`, - `Network:` + strings.Replace(fmt.Sprintf("%v", this.Network), "Network", "Network", 1) + `,`, - `StartTimeoutMs:` + fmt.Sprintf("%v", this.StartTimeoutMs) + `,`, - `PlacementTags:` + fmt.Sprintf("%v", this.PlacementTags) + `,`, - `MaxPids:` + fmt.Sprintf("%v", this.MaxPids) + `,`, - `CertificateProperties:` + strings.Replace(fmt.Sprintf("%v", this.CertificateProperties), "CertificateProperties", "CertificateProperties", 1) + `,`, - `ImageUsername:` + fmt.Sprintf("%v", this.ImageUsername) + `,`, - `ImagePassword:` + fmt.Sprintf("%v", this.ImagePassword) + `,`, - `CheckDefinition:` + strings.Replace(fmt.Sprintf("%v", this.CheckDefinition), "CheckDefinition", "CheckDefinition", 1) + `,`, - `ImageLayers:` + repeatedStringForImageLayers + `,`, - `MetricTags:` + mapStringForMetricTags + `,`, - `Sidecars:` + repeatedStringForSidecars + `,`, - `LogRateLimit:` + strings.Replace(fmt.Sprintf("%v", this.LogRateLimit), "LogRateLimit", "LogRateLimit", 1) + `,`, - `}`, - }, "") - return s -} -func valueToStringDesiredLrp(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *DesiredLRPSchedulingInfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPSchedulingInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPSchedulingInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLRPKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.DesiredLRPKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Annotation", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Annotation = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Instances", wireType) - } - m.Instances = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Instances |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLRPResource", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.DesiredLRPResource.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Routes", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Routes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ModificationTag", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ModificationTag.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VolumePlacement", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.VolumePlacement == nil { - m.VolumePlacement = &VolumePlacement{} - } - if err := m.VolumePlacement.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PlacementTags", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PlacementTags = append(m.PlacementTags, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPRunInfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPRunInfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPRunInfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DesiredLRPKey", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.DesiredLRPKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EnvironmentVariables", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EnvironmentVariables = append(m.EnvironmentVariables, EnvironmentVariable{}) - if err := m.EnvironmentVariables[len(m.EnvironmentVariables)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Setup", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Setup == nil { - m.Setup = &Action{} - } - if err := m.Setup.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Action == nil { - m.Action = &Action{} - } - if err := m.Action.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Monitor", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Monitor == nil { - m.Monitor = &Action{} - } - if err := m.Monitor.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedStartTimeoutS", wireType) - } - m.DeprecatedStartTimeoutS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedStartTimeoutS |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Privileged", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Privileged = bool(v != 0) - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CpuWeight", wireType) - } - m.CpuWeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CpuWeight |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9: - if wireType == 0 { - var v uint32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Ports = append(m.Ports, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - var count int - for _, integer := range dAtA[iNdEx:postIndex] { - if integer < 128 { - count++ - } - } - elementCount = count - if elementCount != 0 && len(m.Ports) == 0 { - m.Ports = make([]uint32, 0, elementCount) - } - for iNdEx < postIndex { - var v uint32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Ports = append(m.Ports, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field Ports", wireType) - } - case 10: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EgressRules", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EgressRules = append(m.EgressRules, SecurityGroupRule{}) - if err := m.EgressRules[len(m.EgressRules)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 12: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricsGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MetricsGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CreatedAt", wireType) - } - m.CreatedAt = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CreatedAt |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 14: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedDependencies", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CachedDependencies = append(m.CachedDependencies, &CachedDependency{}) - if err := m.CachedDependencies[len(m.CachedDependencies)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LegacyDownloadUser", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LegacyDownloadUser = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 16: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TrustedSystemCertificatesPath", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TrustedSystemCertificatesPath = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 17: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VolumeMounts", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.VolumeMounts = append(m.VolumeMounts, &VolumeMount{}) - if err := m.VolumeMounts[len(m.VolumeMounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 18: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Network", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Network == nil { - m.Network = &Network{} - } - if err := m.Network.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 19: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StartTimeoutMs", wireType) - } - m.StartTimeoutMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.StartTimeoutMs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 20: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CertificateProperties", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CertificateProperties == nil { - m.CertificateProperties = &CertificateProperties{} - } - if err := m.CertificateProperties.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 21: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImageUsername", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImageUsername = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 22: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImagePassword", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImagePassword = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 23: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CheckDefinition", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CheckDefinition == nil { - m.CheckDefinition = &CheckDefinition{} - } - if err := m.CheckDefinition.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 24: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImageLayers", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImageLayers = append(m.ImageLayers, &ImageLayer{}) - if err := m.ImageLayers[len(m.ImageLayers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 25: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricTags", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MetricTags == nil { - m.MetricTags = make(map[string]*MetricTagValue) - } - var mapkey string - var mapvalue *MetricTagValue - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &MetricTagValue{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.MetricTags[mapkey] = mapvalue - iNdEx = postIndex - case 26: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sidecars", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sidecars = append(m.Sidecars, &Sidecar{}) - if err := m.Sidecars[len(m.Sidecars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 27: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogRateLimit", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.LogRateLimit == nil { - m.LogRateLimit = &LogRateLimit{} - } - if err := m.LogRateLimit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ProtoRoutes) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ProtoRoutes: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ProtoRoutes: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Routes", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Routes == nil { - m.Routes = make(map[string][]byte) - } - var mapkey string - mapvalue := []byte{} - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapbyteLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapbyteLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intMapbyteLen := int(mapbyteLen) - if intMapbyteLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postbytesIndex := iNdEx + intMapbyteLen - if postbytesIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postbytesIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = make([]byte, mapbyteLen) - copy(mapvalue, dAtA[iNdEx:postbytesIndex]) - iNdEx = postbytesIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.Routes[mapkey] = mapvalue - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPUpdate) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPUpdate: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPUpdate: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Instances", wireType) - } - var v int32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.OptionalInstances = &DesiredLRPUpdate_Instances{v} - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Routes", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Routes == nil { - m.Routes = &Routes{} - } - if err := m.Routes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Annotation", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OptionalAnnotation = &DesiredLRPUpdate_Annotation{string(dAtA[iNdEx:postIndex])} - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricTags", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MetricTags == nil { - m.MetricTags = make(map[string]*MetricTagValue) - } - var mapkey string - var mapvalue *MetricTagValue - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &MetricTagValue{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.MetricTags[mapkey] = mapvalue - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPKey) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPKey: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPKey: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRPResource) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRPResource: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRPResource: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MemoryMb", wireType) - } - m.MemoryMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MemoryMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DiskMb", wireType) - } - m.DiskMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DiskMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RootFs", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RootFs = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxPids", wireType) - } - m.MaxPids = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxPids |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DesiredLRP) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DesiredLRP: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DesiredLRP: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProcessGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Domain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RootFs", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RootFs = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Instances", wireType) - } - m.Instances = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Instances |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EnvironmentVariables", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EnvironmentVariables = append(m.EnvironmentVariables, &EnvironmentVariable{}) - if err := m.EnvironmentVariables[len(m.EnvironmentVariables)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Setup", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Setup == nil { - m.Setup = &Action{} - } - if err := m.Setup.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Action", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Action == nil { - m.Action = &Action{} - } - if err := m.Action.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 8: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedStartTimeoutS", wireType) - } - m.DeprecatedStartTimeoutS = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeprecatedStartTimeoutS |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Monitor", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Monitor == nil { - m.Monitor = &Action{} - } - if err := m.Monitor.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DiskMb", wireType) - } - m.DiskMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DiskMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MemoryMb", wireType) - } - m.MemoryMb = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MemoryMb |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CpuWeight", wireType) - } - m.CpuWeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CpuWeight |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Privileged", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Privileged = bool(v != 0) - case 14: - if wireType == 0 { - var v uint32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Ports = append(m.Ports, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - var count int - for _, integer := range dAtA[iNdEx:postIndex] { - if integer < 128 { - count++ - } - } - elementCount = count - if elementCount != 0 && len(m.Ports) == 0 { - m.Ports = make([]uint32, 0, elementCount) - } - for iNdEx < postIndex { - var v uint32 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Ports = append(m.Ports, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field Ports", wireType) - } - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Routes", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Routes == nil { - m.Routes = &Routes{} - } - if err := m.Routes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 16: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogSource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogSource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 17: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LogGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 18: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricsGuid", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MetricsGuid = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 19: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Annotation", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Annotation = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 20: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EgressRules", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EgressRules = append(m.EgressRules, &SecurityGroupRule{}) - if err := m.EgressRules[len(m.EgressRules)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 21: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ModificationTag", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ModificationTag == nil { - m.ModificationTag = &ModificationTag{} - } - if err := m.ModificationTag.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 22: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedDependencies", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CachedDependencies = append(m.CachedDependencies, &CachedDependency{}) - if err := m.CachedDependencies[len(m.CachedDependencies)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 23: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LegacyDownloadUser", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LegacyDownloadUser = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 24: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TrustedSystemCertificatesPath", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TrustedSystemCertificatesPath = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 25: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VolumeMounts", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.VolumeMounts = append(m.VolumeMounts, &VolumeMount{}) - if err := m.VolumeMounts[len(m.VolumeMounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 26: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Network", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Network == nil { - m.Network = &Network{} - } - if err := m.Network.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 27: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StartTimeoutMs", wireType) - } - m.StartTimeoutMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.StartTimeoutMs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 28: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PlacementTags", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PlacementTags = append(m.PlacementTags, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 29: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxPids", wireType) - } - m.MaxPids = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxPids |= int32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 30: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CertificateProperties", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CertificateProperties == nil { - m.CertificateProperties = &CertificateProperties{} - } - if err := m.CertificateProperties.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 31: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImageUsername", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImageUsername = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 32: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImagePassword", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImagePassword = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 33: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CheckDefinition", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CheckDefinition == nil { - m.CheckDefinition = &CheckDefinition{} - } - if err := m.CheckDefinition.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 34: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ImageLayers", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ImageLayers = append(m.ImageLayers, &ImageLayer{}) - if err := m.ImageLayers[len(m.ImageLayers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 35: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MetricTags", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MetricTags == nil { - m.MetricTags = make(map[string]*MetricTagValue) - } - var mapkey string - var mapvalue *MetricTagValue - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthDesiredLrp - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &MetricTagValue{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.MetricTags[mapkey] = mapvalue - iNdEx = postIndex - case 36: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sidecars", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sidecars = append(m.Sidecars, &Sidecar{}) - if err := m.Sidecars[len(m.Sidecars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 37: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LogRateLimit", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthDesiredLrp - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthDesiredLrp - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.LogRateLimit == nil { - m.LogRateLimit = &LogRateLimit{} - } - if err := m.LogRateLimit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDesiredLrp(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDesiredLrp - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipDesiredLrp(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDesiredLrp - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthDesiredLrp - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupDesiredLrp - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthDesiredLrp - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthDesiredLrp = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDesiredLrp = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupDesiredLrp = fmt.Errorf("proto: unexpected end of group") -) From a4bd5b6353c8e95669980df8bb62a19b87bbfe35 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 12 Feb 2025 23:11:48 +0000 Subject: [PATCH 134/155] VolumeMountedFiles needs to be always_emit Regen protos Resolve issues with unit tests --- models/actions.pb.go | 134 ++++++------- models/actions.proto | 2 +- models/actions_bbs.pb.go | 2 +- models/actions_test.go | 2 +- models/desired_lrp.pb.go | 376 +++++++++++++++++------------------ models/desired_lrp.proto | 4 +- models/desired_lrp_bbs.pb.go | 4 +- models/task.pb.go | 105 +++++----- models/task.proto | 2 +- models/task_bbs.pb.go | 2 +- models/task_test.go | 3 +- 11 files changed, 319 insertions(+), 317 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index 0c015bc5..5fb6d4aa 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -902,7 +902,7 @@ var file_actions_proto_rawDesc = string([]byte{ 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x22, 0x81, 0x03, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x75, + 0x75, 0x73, 0x65, 0x72, 0x22, 0x86, 0x03, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, @@ -922,74 +922,74 @@ var file_actions_proto_rawDesc = string([]byte{ 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x13, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, - 0x74, 0x12, 0x45, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, - 0x6c, 0x65, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x22, 0xb2, 0x01, 0x0a, 0x12, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x15, - 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x18, 0x01, 0x52, - 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, - 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x22, 0xfd, 0x01, - 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, - 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x12, 0x2d, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x12, 0x3b, 0x0a, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1e, 0x0a, - 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x5d, 0x0a, - 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, - 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x64, 0x0a, 0x13, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x22, 0x62, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x69, 0x61, - 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x67, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, - 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, - 0x74, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x06, 0x82, 0x41, 0x03, 0x6e, 0x69, 0x6c, 0x48, 0x00, - 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x05, 0x6e, - 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x08, 0x82, 0x41, 0x03, 0x6e, - 0x69, 0x6c, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x88, 0x01, 0x01, - 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, - 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, - 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x22, 0xb2, 0x01, + 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, + 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, + 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, + 0x6d, 0x73, 0x22, 0xfd, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, + 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, + 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x0d, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2d, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x3b, 0x0a, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, + 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x16, 0x66, 0x61, 0x69, 0x6c, + 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, + 0x69, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x22, 0x5d, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x22, 0x64, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, + 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, + 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x62, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, + 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x67, 0x0a, 0x16, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x22, 0x74, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x06, 0x6e, + 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x06, 0x82, 0x41, 0x03, + 0x6e, 0x69, 0x6c, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, + 0x12, 0x23, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, + 0x08, 0x82, 0x41, 0x03, 0x6e, 0x69, 0x6c, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, + 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, + 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, + 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) var ( diff --git a/models/actions.proto b/models/actions.proto index f5d8638d..12ccb2f4 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -57,7 +57,7 @@ message ProtoRunAction { string user = 6 [json_name = "user", (bbs.bbs_json_always_emit) = true]; string log_source = 7 [json_name = "log_source"]; bool suppress_log_output = 8 [json_name = "suppress_log_output", (bbs.bbs_json_always_emit) = true]; - repeated ProtoFile volume_mounted_files = 9 [json_name = "volume_mounted_files"]; + repeated ProtoFile volume_mounted_files = 9 [json_name = "volume_mounted_files", (bbs.bbs_json_always_emit) = true]; } message ProtoTimeoutAction { diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index b219d9b7..d49ca515 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -662,7 +662,7 @@ type RunAction struct { User string `json:"user"` LogSource string `json:"log_source,omitempty"` SuppressLogOutput bool `json:"suppress_log_output"` - VolumeMountedFiles []*File `json:"volume_mounted_files,omitempty"` + VolumeMountedFiles []*File `json:"volume_mounted_files"` } func (this *RunAction) Equal(that interface{}) bool { diff --git a/models/actions_test.go b/models/actions_test.go index 745038cf..13975c26 100644 --- a/models/actions_test.go +++ b/models/actions_test.go @@ -377,7 +377,7 @@ var _ = Describe("Actions", func() { "nofile": 10 }, "user": "someone", - "suppress_log_output": false + "suppress_log_output": false, "volume_mounted_files": null } }, diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index f3c9f1e7..4a7dbdaf 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1032,7 +1032,7 @@ var file_desired_lrp_proto_rawDesc = string([]byte{ 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x22, 0xca, 0x0d, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, + 0x61, 0x67, 0x73, 0x22, 0xcf, 0x0d, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4c, 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, @@ -1129,201 +1129,201 @@ var file_desired_lrp_proto_rawDesc = string([]byte{ 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, - 0x69, 0x74, 0x12, 0x45, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, + 0x69, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, - 0x69, 0x6c, 0x65, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x22, 0xeb, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x21, - 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, - 0x01, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x01, 0x52, 0x06, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x0a, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x4f, 0x0a, - 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x1a, 0x5a, + 0x69, 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x7b, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1f, - 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, - 0x9a, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x6d, - 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1d, - 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x1c, 0x0a, - 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x22, 0xa9, 0x10, 0x0a, - 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, - 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, - 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, - 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, - 0x6f, 0x74, 0x66, 0x73, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x49, 0x0a, 0x15, 0x65, 0x6e, 0x76, 0x69, 0x72, - 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, - 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, - 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x65, - 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, - 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x10, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x1b, - 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x3d, 0x0a, 0x1a, 0x64, - 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x42, - 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, - 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, - 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, - 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x23, 0x0a, 0x0a, 0x63, - 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, - 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x0e, - 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, - 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x6c, - 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x0c, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x12, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, - 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x14, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, - 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, - 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x4f, 0x0a, 0x13, 0x63, 0x61, - 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, - 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, - 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, - 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, - 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, - 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, - 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, - 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, - 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, - 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, - 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, - 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, - 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, - 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, - 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, - 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x01, 0x52, 0x16, 0x63, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, - 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x21, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, - 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, - 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, - 0x49, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x23, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x73, 0x69, - 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, - 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x0e, - 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x25, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, - 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, - 0x45, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, - 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x26, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, - 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, - 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, - 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, - 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, - 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, + 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xeb, 0x02, 0x0a, 0x15, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, + 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, + 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, + 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, + 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, + 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, + 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, + 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, + 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7b, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, + 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, + 0x5f, 0x6d, 0x62, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, + 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, + 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, + 0x73, 0x22, 0xae, 0x10, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, + 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, + 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, + 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, + 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x07, 0x72, + 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, + 0x01, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x49, 0x0a, 0x15, + 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, + 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, + 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x2f, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, + 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, + 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x1d, + 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x21, 0x0a, + 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, + 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, + 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, + 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, + 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, + 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x00, + 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x6c, + 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x12, 0x29, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, + 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x52, 0x0c, + 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, + 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, + 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, + 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, + 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, + 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, + 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, + 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, + 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, + 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, + 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, + 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, + 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, + 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, + 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, + 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, + 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5f, 0x0a, 0x16, + 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, + 0x48, 0x01, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, + 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, + 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, + 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, + 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, + 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, + 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, + 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, + 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, + 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, + 0x69, 0x6d, 0x69, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x26, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, + 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, + 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, + 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, + 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) var ( diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index ffd42d3e..b4792905 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -72,7 +72,7 @@ message ProtoDesiredLRPRunInfo { repeated ProtoSidecar sidecars = 26; ProtoLogRateLimit log_rate_limit = 27 [json_name = "log_rate_limit"]; - repeated ProtoFile volume_mounted_files = 28 [json_name = "volume_mounted_files"]; + repeated ProtoFile volume_mounted_files = 28 [json_name = "volume_mounted_files", (bbs.bbs_json_always_emit) = true]; } // helper message for marshalling routes @@ -146,5 +146,5 @@ message ProtoDesiredLRP { repeated ProtoSidecar sidecars = 36; ProtoLogRateLimit log_rate_limit = 37 [json_name = "log_rate_limit"]; - repeated ProtoFile volume_mounted_files = 38 [json_name = "volume_mounted_files"]; + repeated ProtoFile volume_mounted_files = 38 [json_name = "volume_mounted_files", (bbs.bbs_json_always_emit) = true]; } diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 3072f3ba..44406499 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -248,7 +248,7 @@ type DesiredLRPRunInfo struct { MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` Sidecars []*Sidecar `json:"sidecars,omitempty"` LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` - VolumeMountedFiles []*File `json:"volume_mounted_files,omitempty"` + VolumeMountedFiles []*File `json:"volume_mounted_files"` } func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { @@ -1440,7 +1440,7 @@ type DesiredLRP struct { MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` Sidecars []*Sidecar `json:"sidecars,omitempty"` LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` - VolumeMountedFiles []*File `json:"volume_mounted_files,omitempty"` + VolumeMountedFiles []*File `json:"volume_mounted_files"` } func (this *DesiredLRP) Equal(that interface{}) bool { diff --git a/models/task.pb.go b/models/task.pb.go index b9608213..b4f07be4 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -497,7 +497,7 @@ var file_task_proto_rawDesc = string([]byte{ 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0x9c, 0x0c, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, + 0x6f, 0x74, 0x6f, 0x22, 0xa1, 0x0c, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, @@ -585,59 +585,60 @@ var file_task_proto_rawDesc = string([]byte{ 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, - 0x45, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, + 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, - 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, - 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, - 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, - 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0xfe, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, - 0x12, 0x4a, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, - 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x74, 0x61, 0x73, - 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x09, - 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, - 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x23, 0x0a, 0x0a, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, - 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x33, 0x0a, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, - 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x12, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x32, 0x0a, 0x05, 0x73, - 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, - 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x1b, - 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1b, 0x0a, 0x06, 0x66, - 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, - 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, - 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, - 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x6e, - 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, - 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x69, 0x6e, - 0x67, 0x10, 0x04, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, - 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, - 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, + 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, + 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfe, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x4a, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, + 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, + 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xc0, 0x3e, 0x01, + 0x52, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, + 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, + 0x6e, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x64, 0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, + 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x33, 0x0a, 0x12, 0x66, + 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, + 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x12, 0x66, 0x69, + 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, + 0x12, 0x32, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, + 0x73, 0x6b, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, + 0x74, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, + 0x5f, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x12, 0x1b, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, + 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x2b, 0x0a, + 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, + 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x0f, 0x72, 0x65, + 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x10, 0x72, 0x65, 0x6a, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0d, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, + 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, 0x0a, + 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, 0x73, + 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, + 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, }) var ( diff --git a/models/task.proto b/models/task.proto index f74734aa..32c7d9c3 100644 --- a/models/task.proto +++ b/models/task.proto @@ -44,7 +44,7 @@ message ProtoTaskDefinition { repeated ProtoImageLayer image_layers = 25 [json_name = "image_layers"]; ProtoLogRateLimit log_rate_limit = 26 [json_name = "log_rate_limit"]; map metric_tags = 27 [json_name = "metric_tags"]; - repeated ProtoFile volume_mounted_files = 28 [json_name = "volume_mounted_files"]; + repeated ProtoFile volume_mounted_files = 28 [json_name = "volume_mounted_files", (bbs.bbs_json_always_emit) = true]; } message ProtoTask { diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 7fe02cbc..0841ce78 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -40,7 +40,7 @@ type TaskDefinition struct { ImageLayers []*ImageLayer `json:"image_layers,omitempty"` LogRateLimit *LogRateLimit `json:"log_rate_limit,omitempty"` MetricTags map[string]*MetricTagValue `json:"metric_tags,omitempty"` - VolumeMountedFiles []*File `json:"volume_mounted_files,omitempty"` + VolumeMountedFiles []*File `json:"volume_mounted_files"` } func (this *TaskDefinition) Equal(that interface{}) bool { diff --git a/models/task_test.go b/models/task_test.go index 4667e0a1..5f024d8a 100644 --- a/models/task_test.go +++ b/models/task_test.go @@ -114,7 +114,8 @@ var _ = Describe("Task", func() { "volume_mounted_files": [ {"path": "/redis/username", "content": "username"} ] - }` + } + }` err := json.Unmarshal([]byte(taskPayload), &task) Expect(err).NotTo(HaveOccurred()) From 0118bf63833d66288c660538ad4e3d1e63457cb3 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 14 Feb 2025 21:46:02 +0000 Subject: [PATCH 135/155] Update docs for new protobufs Add Protobuf Models doc --- docs/021-defining-tasks.md | 6 +++--- docs/022-task-examples.md | 2 +- docs/030-lrps.md | 4 +--- docs/031-defining-lrps.md | 8 ++++---- docs/032-lrp-examples.md | 4 ++-- docs/054-common-models.md | 17 ++++++++++------ docs/055-protobuf-models.md | 40 +++++++++++++++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 docs/055-protobuf-models.md diff --git a/docs/021-defining-tasks.md b/docs/021-defining-tasks.md index 9d7496d2..e8a1c423 100644 --- a/docs/021-defining-tasks.md +++ b/docs/021-defining-tasks.md @@ -37,9 +37,9 @@ err := client.DesireTask( Url: "https://blobstore.com/bits/other-bits", DestinationPath: "/usr/local/app/other", DigestValue: "some digest", - DigestAlgorithm: models.DigestAlgorithmSha256, - MediaType: models.MediaTypeTgz, - LayerType: models.LayerTypeExclusive, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, + MediaType: models.ImageLayer_MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeExclusive, }, }, Action: models.WrapAction(&models.RunAction{ diff --git a/docs/022-task-examples.md b/docs/022-task-examples.md index 04db7d1d..325ac861 100644 --- a/docs/022-task-examples.md +++ b/docs/022-task-examples.md @@ -47,7 +47,7 @@ for { } ``` -## Recieving a TaskCallbackResponse +## Receiving a TaskCallbackResponse To receive the TaskCallbackResponse, we first start an HTTP server. diff --git a/docs/030-lrps.md b/docs/030-lrps.md index 9dc66a58..4d21a316 100644 --- a/docs/030-lrps.md +++ b/docs/030-lrps.md @@ -153,9 +153,7 @@ In all cases, the consumer is given an array of `ActualLRPResponse`: "space_id": "some-space-guid", "space_name": "some-space-name" }, - "OptionalRoutable": { - "routable": true - }, + "routable": true, "availability_zone": "some-zone" }, ... diff --git a/docs/031-defining-lrps.md b/docs/031-defining-lrps.md index fe23a094..1d2817cb 100644 --- a/docs/031-defining-lrps.md +++ b/docs/031-defining-lrps.md @@ -39,9 +39,9 @@ err := client.DesireLRP(logger, &models.DesiredLRP{ Url: "https://blobstore.com/bits/other-bits", DestinationPath: "/usr/local/app/other", DigestValue: "some digest", - DigestAlgorithm: models.DigestAlgorithmSha256, - MediaType: models.MediaTypeTgz, - LayerType: models.LayerTypeExclusive, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, + MediaType: models.ImageLayer_MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeExclusive, }, }, Setup: models.WrapAction(&models.RunAction{Path: "ls", User: "name"}), @@ -122,7 +122,7 @@ err := client.DesireLRP(logger, &models.DesiredLRP{ Static: "some-source-id", }, "instance_index": &models.MetricTagValue{ - Dynamic: models.MetricTagDynamicValueIndex, + Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex, }, }, }) diff --git a/docs/032-lrp-examples.md b/docs/032-lrp-examples.md index 0ab9acba..e74c85df 100644 --- a/docs/032-lrp-examples.md +++ b/docs/032-lrp-examples.md @@ -87,7 +87,7 @@ err = client.DesireLRP(logger, &models.DesiredLRP{ Static: "some-source-id", }, "instance_index": &models.MetricTagValue{ - Dynamic: models.MetricTagDynamicValueIndex, + Dynamic: models.MetricTagValue_MetricTagDynamicValueIndex, }, }, }) @@ -109,7 +109,7 @@ for { } ``` -## Recieving a LRPCallbackResponse +## Receiving a LRPCallbackResponse To receive the LRPCallbackResponse, we first start an HTTP server. diff --git a/docs/054-common-models.md b/docs/054-common-models.md index 36ac50c9..fb07210f 100644 --- a/docs/054-common-models.md +++ b/docs/054-common-models.md @@ -4,6 +4,11 @@ expires_at : never tags: [diego-release, bbs] --- +## Protobuf Models + +BBS utilizes [Google's Protobuf Implementation](https://google.golang.org/protobuf) for code generation purposes. +See [Protobuf Models](055-protobuf-models.md) for details. + ##### `EnvironmentVariables` [optional] Clients may define environment variables at the container level, which all processes running in the container will receive. For example: @@ -53,18 +58,18 @@ ImageLayers: []*models.ImageLayer{ Url: "https://blobstore.com/bits/app-bits", DestinationPath: "/usr/local/app", DigestValue: "some digest", - DigestAlgorithm: models.DigestAlgorithmSha256, - MediaType: models.MediaTypeTgz, - LayerType: models.LayerTypeExclusive, + DigestAlgorithm: models.ImageLayer_DigestAlgorithmSha256, + MediaType: models.ImageLayer_MediaTypeTgz, + LayerType: models.ImageLayer_LayerTypeExclusive, } }, ``` -`DigestAlgorithm` and `DigestValue` are optional for image layers of type `LayerTypeShared`. All other fields are required. +`DigestAlgorithm` and `DigestValue` are optional for image layers of type `ImageLayer_LayerTypeShared`. All other fields are required. -Image layers of type `LayerTypeShared` could be converted to `CachedDependency` for diego cells that do not support ImageLayers or api clients that are using old api endpoints. +Image layers of type `ImageLayer_LayerTypeShared` could be converted to `CachedDependency` for diego cells that do not support ImageLayers or api clients that are using old api endpoints. -`LayerTypeExclusive` layers are converted to DownloadActions and are ran before +`ImageLayer_LayerTypeExclusive` layers are converted to DownloadActions and are ran before LRP `Setup` action or the task's`Action`. For more information see the [Actions Documentation](053-actions.md). diff --git a/docs/055-protobuf-models.md b/docs/055-protobuf-models.md new file mode 100644 index 00000000..ae0442d6 --- /dev/null +++ b/docs/055-protobuf-models.md @@ -0,0 +1,40 @@ +--- +title: Protobuf Models +expires_at : never +tags: [diego-release, bbs] +--- + +# Protobuf Models + +BBS utilizes [Google's Protobuf Implementation](https://google.golang.org/protobuf) for code generation purposes. +In addition to this, the `protoc-gen-go-bbs` [plugin](../protoc-gen-go-bbs) has been created to accomodate special use cases for BBS itself. +For example, "raw" protos generated by the `protoc` compiler cannot be passed to functions conventionally due to copylocks, +so `protoc-gen-go-bbs` generates an additional model that supports this. + +> \[!IMPORTANT\] +> New protos MUST be created with the "Proto" prefix on the struct name (e.g. ProtoRunAction) in order to be picked up by the plugin + +# Generating models from protobufs + +### [Official Documentation](https://protobuf.dev/getting-started/gotutorial/) + +## One-step solution for generating all protos + - Use the `check-proto-files` [script](https://github.com/cloudfoundry/wg-app-platform-runtime-ci/blob/main/diego-release/linters/check-proto-files.bash) + from the Working Group CI [repo](https://github.com/cloudfoundry/wg-app-platform-runtime-ci) + +## Installation + - Download the latest `protoc` [compiler](https://github.com/protocolbuffers/protobuf/releases) + - Unzip and add to PATH + - Install the latest golang plugin + - `go install google.golang.org/protobuf/cmd/protoc-gen-go@latest` + - Install the latest grpc plugin + - `go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest` + - Install the `protoc-gen-go-bbs` plugin + - `cd protoc-gen-go-bbs && go install .` + +## Usage +### To generate all protos + - Use the BBS helper [script](../scripts/generate_protos.sh) + +### For a single file + - `protoc --go_out=. --go-grpc_out=. --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative .proto` From e561432dc8eee13c6ffca3f5956e97ebf7d3f7bc Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 19 Feb 2025 21:08:44 +0000 Subject: [PATCH 136/155] Add GetProto() to ActionInterface --- models/actions.go | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/models/actions.go b/models/actions.go index ac6caa06..0a7e5d30 100644 --- a/models/actions.go +++ b/models/actions.go @@ -28,6 +28,7 @@ var ErrInvalidActionType = errors.New("invalid action type") type ActionInterface interface { ActionType() string Validate() error + GetProto() proto.Message } func (a *Action) GetValue() interface{} { @@ -174,6 +175,10 @@ func (a DownloadAction) Validate() error { return nil } +func (a *DownloadAction) GetProto() proto.Message { + return a.ToProto() +} + func contains(array []string, element string) bool { for _, item := range array { if item == element { @@ -209,6 +214,10 @@ func (a UploadAction) Validate() error { return nil } +func (a *UploadAction) GetProto() proto.Message { + return a.ToProto() +} + func (a *RunAction) ActionType() string { return ActionTypeRun } @@ -231,6 +240,10 @@ func (a RunAction) Validate() error { return nil } +func (a *RunAction) GetProto() proto.Message { + return a.ToProto() +} + func (a *TimeoutAction) ActionType() string { return ActionTypeTimeout } @@ -258,6 +271,10 @@ func (a TimeoutAction) Validate() error { return nil } +func (a *TimeoutAction) GetProto() proto.Message { + return a.ToProto() +} + func (a *TryAction) ActionType() string { return ActionTypeTry } @@ -281,6 +298,10 @@ func (a TryAction) Validate() error { return nil } +func (a *TryAction) GetProto() proto.Message { + return a.ToProto() +} + func (*ParallelAction) Version() format.Version { return format.V0 } @@ -316,6 +337,10 @@ func (a ParallelAction) Validate() error { return nil } +func (a *ParallelAction) GetProto() proto.Message { + return a.ToProto() +} + func (a *CodependentAction) ActionType() string { return ActionTypeCodependent } @@ -347,13 +372,9 @@ func (a CodependentAction) Validate() error { return nil } -// func (*SerialAction) Version() format.Version { -// return format.V0 -// } - -// func (*SerialAction) MigrateFromVersion(v format.Version) error { -// return nil -// } +func (a *CodependentAction) GetProto() proto.Message { + return a.ToProto() +} func (a *SerialAction) ActionType() string { return ActionTypeSerial @@ -386,6 +407,10 @@ func (a SerialAction) Validate() error { return nil } +func (a *SerialAction) GetProto() proto.Message { + return a.ToProto() +} + func (a *EmitProgressAction) ActionType() string { return ActionTypeEmitProgress } @@ -409,6 +434,10 @@ func (a EmitProgressAction) Validate() error { return nil } +func (a *EmitProgressAction) GetProto() proto.Message { + return a.ToProto() +} + func EmitProgressFor(action ActionInterface, startMessage string, successMessage string, failureMessagePrefix string) *EmitProgressAction { return &EmitProgressAction{ Action: WrapAction(action), From f7314a95de15266d952902af8767dd6b5a741df3 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 19 Feb 2025 21:10:08 +0000 Subject: [PATCH 137/155] Cleanup commented code that's not longer needed --- handlers/desired_lrp_handlers.go | 12 ---------- handlers/evacuation_handler.go | 1 - models/desired_lrp_test.go | 1 - models/errors.go | 10 -------- models/routes.go | 41 -------------------------------- models/routes_test.go | 11 ++------- models/security_groups_test.go | 6 ----- protoc-gen-go-bbs/bbs.go | 3 --- 8 files changed, 2 insertions(+), 83 deletions(-) diff --git a/handlers/desired_lrp_handlers.go b/handlers/desired_lrp_handlers.go index e6634088..cc2aa777 100644 --- a/handlers/desired_lrp_handlers.go +++ b/handlers/desired_lrp_handlers.go @@ -95,9 +95,6 @@ func (h *DesiredLRPHandler) commonDesiredLRPs(logger lager.Logger, targetVersion } response.Error = models.ConvertError(err) - // writeResponse(w, response.ToProto()) - // exitIfUnrecoverable(logger, h.exitChan, response.Error) - } func (h *DesiredLRPHandler) DesiredLRPs(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -131,9 +128,6 @@ func (h *DesiredLRPHandler) commonDesiredLRPByProcessGuid(logger lager.Logger, t } response.Error = models.ConvertError(err) - // writeResponse(w, response.ToProto()) - // exitIfUnrecoverable(logger, h.exitChan, response.Error) - } func (h *DesiredLRPHandler) DesiredLRPByProcessGuid(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -168,8 +162,6 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfos(logger lager.Logger, w htt } response.Error = models.ConvertError(err) - // writeResponse(w, response.ToProto()) - // exitIfUnrecoverable(logger, h.exitChan, response.Error) } func (h *DesiredLRPHandler) DesiredLRPSchedulingInfoByProcessGuid(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -192,8 +184,6 @@ func (h *DesiredLRPHandler) DesiredLRPSchedulingInfoByProcessGuid(logger lager.L } response.Error = models.ConvertError(err) - // writeResponse(w, response.ToProto()) - // exitIfUnrecoverable(logger, h.exitChan, response.Error) } func (h *DesiredLRPHandler) DesiredLRPRoutingInfos(logger lager.Logger, w http.ResponseWriter, req *http.Request) { @@ -220,8 +210,6 @@ func (h *DesiredLRPHandler) DesiredLRPRoutingInfos(logger lager.Logger, w http.R } response.Error = models.ConvertError(err) - // writeResponse(w, response.ToProto()) - // exitIfUnrecoverable(logger, h.exitChan, response.Error) } func (h *DesiredLRPHandler) DesireDesiredLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { diff --git a/handlers/evacuation_handler.go b/handlers/evacuation_handler.go index 2e75f8f5..1a407235 100644 --- a/handlers/evacuation_handler.go +++ b/handlers/evacuation_handler.go @@ -36,7 +36,6 @@ func NewEvacuationHandler( type MessageValidator interface { proto.Message Validate() error - // Unmarshal(data []byte) error } func (h *EvacuationHandler) RemoveEvacuatingActualLRP(logger lager.Logger, w http.ResponseWriter, req *http.Request) { diff --git a/models/desired_lrp_test.go b/models/desired_lrp_test.go index 6f7e59ab..b0dd2810 100644 --- a/models/desired_lrp_test.go +++ b/models/desired_lrp_test.go @@ -1359,7 +1359,6 @@ var _ = Describe("DesiredLRPUpdate", func() { desiredLRPUpdate.Routes = routes annotation := "some-text" desiredLRPUpdate.SetAnnotation(&annotation) - // desiredLRPUpdate.Annotation = &annotation desiredLRPUpdate.MetricTags = map[string]*models.MetricTagValue{ "some-tag": {Static: "some-value"}, } diff --git a/models/errors.go b/models/errors.go index 895da423..fc00bc26 100644 --- a/models/errors.go +++ b/models/errors.go @@ -32,16 +32,6 @@ func (err *Error) ToError() error { return err } -// func (err *Error) Equal(other error) bool { -// if e, ok := other.(*Error); ok { -// if err == nil && e != nil { -// return false -// } -// return e.GetType() == err.GetType() -// } -// return false -// } - func (err *Error) Error() string { return err.GetMessage() } diff --git a/models/routes.go b/models/routes.go index 5fa8fd8f..c7dffde6 100644 --- a/models/routes.go +++ b/models/routes.go @@ -51,47 +51,6 @@ func (pr *ProtoRoutes) FromProto() *Routes { return &r } -// func (r *Routes) Marshal() ([]byte, error) { -// return proto.Marshal(r.ToProto()) -// } - -// func (r *Routes) Unmarshal(b []byte) error { -// return proto.Unmarshal(b, r.ToProto()) -// } - -// func (r *Routes) MarshalTo(data []byte) (n int, err error) { -// return r.protoRoutes().MarshalTo(data) -// } - -// func (r *Routes) Unmarshal(data []byte) error { -// pr := &ProtoRoutes{} -// err := pr.Unmarshal(data) -// if err != nil { -// return err -// } - -// if pr.Routes == nil { -// return nil -// } - -// routes := map[string]*json.RawMessage{} -// for k, v := range pr.Routes { -// raw := json.RawMessage(v) -// routes[k] = &raw -// } -// *r = routes - -// return nil -// } - -// func (r *Routes) Size() int { -// if r == nil { -// return 0 -// } - -// return r.protoRoutes().Size() -// } - func (r *Routes) Equal(other Routes) bool { if other == nil { return r == nil diff --git a/models/routes_test.go b/models/routes_test.go index e56785e7..eba2c820 100644 --- a/models/routes_test.go +++ b/models/routes_test.go @@ -19,15 +19,8 @@ var _ = Describe("Routes", func() { itSerializes := func(routes *models.Routes) { BeforeEach(func() { - // don't really care for branching logic in tests, but don't want to change the test right now - if routes == nil { - update = models.DesiredLRPUpdate{ - Routes: nil, - } - } else { - update = models.DesiredLRPUpdate{ - Routes: routes, - } + update = models.DesiredLRPUpdate{ + Routes: routes, } /* The point of these tests is to go from non-proto struct diff --git a/models/security_groups_test.go b/models/security_groups_test.go index dd25e1f4..4807c8d3 100644 --- a/models/security_groups_test.go +++ b/models/security_groups_test.go @@ -378,9 +378,6 @@ var _ = Describe("SecurityGroupRule", func() { ], "annotations":["quack"] }` - // TODO: double-check these fields - // protojson doesn't emit this - // "log": false, securityGroup = models.SecurityGroupRule{ Protocol: "all", @@ -413,9 +410,6 @@ var _ = Describe("SecurityGroupRule", func() { "0.0.0.0-9.255.255.255" ] }` - // TODO: double-check these fields - // protojson doesn't emit this - // "log": false, securityGroup.Annotations = []string{} }) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 98b27b29..32d0dfad 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -38,9 +38,6 @@ func getCopysafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) (string, func getFieldName(goName string) string { result := goName - // if strings.Contains(strings.ToLower(result), "lrp") { - // result = strings.Replace(goName, "Lrp", "LRP", -1) - // } return result } From 400d5a01bb8b412e2553e68d9df09ab99346350d Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 19 Feb 2025 21:17:20 +0000 Subject: [PATCH 138/155] go.mod and go.sum not needed: use the ones from diego-release --- protoc-gen-go-bbs/go.mod | 5 ----- protoc-gen-go-bbs/go.sum | 6 ------ 2 files changed, 11 deletions(-) delete mode 100644 protoc-gen-go-bbs/go.mod delete mode 100644 protoc-gen-go-bbs/go.sum diff --git a/protoc-gen-go-bbs/go.mod b/protoc-gen-go-bbs/go.mod deleted file mode 100644 index c44ff9c0..00000000 --- a/protoc-gen-go-bbs/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module code.cloudfoundry.org/bbs/protoc-gen-go-bbs - -go 1.22.2 - -require google.golang.org/protobuf v1.34.0 diff --git a/protoc-gen-go-bbs/go.sum b/protoc-gen-go-bbs/go.sum deleted file mode 100644 index 1bfbf95c..00000000 --- a/protoc-gen-go-bbs/go.sum +++ /dev/null @@ -1,6 +0,0 @@ -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= -google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= From c92f8b17a9557f1a43d67ca3cd62c5c339c3f676 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 21 Feb 2025 22:59:05 +0000 Subject: [PATCH 139/155] Add performance tests and results for new (google) protobufs Add performance results for old (gogo) protobufs --- models/performance/bbs_plugin_test.go | 490 ++++++++++++++++++ models/performance/performance_suite_test.go | 13 + .../results/post-plugin-results.txt | 309 +++++++++++ .../results/pre-plugin-results.txt | 129 +++++ 4 files changed, 941 insertions(+) create mode 100644 models/performance/bbs_plugin_test.go create mode 100644 models/performance/performance_suite_test.go create mode 100644 models/performance/results/post-plugin-results.txt create mode 100644 models/performance/results/pre-plugin-results.txt diff --git a/models/performance/bbs_plugin_test.go b/models/performance/bbs_plugin_test.go new file mode 100644 index 00000000..6afd247f --- /dev/null +++ b/models/performance/bbs_plugin_test.go @@ -0,0 +1,490 @@ +package performance + +import ( + "encoding/json" + "time" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + gmeasure "github.com/onsi/gomega/gmeasure" + "google.golang.org/protobuf/proto" + + "code.cloudfoundry.org/bbs/models" +) + +var _ = Describe("BBS Plugin Conversion: Desired LRP", func() { + var nanosecondPrecision gmeasure.PrecisionBundle = gmeasure.Precision(1 * time.Nanosecond) + var desiredLRP models.DesiredLRP + + desiredLRPjson := `{ + "setup": { + "serial": { + "actions": [ + { + "download": { + "from": "http://file-server.service.cf.internal:8080/v1/static/buildpack_app_lifecycle/buildpack_app_lifecycle.tgz", + "to": "/tmp/lifecycle", + "cache_key": "buildpack-cflinuxfs3-lifecycle", + "user": "someone", + "checksum_algorithm": "md5", + "checksum_value": "some random value" + } + }, + { + "download": { + "from": "http://cloud-controller-ng.service.cf.internal:9022/internal/v2/droplets/some-guid/some-guid/download", + "to": ".", + "cache_key": "droplets-some-guid", + "user": "someone" + } + } + ] + } + }, + "action": { + "codependent": { + "actions": [ + { + "run": { + "path": "/tmp/lifecycle/launcher", + "args": [ + "app", + "", + "{\"start_command\":\"bundle exec rackup config.ru -p $PORT\"}" + ], + "env": [ + { + "name": "VCAP_APPLICATION", + "value": "{\"limits\":{\"mem\":1024,\"disk\":1024,\"fds\":16384},\"application_id\":\"some-guid\",\"application_version\":\"some-guid\",\"application_name\":\"some-guid\",\"version\":\"some-guid\",\"name\":\"some-guid\",\"space_name\":\"CATS-SPACE-3-2015_07_01-11h28m01.515s\",\"space_id\":\"bc640806-ea03-40c6-8371-1c2b23fa4662\"}" + }, + { + "name": "VCAP_SERVICES", + "value": "{}" + }, + { + "name": "MEMORY_LIMIT", + "value": "1024m" + }, + { + "name": "CF_STACK", + "value": "cflinuxfs3" + }, + { + "name": "PORT", + "value": "8080" + } + ], + "resource_limits": { + "nofile": 16384 + }, + "user": "vcap", + "log_source": "APP", + "suppress_log_output": false, + "volume_mounted_files": null + } + }, + { + "run": { + "path": "/tmp/lifecycle/diego-sshd", + "args": [ + "-address=0.0.0.0:2222", + "-hostKey=-----BEGIN RSA PRIVATE KEY-----\nMIICWwIBAAKBgQCp72ylz6ow8P4km1Nzd2yyN9aiXAI8MHl6Crl6vjpBNQIhy+YH\nEf5fgAI/wHydaajSsk28Byf/hAm/Q/3EmT1bUmdCsVzzndzJvPNf5t11LGmPFcNV\nZ9vsfnFjMlsFM/ZHU60PT8POSoE8VnrplTLRhEtQFopdMcDN8nRl6imhUQIDAQAB\nAoGAWz8aQbZOFlVwwUs99gQsM03US/3HnXYR5DwZ+BRox1alPGx1qVo6EiF0E7NR\ntlxjsC7ZmprlGUhWy4LAom3+CUj712fI7Qnud9AH4GUHN4JrxytiDDLJJh/hRADB\niD/MKo9ih7c2bQvBU+FwLYlXyI/GViBMqIYzZ+6r7yVkp/kCQQDZIcMKzNwVV+LL\nnDXZg4nIyFgR3CGZb+cVrXnDaIEwmC5ABHlnhJJzI7FdsGuhwOJnKdMHQgI6+o+Z\nvmizsdyDAkEAyFrXDX+wRMPrEjmNga2TYaCIt6AWR3b4aLJskZQnf0iMI2DzL74e\na7Ibkxp+OxtSL2YIR7NCfDz/DiUtqvQKmwJAVRxX0K72geM+QiOMNCPMaYimhPGt\ntfBYO3YRaZhYM40ja/KVCA++PCW8i4Xw2qm51UhesNSd/TJkAZbSgcVxMwJAQSKX\nK4JJkfGHqKMhR/lgIqsIB3p6A72/wHnRJfreZFj3hkDsjqbmSOjcYhSI2Tpmm5Y2\nNukmQjGqUbTwhdVU5QJALpewrw7eiWAjnYxus6Fi0XiEduE91OEtuc3yHRrR0ubI\nCt2HP6jQ43siwcx+FAA8kBfvtQElIC2TF2qwjezEcA==\n-----END RSA PRIVATE KEY-----\n", + "-authorizedKey=ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDuOfcUnfiXE6g6Cvgur3Om6t8cEx27FAoVrDrxMzy+q2NTJaQFNYqG2DDDHZCLG2mJasryKZfDyK30c48ITpecBkCux429aZN2gEJCEsyYgsZheI+5eNYs1vzl68KQ1LdxlgNOqFZijyVjTOD60GMPCVlDICqGNUFH4aPTHA0fVw==\n", + "-inheritDaemonEnv", + "-logLevel=fatal" + ], + "env": [ + { + "name": "VCAP_APPLICATION", + "value": "{\"limits\":{\"mem\":1024,\"disk\":1024,\"fds\":16384},\"application_id\":\"some-guid\",\"application_version\":\"some-guid\",\"application_name\":\"some-guid\",\"version\":\"some-guid\",\"name\":\"some-guid\",\"space_name\":\"CATS-SPACE-3-2015_07_01-11h28m01.515s\",\"space_id\":\"some-guid\"}" + }, + { + "name": "VCAP_SERVICES", + "value": "{}" + }, + { + "name": "MEMORY_LIMIT", + "value": "1024m" + }, + { + "name": "CF_STACK", + "value": "cflinuxfs3" + }, + { + "name": "PORT", + "value": "8080" + } + ], + "resource_limits": { + "nofile": 16384 + }, + "user": "vcap", + "suppress_log_output": false, + "volume_mounted_files": null + } + } + ] + } + }, + "monitor": { + "timeout": { + "action": { + "run": { + "path": "/tmp/lifecycle/healthcheck", + "args": [ + "-port=8080" + ], + "resource_limits": { + "nofile": 1024 + }, + "user": "vcap", + "log_source": "HEALTH", + "suppress_log_output": true, + "volume_mounted_files": null + } + }, + "timeout_ms": 30000000 + } + }, + "process_guid": "some-guid", + "domain": "cf-apps", + "rootfs": "preloaded:cflinuxfs3", + "instances": 2, + "env": [ + { + "name": "LANG", + "value": "en_US.UTF-8" + } + ], + "start_timeout_ms": 60000, + "disk_mb": 1024, + "memory_mb": 1024, + "cpu_weight": 10, + "privileged": true, + "ports": [ + 8080, + 2222 + ], + "routes": { + "cf-router": [ + { + "hostnames": [ + "some-route.example.com" + ], + "port": 8080 + } + ], + "diego-ssh": { + "container_port": 2222, + "host_fingerprint": "ac:99:67:20:7e:c2:7c:2c:d2:22:37:bc:9f:14:01:ec", + "private_key": "-----BEGIN RSA PRIVATE KEY-----\nMIICXQIBAAKBgQDuOfcUnfiXE6g6Cvgur3Om6t8cEx27FAoVrDrxMzy+q2NTJaQF\nNYqG2DDDHZCLG2mJasryKZfDyK30c48ITpecBkCux429aZN2gEJCEsyYgsZheI+5\neNYs1vzl68KQ1LdxlgNOqFZijyVjTOD60GMPCVlDICqGNUFH4aPTHA0fVwIDAQAB\nAoGBAO1Ak19YGHy1mgP8asFsAT1KitrV+vUW9xgwiB8xjRzDac8kHJ8HfKfg5Wdc\nqViw+0FdNzNH0xqsYPqkn92BECDqdWOzhlEYNj/AFSHTdRPrs9w82b7h/LhrX0H/\nRUrU2QrcI2uSV/SQfQvFwC6YaYugCo35noljJEcD8EYQTcRxAkEA+jfjumM6da8O\n8u8Rc58Tih1C5mumeIfJMPKRz3FBLQEylyMWtGlr1XT6ppqiHkAAkQRUBgKi+Ffi\nYedQOvE0/wJBAPO7I+brmrknzOGtSK2tvVKnMqBY6F8cqmG4ZUm0W9tMLKiR7JWO\nAsjSlQfEEnpOr/AmuONwTsNg+g93IILv3akCQQDnrKfmA8o0/IlS1ZfK/hcRYlZ3\nEmVoZBEciPwInkxCZ0F4Prze/l0hntYVPEeuyoO7wc4qYnaSiozJKWtXp83xAkBo\nk+ubsYv51jH6wzdkDiAlzsfSNVO/O7V/qHcNYO3o8o5W5gX1RbG8KV74rhCfmhOz\nn2nFbPLeskWZTSwOAo3BAkBWHBjvCj1sBgsIG4v6Tn2ig21akbmssJezmZRjiqeh\nqt0sAzMVixAwIFM0GsW3vQ8Hr/eBTb5EBQVZ/doRqUzf\n-----END RSA PRIVATE KEY-----\n" + } + }, + "log_guid": "some-guid", + "log_source": "CELL", + "metrics_guid": "some-guid", + "annotation": "1435775395.194748", + "egress_rules": [ + { + "protocol": "all", + "destinations": [ + "0.0.0.0-9.255.255.255" + ], + "log": false + }, + { + "protocol": "all", + "destinations": [ + "11.0.0.0-169.253.255.255" + ], + "log": false + }, + { + "protocol": "all", + "destinations": [ + "169.255.0.0-172.15.255.255" + ], + "log": false + }, + { + "protocol": "all", + "destinations": [ + "172.32.0.0-192.167.255.255" + ], + "log": false + }, + { + "protocol": "all", + "destinations": [ + "192.169.0.0-255.255.255.255" + ], + "log": false + }, + { + "protocol": "tcp", + "destinations": [ + "0.0.0.0/0" + ], + "ports": [ + 53 + ], + "log": false + }, + { + "protocol": "udp", + "destinations": [ + "0.0.0.0/0" + ], + "ports": [ + 53 + ], + "log": false + } + ], + "modification_tag": { + "epoch": "some-guid", + "index": 0 + }, + "placement_tags": ["red-tag", "blue-tag"], + "trusted_system_certificates_path": "/etc/cf-system-certificates", + "network": { + "properties": { + "key": "value", + "another_key": "another_value" + } + }, + "max_pids": 256, + "certificate_properties": { + "organizational_unit": ["stuff"] + }, + "check_definition": { + "checks": [ + { + "tcp_check": { + "port": 12345, + "connect_timeout_ms": 100 + } + } + ], + "readiness_checks": [ + { + "tcp_check": { + "port": 12345 + } + } + ], + "log_source": "healthcheck_log_source" + }, + "image_layers": [ + { + "url": "some-url", + "destination_path": "/tmp", + "digest_algorithm": "SHA512", + "digest_value": "abc123", + "media_type": "TGZ", + "layer_type": "SHARED" + } + ], + "legacy_download_user": "some-user", + "metric_tags": { + "source_id": { + "static": "some-guid" + }, + "foo": { + "static": "some-value" + }, + "bar": { + "dynamic": "INDEX" + } + }, + "sidecars": [ + { + "action": { + "codependent": { + "actions": [ + { + "run": { + "path": "/tmp/lifecycle/launcher", + "args": [ + "app", + "", + "{\"start_command\":\"/usr/local/bin/nginx\"}" + ], + "resource_limits": { + "nofile": 16384 + }, + "user": "vcap", + "log_source": "SIDECAR", + "suppress_log_output": false, + "volume_mounted_files": null + } + } + ] + } + }, + "disk_mb": 512, + "memory_mb": 512 + } + ], + "log_rate_limit": { + "bytes_per_second": 2048 + }, + "volume_mounted_files": null + }` + + Context("Conversion Performance Testing", func() { + Context("Starting with a BBS Plugin Struct", func() { + BeforeEach(func() { + desiredLRP = models.DesiredLRP{} + err := json.Unmarshal([]byte(desiredLRPjson), &desiredLRP) + Expect(err).NotTo(HaveOccurred()) + }) + + DescribeTable("Measures conversion time", + func(experimentName string, number int, callback func(models.DesiredLRP)) { + experiment := gmeasure.NewExperiment(experimentName) + AddReportEntry(experiment.Name, experiment) + experiment.Sample(func(i int) { + stopwatch := experiment.NewStopwatch() + callback(desiredLRP) + stopwatch.Record("convert", nanosecondPrecision) + }, gmeasure.SamplingConfig{N: number}) + }, + // bbs struct to protobuf struct + Entry("1 conversion", "BBS Struct => Protobuf Struct", 1, bbsStructToProtobufStruct), + Entry("1,000 conversions", "BBS Struct => Protobuf Struct", 1000, bbsStructToProtobufStruct), + Entry("1,000,000 conversions", "BBS Struct => Protobuf Struct", 1000000, bbsStructToProtobufStruct), + // bbs struct to protobuf binary + Entry("1 conversion", "BBS Struct => Protobuf Binary", 1, bbsStructToProtobufBinary), + Entry("1,000 conversions", "BBS Struct => Protobuf Binary", 1000, bbsStructToProtobufBinary), + Entry("1,000,000 conversions", "BBS Struct => Protobuf Binary", 1000000, bbsStructToProtobufBinary), + // bbs struct to protobuf binary to bbs struct + Entry("1 conversion", "BBS Struct => Protobuf Binary => BBS Struct", 1, bbsStructRoundtrip), + Entry("1,000 conversions", "BBS Struct => Protobuf Binary => BBS Struct", 1000, bbsStructRoundtrip), + Entry("1,000,000 conversions", "BBS Struct => Protobuf Binary => BBS Struct", 1000000, bbsStructRoundtrip), + ) + }) + + Context("Starting with a Protobuf Struct", func() { + var protoDesiredLRP *models.ProtoDesiredLRP + BeforeEach(func() { + desiredLRP = models.DesiredLRP{} + err := json.Unmarshal([]byte(desiredLRPjson), &desiredLRP) + protoDesiredLRP = desiredLRP.ToProto() + Expect(err).NotTo(HaveOccurred()) + }) + + DescribeTable("Measures conversion time", + func(experimentName string, number int, callback func(*models.ProtoDesiredLRP)) { + experiment := gmeasure.NewExperiment(experimentName) + AddReportEntry(experiment.Name, experiment) + experiment.Sample(func(i int) { + stopwatch := experiment.NewStopwatch() + callback(protoDesiredLRP) + stopwatch.Record("convert", nanosecondPrecision) + }, gmeasure.SamplingConfig{N: number}) + }, + // protobuf struct to bbs struct + Entry("1 conversion", "Protobuf Struct => BBS Struct", 1, protobufStructToBbsStruct), + Entry("1,000 conversions", "Protobuf Struct => BBS Struct", 1000, protobufStructToBbsStruct), + Entry("1,000,000 conversions", "Protobuf Struct => BBS Struct", 1000000, protobufStructToBbsStruct), + // protobuf struct to protobuf binary + Entry("1 conversion", "Protobuf Struct => Protobuf Binary", 1, protobufStructToProtobufBinary), + Entry("1,000 conversions", "Protobuf Struct => Protobuf Binary", 1000, protobufStructToProtobufBinary), + Entry("1,000,000 conversions", "Protobuf Struct => Protobuf Binary", 1000000, protobufStructToProtobufBinary), + // protobuf struct to protobuf binary to protobuf struct + Entry("1 conversion", "Protobuf Struct => Protobuf Binary", 1, protobufStructRoundtrip), + Entry("1,000 conversions", "Protobuf Struct => Protobuf Binary", 1000, protobufStructRoundtrip), + Entry("1,000,000 conversions", "Protobuf Struct => Protobuf Binary", 1000000, protobufStructRoundtrip), + ) + }) + + Context("Starting with a Protobuf Binary", func() { + var binaryDesiredLRP []byte + var protoDesiredLRP *models.ProtoDesiredLRP + BeforeEach(func() { + desiredLRP = models.DesiredLRP{} + err := json.Unmarshal([]byte(desiredLRPjson), &desiredLRP) + protoDesiredLRP = desiredLRP.ToProto() + Expect(err).NotTo(HaveOccurred()) + binaryDesiredLRP, _ = proto.Marshal(protoDesiredLRP) + }) + + DescribeTable("Measures conversion time", + func(experimentName string, number int, callback func([]byte)) { + experiment := gmeasure.NewExperiment(experimentName) + AddReportEntry(experiment.Name, experiment) + experiment.Sample(func(i int) { + stopwatch := experiment.NewStopwatch() + callback(binaryDesiredLRP) + stopwatch.Record("convert", nanosecondPrecision) + }, gmeasure.SamplingConfig{N: number}) + }, + // protobuf binary to bbs struct + Entry("1 conversion", "Protobuf Binary => BBS Struct", 1, protobufBinaryToBbsStruct), + Entry("1,000 conversions", "Protobuf Binary => BBS Struct", 1000, protobufBinaryToBbsStruct), + Entry("1,000,000 conversions", "Protobuf Binary => BBS Struct", 1000000, protobufBinaryToBbsStruct), + // protobuf binary to protobuf struct + Entry("1 conversion", "Protobuf Binary => Protobuf Struct", 1, protobufBinaryToProtobufStruct), + Entry("1,000 conversions", "Protobuf Binary => Protobuf Struct", 1000, protobufBinaryToProtobufStruct), + Entry("1,000,000 conversions", "Protobuf Binary => Protobuf Struct", 1000000, protobufBinaryToProtobufStruct), + ) + }) + }) +}) + +func bbsStructToProtobufStruct(which models.DesiredLRP) { + // simple conversion between structs + which.ToProto() +} + +func bbsStructToProtobufBinary(which models.DesiredLRP) { + // simple conversion between structs + protoStruct := which.ToProto() + // marshal into protobuf binary / wire format + proto.Marshal(protoStruct) +} + +func protobufBinaryToBbsStruct(which []byte) { + var unmarshalProto models.ProtoDesiredLRP + // umarshal into protobuf binary / wire format + proto.Unmarshal(which, &unmarshalProto) + // single conversion to bbs struct + unmarshalProto.FromProto() +} + +func bbsStructRoundtrip(which models.DesiredLRP) { + var unmarshalProto models.ProtoDesiredLRP + // simple conversion to proto struct + protoStruct := which.ToProto() + // marshal into protobuf binary / wire format + marshalProto, _ := proto.Marshal(protoStruct) + // unmarshal from protobuf binary / wire format + proto.Unmarshal(marshalProto, &unmarshalProto) + // simple conversion to bbs struct + unmarshalProto.FromProto() +} + +func protobufStructToBbsStruct(which *models.ProtoDesiredLRP) { + // simple conversion to bbs struct + which.FromProto() +} + +func protobufStructToProtobufBinary(which *models.ProtoDesiredLRP) { + // marshal into protobuf binary / wire format + proto.Marshal(which) +} + +func protobufBinaryToProtobufStruct(which []byte) { + var unmarshalProto models.ProtoDesiredLRP + // umarshal into protobuf binary / wire format + proto.Unmarshal(which, &unmarshalProto) +} + +func protobufStructRoundtrip(which *models.ProtoDesiredLRP) { + var unmarshalProto models.ProtoDesiredLRP + // marshal into protobuf binary / wire format + marshalProto, _ := proto.Marshal(which) + // unmarshal from protobuf binary / wire format + proto.Unmarshal(marshalProto, &unmarshalProto) +} diff --git a/models/performance/performance_suite_test.go b/models/performance/performance_suite_test.go new file mode 100644 index 00000000..8fb693f9 --- /dev/null +++ b/models/performance/performance_suite_test.go @@ -0,0 +1,13 @@ +package performance_test + +import ( + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +func TestPerformance(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Performance Suite") +} diff --git a/models/performance/results/post-plugin-results.txt b/models/performance/results/post-plugin-results.txt new file mode 100644 index 00000000..b5451327 --- /dev/null +++ b/models/performance/results/post-plugin-results.txt @@ -0,0 +1,309 @@ +NOTE: + +These results were as of 2025-02-21. + +diego-release commit b8093ae2fe8b43fed7ab81a71d453402e2b0bc0b +bbs commit 889d496b7f5b82b135e393e2a30282b562aef330 +========================================================================================================================= + +Running Suite: Performance Suite - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance +========================================================================================================================= +Random Seed: 1740177911 + +Will run 24 of 24 specs +------------------------------ +• [0.002 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:354 + + Report Entries >> + BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:45:12.234 + BBS Struct => Protobuf Struct + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 38.6µs | 38.6µs | 38.6µs | 0s | 38.6µs + << Report Entries +------------------------------ +• [0.066 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:355 + + Report Entries >> + BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:45:12.236 + BBS Struct => Protobuf Struct + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================ + convert [duration] | 1000 | 8.1µs | 9.4µs | 20.067µs | 40.342µs | 811.394µs + << Report Entries +------------------------------ +• [50.931 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:356 + + Report Entries >> + BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:45:12.302 + BBS Struct => Protobuf Struct + Name | N | Min | Median | Mean | StdDev | Max + =============================================================================== + convert [duration] | 1000000 | 7.7µs | 9µs | 10.412µs | 16.449µs | 4.40447ms + << Report Entries +------------------------------ +• [0.002 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:358 + + Report Entries >> + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:46:03.286 + BBS Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + =============================================================================== + convert [duration] | 1 | 925.193µs | 925.193µs | 925.193µs | 0s | 925.193µs + << Report Entries +------------------------------ +• [0.063 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:359 + + Report Entries >> + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:46:03.288 + BBS Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================= + convert [duration] | 1000 | 17.7µs | 19.5µs | 21.582µs | 11.406µs | 258.198µs + << Report Entries +------------------------------ +• [61.811 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:360 + + Report Entries >> + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:46:03.351 + BBS Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================= + convert [duration] | 1000000 | 17.5µs | 19.7µs | 21.384µs | 13.766µs | 2.800081ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:362 + + Report Entries >> + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:47:05.222 + BBS Struct => Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + =============================================================================== + convert [duration] | 1 | 116.898µs | 116.898µs | 116.898µs | 0s | 116.898µs + << Report Entries +------------------------------ +• [0.088 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:363 + + Report Entries >> + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:47:05.223 + BBS Struct => Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================= + convert [duration] | 1000 | 32.6µs | 37µs | 44.535µs | 33.307µs | 828.794µs + << Report Entries +------------------------------ +• [80.871 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:364 + + Report Entries >> + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:47:05.311 + BBS Struct => Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================= + convert [duration] | 1000000 | 30.6µs | 36.5µs | 39.658µs | 20.488µs | 3.951374ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:388 + + Report Entries >> + Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:48:26.259 + Protobuf Struct => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + =========================================================================== + convert [duration] | 1 | 65.399µs | 65.399µs | 65.399µs | 0s | 65.399µs + << Report Entries +------------------------------ +• [0.052 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:389 + + Report Entries >> + Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:48:26.259 + Protobuf Struct => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ======================================================================== + convert [duration] | 1000 | 8.5µs | 9.3µs | 10.186µs | 5.305µs | 66.5µs + << Report Entries +------------------------------ +• [50.026 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:390 + + Report Entries >> + Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:48:26.312 + Protobuf Struct => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================== + convert [duration] | 1000000 | 7.4µs | 8.9µs | 9.694µs | 7.057µs | 3.139179ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:392 + + Report Entries >> + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:49:16.409 + Protobuf Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 45.7µs | 45.7µs | 45.7µs | 0s | 45.7µs + << Report Entries +------------------------------ +• [0.061 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:393 + + Report Entries >> + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:49:16.41 + Protobuf Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================ + convert [duration] | 1000 | 16.2µs | 17.1µs | 18.469µs | 7.717µs | 176.599µs + << Report Entries +------------------------------ +• [57.776 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:394 + + Report Entries >> + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:49:16.471 + Protobuf Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================ + convert [duration] | 1000000 | 14.8µs | 16.5µs | 17.506µs | 7.774µs | 2.409084ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:396 + + Report Entries >> + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:50:14.302 + Protobuf Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 70.5µs | 70.5µs | 70.5µs | 0s | 70.5µs + << Report Entries +------------------------------ +• [0.074 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:397 + + Report Entries >> + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:50:14.303 + Protobuf Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================= + convert [duration] | 1000 | 28.401µs | 30.9µs | 32.711µs | 7.45µs | 105.699µs + << Report Entries +------------------------------ +• [72.988 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:398 + + Report Entries >> + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:50:14.378 + Protobuf Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ===================================================================================== + convert [duration] | 1000000 | 26.199µs | 30.099µs | 32.312µs | 14.441µs | 1.623989ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:424 + + Report Entries >> + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:51:27.434 + Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + =========================================================================== + convert [duration] | 1 | 48.199µs | 48.199µs | 48.199µs | 0s | 48.199µs + << Report Entries +------------------------------ +• [0.066 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:425 + + Report Entries >> + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:51:27.435 + Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================ + convert [duration] | 1000 | 20.4µs | 23µs | 25.064µs | 8.636µs | 144.299µs + << Report Entries +------------------------------ +• [66.116 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:426 + + Report Entries >> + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:51:27.502 + Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + =================================================================================== + convert [duration] | 1000000 | 19.899µs | 23.2µs | 25.228µs | 12.841µs | 1.768488ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:428 + + Report Entries >> + Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:52:33.686 + Protobuf Binary => Protobuf Struct + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 35.8µs | 35.8µs | 35.8µs | 0s | 35.8µs + << Report Entries +------------------------------ +• [0.064 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:429 + + Report Entries >> + Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:52:33.687 + Protobuf Binary => Protobuf Struct + Name | N | Min | Median | Mean | StdDev | Max + =============================================================================== + convert [duration] | 1000 | 18.901µs | 20.599µs | 22.01µs | 7.273µs | 164.699µs + << Report Entries +------------------------------ +• [62.418 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:430 + + Report Entries >> + Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:52:33.751 + Protobuf Binary => Protobuf Struct + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================= + convert [duration] | 1000000 | 17.2µs | 20.1µs | 21.789µs | 10.938µs | 2.161257ms + << Report Entries +------------------------------ + +Ran 24 of 24 Specs in 504.003 seconds +SUCCESS! -- 24 Passed | 0 Failed | 0 Pending | 0 Skipped +PASS + +Ginkgo ran 1 suite in 8m35.427356274s +Test Suite Passed diff --git a/models/performance/results/pre-plugin-results.txt b/models/performance/results/pre-plugin-results.txt new file mode 100644 index 00000000..e1c9dfe1 --- /dev/null +++ b/models/performance/results/pre-plugin-results.txt @@ -0,0 +1,129 @@ +NOTE: + +These results were as of 2025-02-24. + +diego-release commit 2d96a8834cc5fe4e9b7014c9140b7c7454758058 +bbs commit 216775bc13e71a588df5fc56297e86a04b3d1c78 +========================================================================================================================= + +Running Suite: Performance Suite - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance +========================================================================================================================= +Random Seed: 1740420499 + +Will run 9 of 9 specs +------------------------------ +• [0.002 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:354 + + Report Entries >> + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:08:20.631 + BBS Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 77.6µs | 77.6µs | 77.6µs | 0s | 77.6µs + << Report Entries +------------------------------ +• [0.062 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:355 + + Report Entries >> + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:08:20.633 + BBS Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================ + convert [duration] | 1000 | 8.9µs | 16.6µs | 19.163µs | 38.797µs | 838.799µs + << Report Entries +------------------------------ +• [51.350 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:356 + + Report Entries >> + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:08:20.695 + BBS Struct => Protobuf Binary + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================ + convert [duration] | 1000000 | 7.8µs | 9.6µs | 10.863µs | 13.732µs | 3.718097ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:358 + + Report Entries >> + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:09:12.101 + BBS Struct => Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 81.8µs | 81.8µs | 81.8µs | 0s | 81.8µs + << Report Entries +------------------------------ +• [0.068 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:359 + + Report Entries >> + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:09:12.102 + BBS Struct => Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + =========================================================================== + convert [duration] | 1000 | 18.4µs | 20.2µs | 23.732µs | 14.896µs | 284.1µs + << Report Entries +------------------------------ +• [61.775 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:360 + + Report Entries >> + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:09:12.17 + BBS Struct => Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================= + convert [duration] | 1000000 | 15.5µs | 19.1µs | 21.161µs | 17.719µs | 6.543688ms + << Report Entries +------------------------------ +• [0.001 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1 conversion +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:384 + + Report Entries >> + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:376 @ 02/24/25 18:10:14.008 + Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 36.4µs | 36.4µs | 36.4µs | 0s | 36.4µs + << Report Entries +------------------------------ +• [0.057 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:385 + + Report Entries >> + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:376 @ 02/24/25 18:10:14.008 + Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ======================================================================= + convert [duration] | 1000 | 14µs | 15.4µs | 16.389µs | 5.045µs | 82.1µs + << Report Entries +------------------------------ +• [56.966 seconds] +BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000,000 conversions +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:386 + + Report Entries >> + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:376 @ 02/24/25 18:10:14.066 + Protobuf Binary => BBS Struct + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================= + convert [duration] | 1000000 | 13.199µs | 15.2µs | 16.636µs | 11µs | 1.679796ms + << Report Entries +------------------------------ + +Ran 9 of 9 Specs in 170.462 seconds +SUCCESS! -- 9 Passed | 0 Failed | 0 Pending | 0 Skipped +PASS + +Ginkgo ran 1 suite in 2m51.356549471s +Test Suite Passed From fb9d58ea0418edffdd8f644b9f6bfad7f6243ad6 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 24 Feb 2025 22:53:12 +0000 Subject: [PATCH 140/155] Use results from new script --- ...e-plugin-results.txt => gogo-protobuf.txt} | 104 +++++---- ...plugin-results.txt => google-protobuf.txt} | 200 +++++++++--------- 2 files changed, 144 insertions(+), 160 deletions(-) rename models/performance/results/{pre-plugin-results.txt => gogo-protobuf.txt} (63%) rename models/performance/results/{post-plugin-results.txt => google-protobuf.txt} (77%) diff --git a/models/performance/results/pre-plugin-results.txt b/models/performance/results/gogo-protobuf.txt similarity index 63% rename from models/performance/results/pre-plugin-results.txt rename to models/performance/results/gogo-protobuf.txt index e1c9dfe1..0822f32f 100644 --- a/models/performance/results/pre-plugin-results.txt +++ b/models/performance/results/gogo-protobuf.txt @@ -1,129 +1,121 @@ -NOTE: - -These results were as of 2025-02-24. - -diego-release commit 2d96a8834cc5fe4e9b7014c9140b7c7454758058 -bbs commit 216775bc13e71a588df5fc56297e86a04b3d1c78 -========================================================================================================================= - Running Suite: Performance Suite - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance ========================================================================================================================= -Random Seed: 1740420499 +Random Seed: 1740436834 Will run 9 of 9 specs ------------------------------ • [0.002 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1 conversion -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:354 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:354 Report Entries >> - BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:08:20.631 + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:346 @ 02/24/25 22:40:35.606 BBS Struct => Protobuf Binary Name | N | Min | Median | Mean | StdDev | Max =================================================================== - convert [duration] | 1 | 77.6µs | 77.6µs | 77.6µs | 0s | 77.6µs + convert [duration] | 1 | 62.9µs | 62.9µs | 62.9µs | 0s | 62.9µs << Report Entries ------------------------------ • [0.062 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:355 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:355 Report Entries >> - BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:08:20.633 + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:346 @ 02/24/25 22:40:35.607 BBS Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - ============================================================================ - convert [duration] | 1000 | 8.9µs | 16.6µs | 19.163µs | 38.797µs | 838.799µs + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================ + convert [duration] | 1000 | 8.9µs | 16.649µs | 21.383µs | 108.068µs | 3.380561ms << Report Entries ------------------------------ -• [51.350 seconds] +• [55.034 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:356 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:356 Report Entries >> - BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:08:20.695 + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:346 @ 02/24/25 22:40:35.67 BBS Struct => Protobuf Binary Name | N | Min | Median | Mean | StdDev | Max ================================================================================ - convert [duration] | 1000000 | 7.8µs | 9.6µs | 10.863µs | 13.732µs | 3.718097ms + convert [duration] | 1000000 | 8.5µs | 10µs | 11.743µs | 15.225µs | 5.087044ms << Report Entries ------------------------------ • [0.001 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1 conversion -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:358 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:358 Report Entries >> - BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:09:12.101 + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:346 @ 02/24/25 22:41:30.761 BBS Struct => Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - =================================================================== - convert [duration] | 1 | 81.8µs | 81.8µs | 81.8µs | 0s | 81.8µs + Name | N | Min | Median | Mean | StdDev | Max + =========================================================================== + convert [duration] | 1 | 73.599µs | 73.599µs | 73.599µs | 0s | 73.599µs << Report Entries ------------------------------ -• [0.068 seconds] +• [0.066 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:359 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:359 Report Entries >> - BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:09:12.102 + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:346 @ 02/24/25 22:41:30.761 BBS Struct => Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - =========================================================================== - convert [duration] | 1000 | 18.4µs | 20.2µs | 23.732µs | 14.896µs | 284.1µs + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================== + convert [duration] | 1000 | 17.1µs | 19.201µs | 24.53µs | 33.678µs | 772.192µs << Report Entries ------------------------------ -• [61.775 seconds] +• [67.569 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:360 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:360 Report Entries >> - BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 18:09:12.17 + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:346 @ 02/24/25 22:41:30.828 BBS Struct => Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max + Name | N | Min | Median | Mean | StdDev | Max ================================================================================= - convert [duration] | 1000000 | 15.5µs | 19.1µs | 21.161µs | 17.719µs | 6.543688ms + convert [duration] | 1000000 | 16.799µs | 20.3µs | 23.513µs | 19.77µs | 7.67462ms << Report Entries ------------------------------ • [0.001 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1 conversion -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:384 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:384 Report Entries >> - Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:376 @ 02/24/25 18:10:14.008 + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:376 @ 02/24/25 22:42:38.476 Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - =================================================================== - convert [duration] | 1 | 36.4µs | 36.4µs | 36.4µs | 0s | 36.4µs + Name | N | Min | Median | Mean | StdDev | Max + ============================================================= + convert [duration] | 1 | 37µs | 37µs | 37µs | 0s | 37µs << Report Entries ------------------------------ -• [0.057 seconds] +• [0.058 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000 conversions -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:385 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:385 Report Entries >> - Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:376 @ 02/24/25 18:10:14.008 + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:376 @ 02/24/25 22:42:38.476 Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - ======================================================================= - convert [duration] | 1000 | 14µs | 15.4µs | 16.389µs | 5.045µs | 82.1µs + Name | N | Min | Median | Mean | StdDev | Max + ========================================================================== + convert [duration] | 1000 | 14µs | 15.6µs | 16.839µs | 6.457µs | 103.399µs << Report Entries ------------------------------ -• [56.966 seconds] +• [60.051 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000,000 conversions -/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:386 +/home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:386 Report Entries >> - Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:376 @ 02/24/25 18:10:14.066 + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/conversion_test.go:376 @ 02/24/25 22:42:38.535 Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - ================================================================================= - convert [duration] | 1000000 | 13.199µs | 15.2µs | 16.636µs | 11µs | 1.679796ms + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================ + convert [duration] | 1000000 | 13.2µs | 15.8µs | 17.68µs | 12.206µs | 2.280577ms << Report Entries ------------------------------ -Ran 9 of 9 Specs in 170.462 seconds +Ran 9 of 9 Specs in 183.058 seconds SUCCESS! -- 9 Passed | 0 Failed | 0 Pending | 0 Skipped PASS -Ginkgo ran 1 suite in 2m51.356549471s +Ginkgo ran 1 suite in 3m3.983728627s Test Suite Passed diff --git a/models/performance/results/post-plugin-results.txt b/models/performance/results/google-protobuf.txt similarity index 77% rename from models/performance/results/post-plugin-results.txt rename to models/performance/results/google-protobuf.txt index b5451327..920f140d 100644 --- a/models/performance/results/post-plugin-results.txt +++ b/models/performance/results/google-protobuf.txt @@ -1,14 +1,6 @@ -NOTE: - -These results were as of 2025-02-21. - -diego-release commit b8093ae2fe8b43fed7ab81a71d453402e2b0bc0b -bbs commit 889d496b7f5b82b135e393e2a30282b562aef330 -========================================================================================================================= - Running Suite: Performance Suite - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance ========================================================================================================================= -Random Seed: 1740177911 +Random Seed: 1740437021 Will run 24 of 24 specs ------------------------------ @@ -17,35 +9,35 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:354 Report Entries >> - BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:45:12.234 + BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:43:42.464 BBS Struct => Protobuf Struct - Name | N | Min | Median | Mean | StdDev | Max - =================================================================== - convert [duration] | 1 | 38.6µs | 38.6µs | 38.6µs | 0s | 38.6µs + Name | N | Min | Median | Mean | StdDev | Max + =========================================================================== + convert [duration] | 1 | 51.799µs | 51.799µs | 51.799µs | 0s | 51.799µs << Report Entries ------------------------------ -• [0.066 seconds] +• [0.062 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:355 Report Entries >> - BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:45:12.236 + BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:43:42.465 BBS Struct => Protobuf Struct Name | N | Min | Median | Mean | StdDev | Max ============================================================================ - convert [duration] | 1000 | 8.1µs | 9.4µs | 20.067µs | 40.342µs | 811.394µs + convert [duration] | 1000 | 7.8µs | 9.1µs | 19.333µs | 46.236µs | 990.891µs << Report Entries ------------------------------ -• [50.931 seconds] +• [51.649 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:356 Report Entries >> - BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:45:12.302 + BBS Struct => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:43:42.528 BBS Struct => Protobuf Struct - Name | N | Min | Median | Mean | StdDev | Max - =============================================================================== - convert [duration] | 1000000 | 7.7µs | 9µs | 10.412µs | 16.449µs | 4.40447ms + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================ + convert [duration] | 1000000 | 7.5µs | 9.1µs | 10.584µs | 17.173µs | 5.894842ms << Report Entries ------------------------------ • [0.002 seconds] @@ -53,35 +45,35 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:358 Report Entries >> - BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:46:03.286 + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:44:34.234 BBS Struct => Protobuf Binary Name | N | Min | Median | Mean | StdDev | Max =============================================================================== - convert [duration] | 1 | 925.193µs | 925.193µs | 925.193µs | 0s | 925.193µs + convert [duration] | 1 | 904.491µs | 904.491µs | 904.491µs | 0s | 904.491µs << Report Entries ------------------------------ -• [0.063 seconds] +• [0.064 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:359 Report Entries >> - BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:46:03.288 + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:44:34.236 BBS Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - ============================================================================= - convert [duration] | 1000 | 17.7µs | 19.5µs | 21.582µs | 11.406µs | 258.198µs + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================= + convert [duration] | 1000 | 17.899µs | 19.999µs | 22.638µs | 20.519µs | 541.794µs << Report Entries ------------------------------ -• [61.811 seconds] +• [62.503 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:360 Report Entries >> - BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:46:03.351 + BBS Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:44:34.3 BBS Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - ================================================================================= - convert [duration] | 1000000 | 17.5µs | 19.7µs | 21.384µs | 13.766µs | 2.800081ms + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================== + convert [duration] | 1000000 | 17.499µs | 19.8µs | 21.65µs | 14.392µs | 1.718484ms << Report Entries ------------------------------ • [0.001 seconds] @@ -89,35 +81,35 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:362 Report Entries >> - BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:47:05.222 + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:45:36.866 BBS Struct => Protobuf Binary => BBS Struct Name | N | Min | Median | Mean | StdDev | Max =============================================================================== - convert [duration] | 1 | 116.898µs | 116.898µs | 116.898µs | 0s | 116.898µs + convert [duration] | 1 | 110.199µs | 110.199µs | 110.199µs | 0s | 110.199µs << Report Entries ------------------------------ -• [0.088 seconds] +• [0.082 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:363 Report Entries >> - BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:47:05.223 + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:45:36.867 BBS Struct => Protobuf Binary => BBS Struct Name | N | Min | Median | Mean | StdDev | Max ============================================================================= - convert [duration] | 1000 | 32.6µs | 37µs | 44.535µs | 33.307µs | 828.794µs + convert [duration] | 1000 | 32.2µs | 36µs | 40.084µs | 12.761µs | 141.099µs << Report Entries ------------------------------ -• [80.871 seconds] +• [81.441 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a BBS Plugin Struct Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:364 Report Entries >> - BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/21/25 22:47:05.311 + BBS Struct => Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:346 @ 02/24/25 22:45:36.949 BBS Struct => Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - ================================================================================= - convert [duration] | 1000000 | 30.6µs | 36.5µs | 39.658µs | 20.488µs | 3.951374ms + Name | N | Min | Median | Mean | StdDev | Max + =================================================================================== + convert [duration] | 1000000 | 31.5µs | 36.699µs | 40.024µs | 23.476µs | 7.043036ms << Report Entries ------------------------------ • [0.001 seconds] @@ -125,11 +117,11 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:388 Report Entries >> - Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:48:26.259 + Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:46:58.471 Protobuf Struct => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - =========================================================================== - convert [duration] | 1 | 65.399µs | 65.399µs | 65.399µs | 0s | 65.399µs + Name | N | Min | Median | Mean | StdDev | Max + =================================================================== + convert [duration] | 1 | 11.9µs | 11.9µs | 11.9µs | 0s | 11.9µs << Report Entries ------------------------------ • [0.052 seconds] @@ -137,23 +129,23 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:389 Report Entries >> - Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:48:26.259 + Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:46:58.472 Protobuf Struct => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - ======================================================================== - convert [duration] | 1000 | 8.5µs | 9.3µs | 10.186µs | 5.305µs | 66.5µs + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================= + convert [duration] | 1000 | 7.9µs | 8.999µs | 10.734µs | 22.383µs | 641.195µs << Report Entries ------------------------------ -• [50.026 seconds] +• [50.232 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:390 Report Entries >> - Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:48:26.312 + Protobuf Struct => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:46:58.524 Protobuf Struct => BBS Struct Name | N | Min | Median | Mean | StdDev | Max ============================================================================== - convert [duration] | 1000000 | 7.4µs | 8.9µs | 9.694µs | 7.057µs | 3.139179ms + convert [duration] | 1000000 | 7.5µs | 8.9µs | 9.768µs | 7.655µs | 1.780784ms << Report Entries ------------------------------ • [0.001 seconds] @@ -161,35 +153,35 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:392 Report Entries >> - Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:49:16.409 + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:47:48.812 Protobuf Struct => Protobuf Binary Name | N | Min | Median | Mean | StdDev | Max =================================================================== - convert [duration] | 1 | 45.7µs | 45.7µs | 45.7µs | 0s | 45.7µs + convert [duration] | 1 | 48.5µs | 48.5µs | 48.5µs | 0s | 48.5µs << Report Entries ------------------------------ -• [0.061 seconds] +• [0.060 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:393 Report Entries >> - Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:49:16.41 + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:47:48.813 Protobuf Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - ============================================================================ - convert [duration] | 1000 | 16.2µs | 17.1µs | 18.469µs | 7.717µs | 176.599µs + Name | N | Min | Median | Mean | StdDev | Max + =========================================================================== + convert [duration] | 1000 | 15.6µs | 16.6µs | 17.979µs | 6.091µs | 78.699µs << Report Entries ------------------------------ -• [57.776 seconds] +• [57.886 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:394 Report Entries >> - Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:49:16.471 + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:47:48.873 Protobuf Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - ================================================================================ - convert [duration] | 1000000 | 14.8µs | 16.5µs | 17.506µs | 7.774µs | 2.409084ms + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================== + convert [duration] | 1000000 | 14.699µs | 16.5µs | 17.548µs | 9.828µs | 4.373362ms << Report Entries ------------------------------ • [0.001 seconds] @@ -197,11 +189,11 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:396 Report Entries >> - Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:50:14.302 + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:48:46.812 Protobuf Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - =================================================================== - convert [duration] | 1 | 70.5µs | 70.5µs | 70.5µs | 0s | 70.5µs + Name | N | Min | Median | Mean | StdDev | Max + =========================================================================== + convert [duration] | 1 | 72.699µs | 72.699µs | 72.699µs | 0s | 72.699µs << Report Entries ------------------------------ • [0.074 seconds] @@ -209,23 +201,23 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:397 Report Entries >> - Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:50:14.303 + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:48:46.813 Protobuf Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - ============================================================================= - convert [duration] | 1000 | 28.401µs | 30.9µs | 32.711µs | 7.45µs | 105.699µs + Name | N | Min | Median | Mean | StdDev | Max + =============================================================================== + convert [duration] | 1000 | 27.4µs | 29.949µs | 32.653µs | 10.381µs | 158.399µs << Report Entries ------------------------------ -• [72.988 seconds] +• [73.342 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Struct Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:398 Report Entries >> - Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/21/25 22:50:14.378 + Protobuf Struct => Protobuf Binary - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:380 @ 02/24/25 22:48:46.887 Protobuf Struct => Protobuf Binary - Name | N | Min | Median | Mean | StdDev | Max - ===================================================================================== - convert [duration] | 1000000 | 26.199µs | 30.099µs | 32.312µs | 14.441µs | 1.623989ms + Name | N | Min | Median | Mean | StdDev | Max + =============================================================================== + convert [duration] | 1000000 | 26µs | 30.1µs | 32.552µs | 14.917µs | 4.022467ms << Report Entries ------------------------------ • [0.001 seconds] @@ -233,35 +225,35 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:424 Report Entries >> - Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:51:27.434 + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/24/25 22:50:00.307 Protobuf Binary => BBS Struct Name | N | Min | Median | Mean | StdDev | Max =========================================================================== - convert [duration] | 1 | 48.199µs | 48.199µs | 48.199µs | 0s | 48.199µs + convert [duration] | 1 | 85.499µs | 85.499µs | 85.499µs | 0s | 85.499µs << Report Entries ------------------------------ -• [0.066 seconds] +• [0.070 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:425 Report Entries >> - Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:51:27.435 + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/24/25 22:50:00.308 Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max + Name | N | Min | Median | Mean | StdDev | Max ============================================================================ - convert [duration] | 1000 | 20.4µs | 23µs | 25.064µs | 8.636µs | 144.299µs + convert [duration] | 1000 | 22µs | 24.349µs | 26.517µs | 7.621µs | 113.099µs << Report Entries ------------------------------ -• [66.116 seconds] +• [66.740 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:426 Report Entries >> - Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:51:27.502 + Protobuf Binary => BBS Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/24/25 22:50:00.378 Protobuf Binary => BBS Struct - Name | N | Min | Median | Mean | StdDev | Max - =================================================================================== - convert [duration] | 1000000 | 19.899µs | 23.2µs | 25.228µs | 12.841µs | 1.768488ms + Name | N | Min | Median | Mean | StdDev | Max + ================================================================================= + convert [duration] | 1000000 | 19.9µs | 23.3µs | 25.655µs | 15.308µs | 5.960651ms << Report Entries ------------------------------ • [0.001 seconds] @@ -269,41 +261,41 @@ BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:428 Report Entries >> - Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:52:33.686 + Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/24/25 22:51:07.188 Protobuf Binary => Protobuf Struct Name | N | Min | Median | Mean | StdDev | Max =================================================================== - convert [duration] | 1 | 35.8µs | 35.8µs | 35.8µs | 0s | 35.8µs + convert [duration] | 1 | 39.9µs | 39.9µs | 39.9µs | 0s | 39.9µs << Report Entries ------------------------------ -• [0.064 seconds] +• [0.063 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:429 Report Entries >> - Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:52:33.687 + Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/24/25 22:51:07.189 Protobuf Binary => Protobuf Struct - Name | N | Min | Median | Mean | StdDev | Max - =============================================================================== - convert [duration] | 1000 | 18.901µs | 20.599µs | 22.01µs | 7.273µs | 164.699µs + Name | N | Min | Median | Mean | StdDev | Max + ============================================================================ + convert [duration] | 1000 | 17.9µs | 20.1µs | 21.688µs | 6.919µs | 132.998µs << Report Entries ------------------------------ -• [62.418 seconds] +• [63.271 seconds] BBS Plugin Conversion: Desired LRP Conversion Performance Testing Starting with a Protobuf Binary Measures conversion time 1,000,000 conversions /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:430 Report Entries >> - Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/21/25 22:52:33.751 + Protobuf Binary => Protobuf Struct - /home/pivotal/workspace/diego-release/src/code.cloudfoundry.org/bbs/models/performance/bbs_plugin_test.go:416 @ 02/24/25 22:51:07.252 Protobuf Binary => Protobuf Struct - Name | N | Min | Median | Mean | StdDev | Max - ================================================================================= - convert [duration] | 1000000 | 17.2µs | 20.1µs | 21.789µs | 10.938µs | 2.161257ms + Name | N | Min | Median | Mean | StdDev | Max + =================================================================================== + convert [duration] | 1000000 | 17.399µs | 20.399µs | 22.27µs | 12.74µs | 3.224974ms << Report Entries ------------------------------ -Ran 24 of 24 Specs in 504.003 seconds +Ran 24 of 24 Specs in 508.129 seconds SUCCESS! -- 24 Passed | 0 Failed | 0 Pending | 0 Skipped PASS -Ginkgo ran 1 suite in 8m35.427356274s +Ginkgo ran 1 suite in 8m29.286576729s Test Suite Passed From 4ba4c9af9d87c72b353f6cca4183f072e014a781 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 26 Feb 2025 01:28:06 +0000 Subject: [PATCH 141/155] WIP --- protoc-gen-go-bbs/bbs.go | 44 ++++++++++++++++++++++++++++++-------- scripts/generate_protos.sh | 5 ++++- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 32d0dfad..299ec0d2 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -19,9 +19,11 @@ type bbsGenerateHelperInterface interface { genFromProtoMethod(g *protogen.GeneratedFile, msg *protogen.Message) genToProtoSliceMethod(g *protogen.GeneratedFile, msg *protogen.Message) genFromProtoSliceMethod(g *protogen.GeneratedFile, msg *protogen.Message) - genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) + genMessageEnums(g *protogen.GeneratedFile, msg *protogen.Message) genAccessors(g *protogen.GeneratedFile, msg *protogen.Message) genEqual(g *protogen.GeneratedFile, msg *protogen.Message) + + genGlobalEnum(g *protogen.GeneratedFile, eNuM *protogen.Enum) } type bbsGenerateHelper struct{} @@ -392,19 +394,25 @@ func getCustomType(field *protogen.Field) string { return customType.(string) } -func (bbsGenerateHelper) genFriendlyEnums(g *protogen.GeneratedFile, msg *protogen.Message) { +func (bbsGenerateHelper) genGlobalEnum(g *protogen.GeneratedFile, eNuM *protogen.Enum) { + genEnumTypeWithValues(g, eNuM, nil) + genEnumValueMaps(g, eNuM) + genEnumStringFunc(g, eNuM) +} + +func (bbsGenerateHelper) genMessageEnums(g *protogen.GeneratedFile, msg *protogen.Message) { for _, eNuM := range msg.Enums { if *debug { log.Printf("Nested Enum: %+v\n", eNuM) } - genEnumTypeWithValues(g, msg, eNuM) + genEnumTypeWithValues(g, eNuM, msg) genEnumValueMaps(g, eNuM) genEnumStringFunc(g, eNuM) } } -func genEnumTypeWithValues(g *protogen.GeneratedFile, msg *protogen.Message, eNuM *protogen.Enum) { +func genEnumTypeWithValues(g *protogen.GeneratedFile, eNuM *protogen.Enum, msg *protogen.Message) { copysafeName, _ := getCopysafeName(g, eNuM.GoIdent) g.P("type ", copysafeName, " int32") g.P("const (") @@ -412,7 +420,7 @@ func genEnumTypeWithValues(g *protogen.GeneratedFile, msg *protogen.Message, eNu if isEnumValueDeprecated(enumValue) { g.P("// Deprecated: marked deprecated in proto file") } - enumValueName := getEnumValueName(g, msg, enumValue) + enumValueName := getEnumValueName(g, enumValue, msg) actualValue := enumValue.Desc.Number() g.P(enumValueName, " ", copysafeName, "=", actualValue) @@ -455,14 +463,18 @@ func genEnumStringFunc(g *protogen.GeneratedFile, eNuM *protogen.Enum) { g.P("}") } -func getEnumValueName(g *protogen.GeneratedFile, msg *protogen.Message, enumValue *protogen.EnumValue) string { - copysafeParentName, _ := getCopysafeName(g, msg.GoIdent) +func getEnumValueName(g *protogen.GeneratedFile, enumValue *protogen.EnumValue, msg *protogen.Message) string { copysafeEnumValueName, _ := getCopysafeName(g, enumValue.GoIdent) customName := proto.GetExtension(enumValue.Desc.Options().(*descriptorpb.EnumValueOptions), E_BbsEnumvalueCustomname) result := copysafeEnumValueName if len(customName.(string)) > 0 { - result = copysafeParentName + "_" + customName.(string) + if msg == nil { + result = customName.(string) + } else { + copysafeParentName, _ := getCopysafeName(g, msg.GoIdent) + result = copysafeParentName + "_" + customName.(string) + } } return result @@ -695,8 +707,22 @@ func protocVersion(plugin *protogen.Plugin) string { } var ignoredMessages []string = []string{"ProtoRoutes"} +var ignoredEnums []string = []string{} func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { + for _, eNuM := range file.Enums { + if *debug { + log.Printf("New Enum Detected: %+v\n\n", eNuM) + } + + if slices.Contains(ignoredMessages, getUnsafeName(g, eNuM.GoIdent)) { + log.Printf("\tIgnoring enum %s", eNuM.Desc.Name()) + continue + } + + helper.genGlobalEnum(g, eNuM) + } + for _, msg := range file.Messages { if *debug { log.Printf("New Message Detected: %+v\n\n", msg) @@ -706,7 +732,7 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { log.Printf("\tIgnoring message %s", msg.Desc.Name()) continue } - helper.genFriendlyEnums(g, msg) + helper.genMessageEnums(g, msg) helper.genCopysafeStruct(g, msg) helper.genToProtoMethod(g, msg) helper.genFromProtoMethod(g, msg) diff --git a/scripts/generate_protos.sh b/scripts/generate_protos.sh index d3332425..c137de2f 100755 --- a/scripts/generate_protos.sh +++ b/scripts/generate_protos.sh @@ -13,5 +13,8 @@ popd > /dev/null # regenerate protos for models pushd "${DIR}/../models" > /dev/null - protoc --proto_path=.:../protoc-gen-go-bbs --go_out=. --go-bbs_out=. --go_opt=paths=source_relative --go-bbs_opt=paths=source_relative ./*.proto + protoc --proto_path=.:../protoc-gen-go-bbs \ + --go_out=. --go_opt=paths=source_relative \ + --go-bbs_out=. --go-bbs_opt=paths=source_relative \ + ./*.proto popd > /dev/null From 5d7065de96138266859bd2e0bbdb146e70fe6a51 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 12 Mar 2025 16:53:51 +0000 Subject: [PATCH 142/155] Copy-paste error for ignoredEnums --- protoc-gen-go-bbs/bbs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 299ec0d2..5e049aa9 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -715,7 +715,7 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { log.Printf("New Enum Detected: %+v\n\n", eNuM) } - if slices.Contains(ignoredMessages, getUnsafeName(g, eNuM.GoIdent)) { + if slices.Contains(ignoredEnums, getUnsafeName(g, eNuM.GoIdent)) { log.Printf("\tIgnoring enum %s", eNuM.Desc.Name()) continue } From 7c3a58d6ca6656154e11492c3dafaa49cfbfa738 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Wed, 12 Mar 2025 16:54:40 +0000 Subject: [PATCH 143/155] Change to use new backwards-compatible locket protobufs Regen protos --- models/actions.pb.go | 2 +- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 2 +- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 2 +- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 2 +- models/cached_dependency.pb.go | 2 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 2 +- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 2 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 2 +- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 2 +- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 2 +- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 2 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 2 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 2 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 2 +- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 2 +- models/events_bbs.pb.go | 2 +- models/file.pb.go | 2 +- models/file_bbs.pb.go | 2 +- models/image_layer.pb.go | 2 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 2 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 2 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 2 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 2 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 2 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 2 +- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 2 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 2 +- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 2 +- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 2 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 2 +- test_helpers/locket_helper.go | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index 5fb6d4aa..d45fdbcd 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: actions.proto package models diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index d49ca515..3f3e312b 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 240e716f..54227f3a 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 6e160bb9..303cfbc4 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 6a25ecc1..f7727ddf 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: actual_lrp_requests.proto package models diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index cbf42256..06cecc4f 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index c6c0ef88..d3efa60d 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: bbs.proto package models diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 89fd2f54..64f20cde 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: cached_dependency.proto package models diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index bec4931d..31a6f6c7 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index 92d2e323..8d47cfe5 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: cells.proto package models diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 1bd65af2..c07769d4 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 1b112764..ed95742b 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: certificate_properties.proto package models diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 189f6d04..a2ca156e 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 0be3e9c0..b50e80b4 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: check_definition.proto package models diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index b44ea4c6..2f92916c 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 4a7dbdaf..e45b1bd5 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index 44406499..fcb15f1d 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 501575de..1b126d90 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: desired_lrp_requests.proto package models diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index 6dc37574..80713a08 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index 524b20de..d8d7a69f 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: domain.proto package models diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 07e1738e..d3b30338 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index f34afbbe..85d09fd2 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: environment_variables.proto package models diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index b93fe006..c57a3117 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index 21cc384b..f14bffdd 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: error.proto package models diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 5a605922..ec23fcff 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index cf316a05..a826ee8f 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: evacuation.proto package models diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 6bc147cf..c585e367 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index 7f61bb47..2278aad4 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: events.proto package models diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index d2014fb2..9134bc68 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: events.proto package models diff --git a/models/file.pb.go b/models/file.pb.go index 13b5c6fa..f4059b85 100644 --- a/models/file.pb.go +++ b/models/file.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: file.proto package models diff --git a/models/file_bbs.pb.go b/models/file_bbs.pb.go index 07b2a761..ed4584e6 100644 --- a/models/file_bbs.pb.go +++ b/models/file_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: file.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 842dd505..50f27c80 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: image_layer.proto package models diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 4425d929..6936cbde 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index c1ef7509..0bedf7d2 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: log_rate_limit.proto package models diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 1b3b34ee..fe4bfe0d 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 5fe219e5..ee012473 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: metric_tags.proto package models diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index ab3063fb..4f083f61 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 3697b2f4..ebba47d9 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: modification_tag.proto package models diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 14826aa1..52e88836 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index d0280cf1..d2e7c3fa 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: network.proto package models diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 7dbd02f8..bdea4d76 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 4a78c1c7..8b3c4b10 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: ping.proto package models diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 48f0bce5..1ad9afee 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index 6336b92f..e0f2b916 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: security_group.proto package models diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 166a194a..079a82cb 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index ee796692..7451df80 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: sidecar.proto package models diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index d192df0b..79f650c3 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index b4f07be4..921052b0 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: task.proto package models diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 0841ce78..ec1335fd 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index 61146c55..75f17d9c 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: task_requests.proto package models diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index 6209746d..a75347cf 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 2ec024f6..0632b328 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: volume_mount.proto package models diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index a406afc5..7c46b837 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v4.25.6 +// - protoc v6.30.0 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 0fd7d3b9..a41eec62 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.5 -// protoc v4.25.6 +// protoc v6.30.0 // source: bbs.proto package main diff --git a/test_helpers/locket_helper.go b/test_helpers/locket_helper.go index f8470720..c1b786dd 100644 --- a/test_helpers/locket_helper.go +++ b/test_helpers/locket_helper.go @@ -27,7 +27,7 @@ func (h *LocketHelper) RegisterCell(cell *models.CellPresence) { Key: "bbs", Owner: "test_helpers", Value: "Something", - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, } // Use NewLockRunner instead of NewPresence in order to block on the cell being registered runner := lock.NewLockRunner(h.logger, h.LocketClient, locketIdentifier, locket.DefaultSessionTTLInSeconds, clock.NewClock(), locket.RetryInterval) From c60c742f54baa469b9e1cb14750972c3a8c408bb Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 14 Mar 2025 17:26:01 +0000 Subject: [PATCH 144/155] Base grpc generation --- protoc-gen-go-bbs/bbs.go | 216 ++++++++++++++++++++++++++++++++- protoc-gen-go-bbs/main.go | 4 + protoc-gen-go-bbs/templates.go | 140 +++++++++++++++++++++ 3 files changed, 356 insertions(+), 4 deletions(-) create mode 100644 protoc-gen-go-bbs/templates.go diff --git a/protoc-gen-go-bbs/bbs.go b/protoc-gen-go-bbs/bbs.go index 5e049aa9..4922cc50 100644 --- a/protoc-gen-go-bbs/bbs.go +++ b/protoc-gen-go-bbs/bbs.go @@ -6,6 +6,7 @@ import ( "slices" "strings" "text/template" + "unicode" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" @@ -27,17 +28,31 @@ type bbsGenerateHelperInterface interface { } type bbsGenerateHelper struct{} +var ignoredMessages []string = []string{"ProtoRoutes"} +var ignoredEnums []string = []string{} +var ignoredServices []string = []string{} + var helper bbsGenerateHelperInterface = bbsGenerateHelper{} func getUnsafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) string { return g.QualifiedGoIdent(ident) } +func getUnsafeNameFromString(name protoreflect.Name) string { + unsafeName := name + return string(unsafeName) +} + func getCopysafeName(g *protogen.GeneratedFile, ident protogen.GoIdent) (string, bool) { unsafeName := getUnsafeName(g, ident) return strings.CutPrefix(unsafeName, *prefix) } +func getCopysafeNameFromString(name protoreflect.Name) (string, bool) { + unsafeName := getUnsafeNameFromString(name) + return strings.CutPrefix(unsafeName, *prefix) +} + func getFieldName(goName string) string { result := goName return result @@ -694,6 +709,27 @@ func generateFile(plugin *protogen.Plugin, file *protogen.File) *protogen.Genera return g } +func generateRpcFile(plugin *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile { + filename := file.GeneratedFilenamePrefix + "_bbs_grpc.pb.go" + g := plugin.NewGeneratedFile(filename, file.GoImportPath) + g.P("// Code generated by protoc-gen-go-bbs. DO NOT EDIT.") + g.P("// versions:") + g.P("// - protoc-gen-go-bbs v", version) // version from main.go + g.P("// - protoc-gen-go-grpc ", "TODO: get version") + g.P("// - protoc ", protocVersion(plugin)) + + if file.Proto.GetOptions().GetDeprecated() { + g.P("// ", file.Desc.Path(), " is a deprecated file.") + } else { + g.P("// source: ", file.Desc.Path()) + } + g.P() + g.P("package ", file.GoPackageName) + g.P() + generateRpcFileContent(file, g) + return g +} + func protocVersion(plugin *protogen.Plugin) string { v := plugin.Request.GetCompilerVersion() if v == nil { @@ -706,10 +742,7 @@ func protocVersion(plugin *protogen.Plugin) string { return fmt.Sprintf("v%d.%d.%d%s", v.GetMajor(), v.GetMinor(), v.GetPatch(), suffix) } -var ignoredMessages []string = []string{"ProtoRoutes"} -var ignoredEnums []string = []string{} - -func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { +func generateFileEnums(file *protogen.File, g *protogen.GeneratedFile) { for _, eNuM := range file.Enums { if *debug { log.Printf("New Enum Detected: %+v\n\n", eNuM) @@ -722,7 +755,9 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { helper.genGlobalEnum(g, eNuM) } +} +func generateFileMessages(file *protogen.File, g *protogen.GeneratedFile) { for _, msg := range file.Messages { if *debug { log.Printf("New Message Detected: %+v\n\n", msg) @@ -740,3 +775,176 @@ func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { helper.genFromProtoSliceMethod(g, msg) } } + +var currentService Service + +func generateFileServices(file *protogen.File, g *protogen.GeneratedFile) { + for _, svc := range file.Services { + if *debug { + log.Printf("New Service Detected: %+v\n\n", svc) + } + + if slices.Contains(ignoredServices, svc.GoName) { + log.Printf("\tIgnoring service %s", svc.Desc.Name()) + continue + } + + if serviceName, ok := getCopysafeNameFromString(svc.Desc.Name()); ok { + sourceFilename := file.Desc.Path() + currentService = Service{Name: serviceName, Source: sourceFilename} + + genImports(g) + genClient(g, svc) + genServer(g, svc) + genServiceDesc(g, svc) + } + } +} + +var funcMap template.FuncMap = template.FuncMap{ + "LowerFirst": lowerFirst, +} + +func lowerFirst(s string) string { + if len(s) == 0 { + return s + } + + runes := []rune(s) + runes[0] = unicode.ToLower(runes[0]) + return string(runes) +} + +func genImports(g *protogen.GeneratedFile) { + importBuilder := new(strings.Builder) + importT, err := template.New("import").Funcs(funcMap).Parse(grpcImports) + if err != nil { + panic(err) + } + importT.Execute(importBuilder, nil) + g.P(importBuilder.String()) + +} + +func genClient(g *protogen.GeneratedFile, svc *protogen.Service) { + clientMethodNames := genMethodTemplate(svc, clientMethodName, false) + clientInterfaceMethods := genMethodTemplate(svc, clientInterfaceMethod, false) + clientMethods := genMethodTemplate(svc, clientMethod, false) + clientBuilder := new(strings.Builder) + + clientT, err := template.New("client").Funcs(funcMap).Parse(grpcClient) + if err != nil { + panic(err) + } + clientT.Execute(clientBuilder, + Client{ + Service: currentService, + ClientInterfaceMethods: clientInterfaceMethods, + ClientMethodNames: clientMethodNames, + ClientMethods: clientMethods, + }) + g.P(clientBuilder.String()) +} + +func genServer(g *protogen.GeneratedFile, svc *protogen.Service) { + unimplementedServerMethods := genMethodTemplate(svc, unimplementedServerMethod, false) + serverInterfaceMethods := genMethodTemplate(svc, serverInterfaceMethod, false) + serverHandlers := genMethodTemplate(svc, serverHandler, false) + + serverBuilder := new(strings.Builder) + serverT, err := template.New("server").Funcs(funcMap).Parse(grpcServer) + if err != nil { + panic(err) + } + + serverT.Execute(serverBuilder, + Server{ + Service: currentService, + ServerHandlers: serverHandlers, + ServerInterfaceMethods: serverInterfaceMethods, + UnimplementedServerMethods: unimplementedServerMethods, + }) + g.P(serverBuilder.String()) +} + +func genMethodTemplate(svc *protogen.Service, methodTemplate string, addComma bool) string { + builder := new(strings.Builder) + methodT, err := template.New("method-template").Funcs(funcMap).Parse(methodTemplate) + if err != nil { + panic(err) + } + + for i, method := range svc.Methods { + methodName, _ := getCopysafeNameFromString(method.Desc.Name()) + methodT.Execute(builder, + Method{ + Service: currentService, + MethodName: methodName, + }) + if addComma { + if i < len(svc.Methods)-1 { + builder.WriteRune(',') + } + } + } + return builder.String() +} + +type Service struct { + Name string + Source string +} + +type Client struct { + ClientInterfaceMethods string + ClientMethodNames string + ClientMethods string + Service Service +} + +type Server struct { + ServerInterfaceMethods string + ServerHandlers string + Service Service + UnimplementedServerMethods string +} + +type ServiceDescData struct { + Methods string + Service Service +} + +type Method struct { + MethodName string + Service Service +} + +func genServiceDesc(g *protogen.GeneratedFile, svc *protogen.Service) { + methodsBuilder := new(strings.Builder) + methodsBuilder.WriteString("Methods: []grpc.MethodDesc{") + serviceDescMethods := genMethodTemplate(svc, grpcMethodDesc, true) + methodsBuilder.WriteString(serviceDescMethods) + methodsBuilder.WriteString("}") + methods := methodsBuilder.String() + + serviceDescBuilder := new(strings.Builder) + serviceDescT, err := template.New("serviceDesc").Parse(grpcServiceDescription) + if err != nil { + panic(err) + } + serviceDescT.Execute(serviceDescBuilder, + ServiceDescData{ + Service: currentService, + Methods: methods, + }) + g.P(serviceDescBuilder.String()) +} + +func generateFileContent(file *protogen.File, g *protogen.GeneratedFile) { + generateFileEnums(file, g) + generateFileMessages(file, g) +} + +func generateRpcFileContent(file *protogen.File, g *protogen.GeneratedFile) { + generateFileServices(file, g) +} diff --git a/protoc-gen-go-bbs/main.go b/protoc-gen-go-bbs/main.go index 6a60fd43..1b3724cd 100644 --- a/protoc-gen-go-bbs/main.go +++ b/protoc-gen-go-bbs/main.go @@ -42,6 +42,10 @@ func main() { log.Printf("Generating %s\n", file.Desc.Path()) generateFile(plugin, file) + if len(file.Services) > 0 { + generateRpcFile(plugin, file) + } + } return nil }) diff --git a/protoc-gen-go-bbs/templates.go b/protoc-gen-go-bbs/templates.go new file mode 100644 index 00000000..c2ceb06d --- /dev/null +++ b/protoc-gen-go-bbs/templates.go @@ -0,0 +1,140 @@ +package main + +var grpcImports = ` +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 +` + +var clientMethodName = ` +{{.Service.Name}}_{{.MethodName}}_FullMethodName = "/models.{{.Service.Name}}/{{.MethodName}}"` + +var grpcClient = ` +const ( + {{.ClientMethodNames}} +) +// {{.Service.Name}}Client is the client API for {{.Service.Name}} service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type {{.Service.Name}}Client interface { + {{.ClientInterfaceMethods}} +} + +type {{.Service.Name | LowerFirst}}Client struct { + cc grpc.ClientConnInterface +} + +func New{{.Service.Name}}Client(cc grpc.ClientConnInterface) {{.Service.Name}}Client { + return &{{.Service.Name | LowerFirst}}Client{cc} +} + +{{.ClientMethods}} +` + +var clientInterfaceMethod = ` +{{.MethodName}}(ctx context.Context, in *{{.MethodName}}Request, opts ...grpc.CallOption) (*{{.MethodName}}Response, error)` + +var clientMethod = ` +func (c *{{.Service.Name | LowerFirst}}Client) {{.MethodName}}(ctx context.Context, in *{{.MethodName}}Request, opts ...grpc.CallOption) (*{{.MethodName}}Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new({{.MethodName}}Response) + err := c.cc.Invoke(ctx, {{.Service.Name}}_{{.MethodName}}_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} +` + +var grpcServer = ` +type {{.Service.Name}}Server interface { + {{.ServerInterfaceMethods}} + mustEmbedUnimplemented{{.Service.Name}}Server() +} + +// Unimplemented{{.Service.Name}}Server must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type Unimplemented{{.Service.Name}}Server struct {} + +{{.UnimplementedServerMethods}} +func (Unimplemented{{.Service.Name}}Server) mustEmbedUnimplemented{{.Service.Name}}Server() {} +func (Unimplemented{{.Service.Name}}Server) testEmbeddedByValue() {} + +// Unsafe{{.Service.Name}}Server may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to {{.Service.Name}}Server will +// result in compilation errors. +type Unsafe{{.Service.Name}}Server interface { + mustEmbedUnimplemented{{.Service.Name}}Server() +} + +func Register{{.Service.Name}}Server(s grpc.ServiceRegistrar, srv {{.Service.Name}}Server) { + // If the following call panics, it indicates Unimplemented{{.Service.Name}}Server was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&{{.Service.Name}}_ServiceDesc, srv) +} + +{{.ServerHandlers}} +` + +var unimplementedServerMethod = ` +func (Unimplemented{{.Service.Name}}Server) {{.MethodName}}(context.Context, *{{.MethodName}}Request) (*{{.MethodName}}Response, error) { + return nil, status.Errorf(codes.Unimplemented, "method {{.MethodName}} not implemented") +}` + +var serverInterfaceMethod = ` +{{.MethodName}}(context.Context, *{{.MethodName}}Request) (*{{.MethodName}}Response, error)` + +var serverHandler = ` +func _{{.Service.Name}}_{{.MethodName}}_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new({{.MethodName}}Request) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.({{.Service.Name}}Server).{{.MethodName}}(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: {{.Service.Name}}_{{.MethodName}}_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.({{.Service.Name}}Server).{{.MethodName}}(ctx, req.(*{{.MethodName}}Request)) + } + return interceptor(ctx, in, info, handler) +} +` + +var grpcServiceDescription = ` +// {{.Service.Name}}_ServiceDesc is the grpc.ServiceDesc for {{.Service.Name}} service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var {{.Service.Name}}_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "models.{{.Service.Name}}", + HandlerType: (*{{.Service.Name}}Server)(nil), + {{.Methods}}, + Streams: []grpc.StreamDesc{}, + Metadata: "{{.Service.Source}}", +} +` + +var grpcMethodDesc = ` +{ + MethodName: "{{.MethodName}}", + Handler: _{{.Service.Name}}_{{.MethodName}}_Handler, +}` From ab3dffce2e146d47e26591d1993d4679a2d1b6b6 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 24 Mar 2025 15:18:40 +0000 Subject: [PATCH 145/155] Remove TypeCode_ prefix Regenerate protos --- cmd/bbs/main.go | 2 +- cmd/bbs/master_lock_test.go | 2 +- cmd/bbs/metrics_test.go | 2 +- cmd/bbs/ping_test.go | 4 +- cmd/bbs/presence_test.go | 2 +- cmd/bbs/sql_lock_test.go | 4 +- models/actions.pb.go | 250 +++++------- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 200 +++------- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 225 +++-------- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 53 +-- models/cached_dependency.pb.go | 41 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 81 ++-- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 22 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 71 ++-- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 489 +++++++----------------- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 118 ++---- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 38 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 23 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 91 ++--- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 152 ++------ models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 241 ++++-------- models/events_bbs.pb.go | 2 +- models/file.pb.go | 21 +- models/file_bbs.pb.go | 2 +- models/image_layer.pb.go | 84 ++-- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 20 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 38 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 23 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 30 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 21 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 57 +-- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 27 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 235 ++++-------- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 159 +++----- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 47 +-- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 53 +-- serviceclient/service_client.go | 2 +- serviceclient/service_client_test.go | 2 +- 62 files changed, 937 insertions(+), 2045 deletions(-) diff --git a/cmd/bbs/main.go b/cmd/bbs/main.go index 66870a5b..cdc0741a 100644 --- a/cmd/bbs/main.go +++ b/cmd/bbs/main.go @@ -222,7 +222,7 @@ func main() { lockIdentifier := &locketmodels.Resource{ Key: bbsLockKey, Owner: bbsConfig.UUID, - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, Type: locketmodels.LockType, } diff --git a/cmd/bbs/master_lock_test.go b/cmd/bbs/master_lock_test.go index 7237b993..e53cd5cb 100644 --- a/cmd/bbs/master_lock_test.go +++ b/cmd/bbs/master_lock_test.go @@ -25,7 +25,7 @@ var _ = Describe("MasterLock", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, } clock := clock.NewClock() diff --git a/cmd/bbs/metrics_test.go b/cmd/bbs/metrics_test.go index 2c3dcadf..d2dc323e 100644 --- a/cmd/bbs/metrics_test.go +++ b/cmd/bbs/metrics_test.go @@ -71,7 +71,7 @@ var _ = Describe("Metrics", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, } clock := clock.NewClock() diff --git a/cmd/bbs/ping_test.go b/cmd/bbs/ping_test.go index 4c1aaa41..7a9c7de6 100644 --- a/cmd/bbs/ping_test.go +++ b/cmd/bbs/ping_test.go @@ -30,7 +30,7 @@ var _ = Describe("Ping API", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, } clock := clock.NewClock() @@ -88,7 +88,7 @@ var _ = Describe("Ping API", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, } clock := clock.NewClock() diff --git a/cmd/bbs/presence_test.go b/cmd/bbs/presence_test.go index 6d0be2e5..9b15421a 100644 --- a/cmd/bbs/presence_test.go +++ b/cmd/bbs/presence_test.go @@ -86,7 +86,7 @@ var _ = Describe("CellPresence", func() { Key: "cell-locket", Owner: "anything", Value: string(data), - TypeCode: locketmodels.TypeCode_PRESENCE, + TypeCode: locketmodels.PRESENCE, } cellPresenceLocket = ginkgomon.Invoke( diff --git a/cmd/bbs/sql_lock_test.go b/cmd/bbs/sql_lock_test.go index c83044db..42d00d46 100644 --- a/cmd/bbs/sql_lock_test.go +++ b/cmd/bbs/sql_lock_test.go @@ -150,7 +150,7 @@ var _ = Describe("SqlLock", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, } clock := clock.NewClock() @@ -204,7 +204,7 @@ var _ = Describe("SqlLock", func() { Key: "bbs", Owner: "Your worst enemy.", Value: "Something", - TypeCode: locketmodels.TypeCode_LOCK, + TypeCode: locketmodels.LOCK, } clock := clock.NewClock() diff --git a/models/actions.pb.go b/models/actions.pb.go index d45fdbcd..0a2a0db1 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: actions.proto package models @@ -834,163 +834,95 @@ func (x *ProtoResourceLimits) GetNproc() uint64 { var File_actions_proto protoreflect.FileDescriptor -var file_actions_proto_rawDesc = string([]byte{ - 0x0a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, - 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb7, 0x04, 0x0a, 0x0b, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0f, 0x64, - 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x08, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x38, 0x0a, 0x0d, 0x75, - 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x75, - 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2f, 0x0a, 0x0a, 0x72, 0x75, 0x6e, 0x5f, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x75, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x03, 0x72, 0x75, 0x6e, 0x12, 0x3b, 0x0a, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, - 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x12, 0x4c, 0x0a, 0x14, 0x65, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x67, - 0x72, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x45, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x0d, 0x65, 0x6d, 0x69, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x2f, 0x0a, 0x0a, 0x74, 0x72, 0x79, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, - 0x72, 0x79, 0x12, 0x3e, 0x0a, 0x0f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x5f, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, - 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, - 0x65, 0x6c, 0x12, 0x38, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x5f, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x12, 0x47, 0x0a, 0x12, - 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x63, 0x6f, 0x64, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x22, 0x93, 0x02, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, - 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x12, 0x17, 0x0a, 0x04, 0x66, 0x72, 0x6f, - 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x66, 0x72, - 0x6f, 0x6d, 0x12, 0x13, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x21, 0x0a, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, - 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, - 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x75, 0x73, - 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x75, - 0x73, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, - 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, - 0x74, 0x68, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x68, 0x65, - 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x96, 0x01, 0x0a, 0x11, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x12, 0x17, 0x0a, - 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x13, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, - 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x75, - 0x73, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x22, 0x86, 0x03, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x75, - 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, - 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, - 0x61, 0x72, 0x67, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x64, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x04, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, - 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x45, 0x0a, 0x0f, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, - 0x52, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, - 0x73, 0x12, 0x17, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, - 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x35, 0x0a, 0x13, 0x73, 0x75, - 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, - 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x13, 0x73, 0x75, - 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, - 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, - 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x22, 0xb2, 0x01, - 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x2a, 0x0a, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, - 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1e, 0x0a, - 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, - 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, - 0x6d, 0x73, 0x22, 0xfd, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6d, 0x69, 0x74, - 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, - 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x0d, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2d, 0x0a, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x3b, 0x0a, 0x16, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, - 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x16, 0x66, 0x61, 0x69, 0x6c, - 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, - 0x69, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x22, 0x5d, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x72, 0x79, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x22, 0x64, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x6c, - 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, - 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x62, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, - 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x67, 0x0a, 0x16, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x22, 0x74, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x06, 0x6e, - 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x06, 0x82, 0x41, 0x03, - 0x6e, 0x69, 0x6c, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, - 0x12, 0x23, 0x0a, 0x05, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, - 0x08, 0x82, 0x41, 0x03, 0x6e, 0x69, 0x6c, 0x18, 0x01, 0x48, 0x01, 0x52, 0x05, 0x6e, 0x70, 0x72, - 0x6f, 0x63, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x6f, 0x66, 0x69, 0x6c, 0x65, - 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x70, 0x72, 0x6f, 0x63, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, - 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, - 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_actions_proto_rawDesc = "" + + "\n" + + "\ractions.proto\x12\x06models\x1a\tbbs.proto\x1a\x1benvironment_variables.proto\x1a\n" + + "file.proto\"\xb7\x04\n" + + "\vProtoAction\x12>\n" + + "\x0fdownload_action\x18\x01 \x01(\v2\x1b.models.ProtoDownloadActionR\bdownload\x128\n" + + "\rupload_action\x18\x02 \x01(\v2\x19.models.ProtoUploadActionR\x06upload\x12/\n" + + "\n" + + "run_action\x18\x03 \x01(\v2\x16.models.ProtoRunActionR\x03run\x12;\n" + + "\x0etimeout_action\x18\x04 \x01(\v2\x1a.models.ProtoTimeoutActionR\atimeout\x12L\n" + + "\x14emit_progress_action\x18\x05 \x01(\v2\x1f.models.ProtoEmitProgressActionR\remit_progress\x12/\n" + + "\n" + + "try_action\x18\x06 \x01(\v2\x16.models.ProtoTryActionR\x03try\x12>\n" + + "\x0fparallel_action\x18\a \x01(\v2\x1b.models.ProtoParallelActionR\bparallel\x128\n" + + "\rserial_action\x18\b \x01(\v2\x19.models.ProtoSerialActionR\x06serial\x12G\n" + + "\x12codependent_action\x18\t \x01(\v2\x1e.models.ProtoCodependentActionR\vcodependent\"\x93\x02\n" + + "\x13ProtoDownloadAction\x12\x1a\n" + + "\bartifact\x18\x01 \x01(\tR\bartifact\x12\x17\n" + + "\x04from\x18\x02 \x01(\tB\x03\xc0>\x01R\x04from\x12\x13\n" + + "\x02to\x18\x03 \x01(\tB\x03\xc0>\x01R\x02to\x12!\n" + + "\tcache_key\x18\x04 \x01(\tB\x03\xc0>\x01R\tcache_key\x12\x1e\n" + + "\n" + + "log_source\x18\x05 \x01(\tR\n" + + "log_source\x12\x17\n" + + "\x04user\x18\x06 \x01(\tB\x03\xc0>\x01R\x04user\x12.\n" + + "\x12checksum_algorithm\x18\a \x01(\tR\x12checksum_algorithm\x12&\n" + + "\x0echecksum_value\x18\b \x01(\tR\x0echecksum_value\"\x96\x01\n" + + "\x11ProtoUploadAction\x12\x1a\n" + + "\bartifact\x18\x01 \x01(\tR\bartifact\x12\x17\n" + + "\x04from\x18\x02 \x01(\tB\x03\xc0>\x01R\x04from\x12\x13\n" + + "\x02to\x18\x03 \x01(\tB\x03\xc0>\x01R\x02to\x12\x1e\n" + + "\n" + + "log_source\x18\x04 \x01(\tR\n" + + "log_source\x12\x17\n" + + "\x04user\x18\x05 \x01(\tB\x03\xc0>\x01R\x04user\"\x86\x03\n" + + "\x0eProtoRunAction\x12\x17\n" + + "\x04path\x18\x01 \x01(\tB\x03\xc0>\x01R\x04path\x12\x12\n" + + "\x04args\x18\x02 \x03(\tR\x04args\x12\x10\n" + + "\x03dir\x18\x03 \x01(\tR\x03dir\x122\n" + + "\x03env\x18\x04 \x03(\v2 .models.ProtoEnvironmentVariableR\x03env\x12E\n" + + "\x0fresource_limits\x18\x05 \x01(\v2\x1b.models.ProtoResourceLimitsR\x0fresource_limits\x12\x17\n" + + "\x04user\x18\x06 \x01(\tB\x03\xc0>\x01R\x04user\x12\x1e\n" + + "\n" + + "log_source\x18\a \x01(\tR\n" + + "log_source\x125\n" + + "\x13suppress_log_output\x18\b \x01(\bB\x03\xc0>\x01R\x13suppress_log_output\x12J\n" + + "\x14volume_mounted_files\x18\t \x03(\v2\x11.models.ProtoFileB\x03\xc0>\x01R\x14volume_mounted_files\"\xb2\x01\n" + + "\x12ProtoTimeoutAction\x12+\n" + + "\x06action\x18\x01 \x01(\v2\x13.models.ProtoActionR\x06action\x12*\n" + + "\x15deprecated_timeout_ns\x18\x02 \x01(\x03B\x02\x18\x01R\atimeout\x12\x1e\n" + + "\n" + + "log_source\x18\x03 \x01(\tR\n" + + "log_source\x12#\n" + + "\n" + + "timeout_ms\x18\x04 \x01(\x03B\x03\xc0>\x01R\n" + + "timeout_ms\"\xfd\x01\n" + + "\x17ProtoEmitProgressAction\x12+\n" + + "\x06action\x18\x01 \x01(\v2\x13.models.ProtoActionR\x06action\x12)\n" + + "\rstart_message\x18\x02 \x01(\tB\x03\xc0>\x01R\rstart_message\x12-\n" + + "\x0fsuccess_message\x18\x03 \x01(\tB\x03\xc0>\x01R\x0fsuccess_message\x12;\n" + + "\x16failure_message_prefix\x18\x04 \x01(\tB\x03\xc0>\x01R\x16failure_message_prefix\x12\x1e\n" + + "\n" + + "log_source\x18\x05 \x01(\tR\n" + + "log_source\"]\n" + + "\x0eProtoTryAction\x12+\n" + + "\x06action\x18\x01 \x01(\v2\x13.models.ProtoActionR\x06action\x12\x1e\n" + + "\n" + + "log_source\x18\x02 \x01(\tR\n" + + "log_source\"d\n" + + "\x13ProtoParallelAction\x12-\n" + + "\aactions\x18\x01 \x03(\v2\x13.models.ProtoActionR\aactions\x12\x1e\n" + + "\n" + + "log_source\x18\x02 \x01(\tR\n" + + "log_source\"b\n" + + "\x11ProtoSerialAction\x12-\n" + + "\aactions\x18\x01 \x03(\v2\x13.models.ProtoActionR\aactions\x12\x1e\n" + + "\n" + + "log_source\x18\x02 \x01(\tR\n" + + "log_source\"g\n" + + "\x16ProtoCodependentAction\x12-\n" + + "\aactions\x18\x01 \x03(\v2\x13.models.ProtoActionR\aactions\x12\x1e\n" + + "\n" + + "log_source\x18\x02 \x01(\tR\n" + + "log_source\"t\n" + + "\x13ProtoResourceLimits\x12#\n" + + "\x06nofile\x18\x01 \x01(\x04B\x06\x82A\x03nilH\x00R\x06nofile\x88\x01\x01\x12#\n" + + "\x05nproc\x18\x02 \x01(\x04B\b\x82A\x03nil\x18\x01H\x01R\x05nproc\x88\x01\x01B\t\n" + + "\a_nofileB\b\n" + + "\x06_nprocB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_actions_proto_rawDescOnce sync.Once diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 3f3e312b..0be1d0a1 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 54227f3a..d141cf09 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: actual_lrp.proto package models @@ -614,144 +614,64 @@ func (x *ProtoActualLRP) GetAvailabilityZone() string { var File_actual_lrp_proto protoreflect.FileDescriptor -var file_actual_lrp_proto_rawDesc = string([]byte{ - 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85, 0x01, - 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x32, 0x0a, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, - 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x0a, 0x65, 0x76, 0x61, - 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x65, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, - 0x67, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xda, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, - 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x2b, 0x0a, 0x0e, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, - 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x3f, 0x0a, 0x18, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x18, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x6c, 0x73, - 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x35, 0x0a, 0x13, 0x68, - 0x6f, 0x73, 0x74, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, - 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x13, 0x68, - 0x6f, 0x73, 0x74, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x70, 0x6f, - 0x72, 0x74, 0x22, 0x74, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, - 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x12, 0x19, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1b, 0x0a, 0x06, 0x64, - 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x65, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, - 0x86, 0x03, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x07, 0x61, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, - 0x67, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x2a, 0x0a, - 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x61, 0x0a, 0x11, 0x70, 0x72, 0x65, - 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, - 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x70, 0x72, 0x65, 0x66, 0x65, - 0x72, 0x72, 0x65, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x89, 0x01, 0x0a, - 0x10, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x27, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x1a, 0x1a, - 0x82, 0x7d, 0x17, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x29, 0x0a, 0x08, 0x49, 0x4e, - 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x01, 0x1a, 0x1b, 0x82, 0x7d, 0x18, 0x50, 0x72, 0x65, - 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, 0x10, 0x02, 0x1a, - 0x17, 0x82, 0x7d, 0x14, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x72, 0x65, 0x64, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x48, 0x6f, 0x73, 0x74, 0x22, 0x3e, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, - 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xfb, 0x07, 0x0a, 0x0e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x12, 0x47, 0x0a, 0x0e, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x06, - 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, - 0x70, 0x4b, 0x65, 0x79, 0x12, 0x60, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, - 0x52, 0x14, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x54, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, - 0x66, 0x6f, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x25, 0x0a, 0x0b, - 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, - 0x73, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, - 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, 0x74, 0x61, - 0x74, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x05, - 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, - 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x65, - 0x73, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x4c, 0x52, 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x70, 0x72, - 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, - 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x72, 0x70, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x12, 0x24, 0x0a, 0x08, 0x72, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x48, 0x00, 0x52, 0x08, 0x72, 0x6f, 0x75, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, - 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x0e, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5d, 0x0a, 0x08, 0x50, 0x72, - 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, - 0x52, 0x59, 0x10, 0x00, 0x1a, 0x0b, 0x82, 0x7d, 0x08, 0x4f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x72, - 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x45, 0x56, 0x41, 0x43, 0x55, 0x41, 0x54, 0x49, 0x4e, 0x47, 0x10, - 0x01, 0x1a, 0x0d, 0x82, 0x7d, 0x0a, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, - 0x12, 0x17, 0x0a, 0x07, 0x53, 0x55, 0x53, 0x50, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x0a, 0x82, - 0x7d, 0x07, 0x53, 0x75, 0x73, 0x70, 0x65, 0x63, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x72, 0x6f, - 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, - 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, - 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, -}) +const file_actual_lrp_proto_rawDesc = "" + + "\n" + + "\x10actual_lrp.proto\x12\x06models\x1a\tbbs.proto\x1a\x16modification_tag.proto\"\x85\x01\n" + + "\x13ProtoActualLRPGroup\x122\n" + + "\binstance\x18\x01 \x01(\v2\x16.models.ProtoActualLRPR\binstance\x126\n" + + "\n" + + "evacuating\x18\x02 \x01(\v2\x16.models.ProtoActualLRPR\n" + + "evacuating:\x02\x18\x01\"\xda\x01\n" + + "\x10ProtoPortMapping\x12+\n" + + "\x0econtainer_port\x18\x01 \x01(\rB\x03\xc0>\x01R\x0econtainer_port\x12!\n" + + "\thost_port\x18\x02 \x01(\rB\x03\xc0>\x01R\thost_port\x12?\n" + + "\x18container_tls_proxy_port\x18\x03 \x01(\rB\x03\xc0>\x01R\x18container_tls_proxy_port\x125\n" + + "\x13host_tls_proxy_port\x18\x04 \x01(\rB\x03\xc0>\x01R\x13host_tls_proxy_port\"t\n" + + "\x11ProtoActualLRPKey\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x12\x19\n" + + "\x05index\x18\x02 \x01(\x05B\x03\xc0>\x01R\x05index\x12\x1b\n" + + "\x06domain\x18\x03 \x01(\tB\x03\xc0>\x01R\x06domain\"e\n" + + "\x19ProtoActualLRPInstanceKey\x12)\n" + + "\rinstance_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\rinstance_guid\x12\x1d\n" + + "\acell_id\x18\x02 \x01(\tB\x03\xc0>\x01R\acell_id\"\x86\x03\n" + + "\x15ProtoActualLRPNetInfo\x12\x1d\n" + + "\aaddress\x18\x01 \x01(\tB\x03\xc0>\x01R\aaddress\x123\n" + + "\x05ports\x18\x02 \x03(\v2\x18.models.ProtoPortMappingB\x03\xc0>\x01R\x05ports\x12*\n" + + "\x10instance_address\x18\x03 \x01(\tR\x10instance_address\x12a\n" + + "\x11preferred_address\x18\x04 \x01(\x0e2..models.ProtoActualLRPNetInfo.PreferredAddressB\x03\xc0>\x01R\x11preferred_address\"\x89\x01\n" + + "\x10PreferredAddress\x12'\n" + + "\aUNKNOWN\x10\x00\x1a\x1a\x82}\x17PreferredAddressUnknown\x12)\n" + + "\bINSTANCE\x10\x01\x1a\x1b\x82}\x18PreferredAddressInstance\x12!\n" + + "\x04HOST\x10\x02\x1a\x17\x82}\x14PreferredAddressHost\">\n" + + "\x1bProtoActualLRPInternalRoute\x12\x1f\n" + + "\bhostname\x18\x01 \x01(\tB\x03\xc0>\x01R\bhostname\"\xfb\a\n" + + "\x0eProtoActualLRP\x12G\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyB\x06\xc0>\x01\x90?\x01R\factualLrpKey\x12`\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyB\x06\xc0>\x01\x90?\x01R\x14actualLrpInstanceKey\x12T\n" + + "\x13actual_lrp_net_info\x18\x03 \x01(\v2\x1d.models.ProtoActualLRPNetInfoB\x06\xc0>\x01\x90?\x01R\x10actualLrpNetInfo\x12%\n" + + "\vcrash_count\x18\x04 \x01(\x05B\x03\xc0>\x01R\vcrash_count\x12\"\n" + + "\fcrash_reason\x18\x05 \x01(\tR\fcrash_reason\x12\x19\n" + + "\x05state\x18\x06 \x01(\tB\x03\xc0>\x01R\x05state\x12(\n" + + "\x0fplacement_error\x18\a \x01(\tR\x0fplacement_error\x12\x19\n" + + "\x05since\x18\b \x01(\x03B\x03\xc0>\x01R\x05since\x12P\n" + + "\x10modification_tag\x18\t \x01(\v2\x1c.models.ProtoModificationTagB\x06\xc0>\x01\x90?\x01R\x10modification_tag\x12;\n" + + "\bpresence\x18\n" + + " \x01(\x0e2\x1f.models.ProtoActualLRP.PresenceR\bpresence\x12`\n" + + "\x1aactual_lrp_internal_routes\x18\v \x03(\v2#.models.ProtoActualLRPInternalRouteR\x17actualLrpInternalRoutes\x12H\n" + + "\vmetric_tags\x18\f \x03(\v2&.models.ProtoActualLRP.MetricTagsEntryR\vmetric_tags\x12$\n" + + "\broutable\x18\r \x01(\bB\x03\xc0>\x01H\x00R\broutable\x88\x01\x01\x121\n" + + "\x11availability_zone\x18\x0e \x01(\tB\x03\xc0>\x01R\x11availability_zone\x1a=\n" + + "\x0fMetricTagsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"]\n" + + "\bPresence\x12\x19\n" + + "\bORDINARY\x10\x00\x1a\v\x82}\bOrdinary\x12\x1d\n" + + "\n" + + "EVACUATING\x10\x01\x1a\r\x82}\n" + + "Evacuating\x12\x17\n" + + "\aSUSPECT\x10\x02\x1a\n" + + "\x82}\aSuspectB\v\n" + + "\t_routableB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_actual_lrp_proto_rawDescOnce sync.Once diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 303cfbc4..08996002 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index f7727ddf..249f2cc0 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: actual_lrp_requests.proto package models @@ -812,170 +812,63 @@ func (x *ProtoActualLRPsRequest) GetIndex() int32 { var File_actual_lrp_requests_proto protoreflect.FileDescriptor -var file_actual_lrp_requests_proto_rawDesc = string([]byte{ - 0x0a, 0x19, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4b, 0x0a, - 0x1f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4c, - 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, - 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x97, 0x01, 0x0a, 0x1c, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, - 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x49, 0x0a, 0x11, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x11, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, - 0x3a, 0x02, 0x18, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x47, - 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x5d, 0x0a, 0x1b, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, - 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x57, 0x0a, 0x28, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x73, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x3a, - 0x02, 0x18, 0x01, 0x22, 0x79, 0x0a, 0x2f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x41, 0x6e, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, - 0x19, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xbd, - 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xe8, - 0x04, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, - 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, - 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, - 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x4f, 0x0a, - 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, - 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x63, - 0x0a, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x12, 0x54, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x52, 0x6f, 0x75, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x52, - 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x11, 0x61, 0x76, - 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x61, 0x76, 0x61, 0x69, - 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x1a, 0x3d, 0x0a, - 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x0b, 0x0a, 0x09, - 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xe7, 0x01, 0x0a, 0x1a, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x43, 0x72, 0x61, 0x73, 0x68, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, - 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x22, 0x89, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x61, 0x69, - 0x6c, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, - 0x60, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, - 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, - 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, - 0x79, 0x22, 0xbe, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, - 0x65, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, - 0x65, 0x79, 0x22, 0x7d, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, - 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, - 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x38, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, - 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, - 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x12, 0x1e, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x48, 0x00, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x88, 0x01, - 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_actual_lrp_requests_proto_rawDesc = "" + + "\n" + + "\x19actual_lrp_requests.proto\x12\x06models\x1a\tbbs.proto\x1a\x10actual_lrp.proto\x1a\verror.proto\"K\n" + + "\x1fProtoActualLRPLifecycleResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\"\x97\x01\n" + + "\x1cProtoActualLRPGroupsResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12I\n" + + "\x11actual_lrp_groups\x18\x02 \x03(\v2\x1b.models.ProtoActualLRPGroupR\x11actual_lrp_groups:\x02\x18\x01\"\x94\x01\n" + + "\x1bProtoActualLRPGroupResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12G\n" + + "\x10actual_lrp_group\x18\x02 \x01(\v2\x1b.models.ProtoActualLRPGroupR\x10actual_lrp_group:\x02\x18\x01\"]\n" + + "\x1bProtoActualLRPGroupsRequest\x12\x1b\n" + + "\x06domain\x18\x01 \x01(\tB\x03\xc0>\x01R\x06domain\x12\x1d\n" + + "\acell_id\x18\x02 \x01(\tB\x03\xc0>\x01R\acell_id:\x02\x18\x01\"W\n" + + "(ProtoActualLRPGroupsByProcessGuidRequest\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid:\x02\x18\x01\"y\n" + + "/ProtoActualLRPGroupByProcessGuidAndIndexRequest\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x12\x19\n" + + "\x05index\x18\x02 \x01(\x05B\x03\xc0>\x01R\x05index:\x02\x18\x01\"\xbd\x01\n" + + "\x1aProtoClaimActualLRPRequest\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x12\x19\n" + + "\x05index\x18\x02 \x01(\x05B\x03\xc0>\x01R\x05index\x12[\n" + + "\x17actual_lrp_instance_key\x18\x03 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\"\xe8\x04\n" + + "\x1aProtoStartActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12[\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\x12O\n" + + "\x13actual_lrp_net_info\x18\x03 \x01(\v2\x1d.models.ProtoActualLRPNetInfoR\x13actual_lrp_net_info\x12c\n" + + "\x1aactual_lrp_internal_routes\x18\x04 \x03(\v2#.models.ProtoActualLRPInternalRouteR\x1aactual_lrp_internal_routes\x12T\n" + + "\vmetric_tags\x18\x05 \x03(\v22.models.ProtoStartActualLRPRequest.MetricTagsEntryR\vmetric_tags\x12\x1f\n" + + "\bRoutable\x18\x06 \x01(\bH\x00R\bRoutable\x88\x01\x01\x121\n" + + "\x11availability_zone\x18\a \x01(\tB\x03\xc0>\x01R\x11availability_zone\x1a=\n" + + "\x0fMetricTagsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\v\n" + + "\t_Routable\"\xe7\x01\n" + + "\x1aProtoCrashActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12[\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\x12)\n" + + "\rerror_message\x18\x03 \x01(\tB\x03\xc0>\x01R\rerror_message\"\x89\x01\n" + + "\x19ProtoFailActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12)\n" + + "\rerror_message\x18\x02 \x01(\tB\x03\xc0>\x01R\rerror_message\"`\n" + + "\x1bProtoRetireActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\"\xbe\x01\n" + + "\x1bProtoRemoveActualLRPRequest\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x12\x19\n" + + "\x05index\x18\x02 \x01(\x05B\x03\xc0>\x01R\x05index\x12[\n" + + "\x17actual_lrp_instance_key\x18\x03 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\"}\n" + + "\x17ProtoActualLRPsResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x128\n" + + "\vactual_lrps\x18\x02 \x03(\v2\x16.models.ProtoActualLRPR\vactual_lrps\"\xa7\x01\n" + + "\x16ProtoActualLRPsRequest\x12\x1b\n" + + "\x06domain\x18\x01 \x01(\tB\x03\xc0>\x01R\x06domain\x12\x1d\n" + + "\acell_id\x18\x02 \x01(\tB\x03\xc0>\x01R\acell_id\x12'\n" + + "\fprocess_guid\x18\x03 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x12\x1e\n" + + "\x05index\x18\x04 \x01(\x05B\x03\xc0>\x01H\x00R\x05index\x88\x01\x01B\b\n" + + "\x06_indexB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_actual_lrp_requests_proto_rawDescOnce sync.Once diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 06cecc4f..0764cdca 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index d3efa60d..6b76ca11 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: bbs.proto package models @@ -94,45 +94,16 @@ var ( var File_bbs_proto protoreflect.FileDescriptor -var file_bbs_proto_rawDesc = string([]byte{ - 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, - 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x3a, 0x52, 0x0a, 0x14, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x61, - 0x6c, 0x77, 0x61, 0x79, 0x73, 0x5f, 0x65, 0x6d, 0x69, 0x74, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, - 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x11, 0x62, 0x62, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x45, - 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, 0x5f, 0x62, 0x79, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x62, 0x62, - 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, 0x0a, 0x16, 0x62, - 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, - 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x62, 0x62, 0x73, - 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, 0x75, 0x61, 0x6c, - 0x88, 0x01, 0x01, 0x3a, 0x49, 0x0a, 0x0f, 0x62, 0x62, 0x73, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x62, - 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x4d, - 0x0a, 0x11, 0x62, 0x62, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x18, 0x90, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x62, 0x62, 0x73, 0x44, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, - 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, - 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, - 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, - 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_bbs_proto_rawDesc = "" + + "\n" + + "\tbbs.proto\x12\x03bbs\x1a google/protobuf/descriptor.proto:R\n" + + "\x14bbs_json_always_emit\x12\x1d.google.protobuf.FieldOptions\x18\xe8\a \x01(\bR\x11bbsJsonAlwaysEmit\x88\x01\x01:C\n" + + "\fbbs_by_value\x12\x1d.google.protobuf.FieldOptions\x18\xf2\a \x01(\bR\n" + + "bbsByValue\x88\x01\x01:V\n" + + "\x16bbs_exclude_from_equal\x12\x1d.google.protobuf.FieldOptions\x18\xfc\a \x01(\bR\x13bbsExcludeFromEqual\x88\x01\x01:I\n" + + "\x0fbbs_custom_type\x12\x1d.google.protobuf.FieldOptions\x18\x86\b \x01(\tR\rbbsCustomType\x88\x01\x01:M\n" + + "\x11bbs_default_value\x12\x1d.google.protobuf.FieldOptions\x18\x90\b \x01(\tR\x0fbbsDefaultValue\x88\x01\x01:_\n" + + "\x18bbs_enumvalue_customname\x12!.google.protobuf.EnumValueOptions\x18\xd0\x0f \x01(\tR\x16bbsEnumvalueCustomname\x88\x01\x01B\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var file_bbs_proto_goTypes = []any{ (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 64f20cde..731e2822 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: cached_dependency.proto package models @@ -115,30 +115,19 @@ func (x *ProtoCachedDependency) GetChecksumValue() string { var File_cached_dependency_proto protoreflect.FileDescriptor -var file_cached_dependency_proto_rawDesc = string([]byte{ - 0x0a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, - 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, - 0x17, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x13, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x21, 0x0a, - 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x6b, 0x65, 0x79, - 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, - 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x12, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x61, 0x6c, 0x67, 0x6f, - 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, - 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x22, 0x5a, - 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, - 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_cached_dependency_proto_rawDesc = "" + + "\n" + + "\x17cached_dependency.proto\x12\x06models\x1a\tbbs.proto\"\xfe\x01\n" + + "\x15ProtoCachedDependency\x12\x17\n" + + "\x04name\x18\x01 \x01(\tB\x03\xc0>\x01R\x04name\x12\x17\n" + + "\x04from\x18\x02 \x01(\tB\x03\xc0>\x01R\x04from\x12\x13\n" + + "\x02to\x18\x03 \x01(\tB\x03\xc0>\x01R\x02to\x12!\n" + + "\tcache_key\x18\x04 \x01(\tB\x03\xc0>\x01R\tcache_key\x12#\n" + + "\n" + + "log_source\x18\x05 \x01(\tB\x03\xc0>\x01R\n" + + "log_source\x12.\n" + + "\x12checksum_algorithm\x18\x06 \x01(\tR\x12checksum_algorithm\x12&\n" + + "\x0echecksum_value\x18\a \x01(\tR\x0echecksum_valueB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_cached_dependency_proto_rawDescOnce sync.Once diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 31a6f6c7..f97b4fce 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index 8d47cfe5..af6e1356 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: cells.proto package models @@ -287,57 +287,32 @@ func (x *ProtoCellsResponse) GetCells() []*ProtoCellPresence { var File_cells_proto protoreflect.FileDescriptor -var file_cells_proto_rawDesc = string([]byte{ - 0x0a, 0x0b, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7a, 0x0a, - 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, - 0x74, 0x79, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, - 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, - 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, - 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x22, 0xf1, 0x02, 0x0a, 0x11, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, - 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x25, - 0x0a, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x72, 0x65, 0x70, 0x5f, 0x61, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x12, 0x35, - 0x0a, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x65, 0x6c, 0x6c, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x52, 0x08, 0x63, 0x61, 0x70, - 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x45, 0x0a, 0x10, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, - 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, - 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x14, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x5f, 0x70, - 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0e, - 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x12, 0x38, 0x0a, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, - 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, - 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, - 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1d, - 0x0a, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x72, 0x65, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x22, 0x48, 0x0a, - 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x17, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, - 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, - 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2f, 0x0a, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x6c, 0x6c, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, - 0x65, 0x52, 0x05, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, - 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, - 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, -}) +const file_cells_proto_rawDesc = "" + + "\n" + + "\vcells.proto\x12\x06models\x1a\tbbs.proto\x1a\verror.proto\"z\n" + + "\x11ProtoCellCapacity\x12!\n" + + "\tmemory_mb\x18\x01 \x01(\x05B\x03\xc0>\x01R\tmemory_mb\x12\x1d\n" + + "\adisk_mb\x18\x02 \x01(\x05B\x03\xc0>\x01R\adisk_mb\x12#\n" + + "\n" + + "containers\x18\x03 \x01(\x05B\x03\xc0>\x01R\n" + + "containers\"\xf1\x02\n" + + "\x11ProtoCellPresence\x12\x1d\n" + + "\acell_id\x18\x01 \x01(\tB\x03\xc0>\x01R\acell_id\x12%\n" + + "\vrep_address\x18\x02 \x01(\tB\x03\xc0>\x01R\vrep_address\x12\x17\n" + + "\x04zone\x18\x03 \x01(\tB\x03\xc0>\x01R\x04zone\x125\n" + + "\bcapacity\x18\x04 \x01(\v2\x19.models.ProtoCellCapacityR\bcapacity\x12E\n" + + "\x10rootfs_providers\x18\x05 \x03(\v2\x15.models.ProtoProviderR\x14rootfs_provider_list\x12&\n" + + "\x0eplacement_tags\x18\x06 \x03(\tR\x0eplacement_tags\x128\n" + + "\x17optional_placement_tags\x18\a \x03(\tR\x17optional_placement_tags\x12\x1d\n" + + "\arep_url\x18\b \x01(\tB\x03\xc0>\x01R\arep_url\"H\n" + + "\rProtoProvider\x12\x17\n" + + "\x04name\x18\x01 \x01(\tB\x03\xc0>\x01R\x04name\x12\x1e\n" + + "\n" + + "properties\x18\x02 \x03(\tR\n" + + "properties\"o\n" + + "\x12ProtoCellsResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12/\n" + + "\x05cells\x18\x02 \x03(\v2\x19.models.ProtoCellPresenceR\x05cellsB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_cells_proto_rawDescOnce sync.Once diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index c07769d4..33b585ad 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index ed95742b..37c83b47 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: certificate_properties.proto package models @@ -67,19 +67,11 @@ func (x *ProtoCertificateProperties) GetOrganizationalUnit() []string { var File_certificate_properties_proto protoreflect.FileDescriptor -var file_certificate_properties_proto_rawDesc = string([]byte{ - 0x0a, 0x1c, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x4e, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x13, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, - 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, - 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, - 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, -}) +const file_certificate_properties_proto_rawDesc = "" + + "\n" + + "\x1ccertificate_properties.proto\x12\x06models\"N\n" + + "\x1aProtoCertificateProperties\x120\n" + + "\x13organizational_unit\x18\x01 \x03(\tR\x13organizational_unitB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_certificate_properties_proto_rawDescOnce sync.Once diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index a2ca156e..31c1ac27 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index b50e80b4..fea5994f 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: check_definition.proto package models @@ -265,49 +265,30 @@ func (x *ProtoHTTPCheck) GetIntervalMs() uint64 { var File_check_definition_proto protoreflect.FileDescriptor -var file_check_definition_proto_rawDesc = string([]byte{ - 0x0a, 0x16, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7, 0x01, 0x0a, 0x14, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x06, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, - 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x10, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, - 0x73, 0x73, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x52, 0x10, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0x79, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x12, 0x33, 0x0a, 0x09, 0x74, 0x63, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x09, 0x74, - 0x63, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x36, 0x0a, 0x0a, 0x68, 0x74, 0x74, 0x70, - 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, - 0x68, 0x65, 0x63, 0x6b, 0x52, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x22, 0x7a, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, - 0x6b, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x6f, - 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, 0x22, 0x94, 0x01, 0x0a, - 0x0e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, - 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, - 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x73, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, - 0x5f, 0x6d, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, - 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, - 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_check_definition_proto_rawDesc = "" + + "\n" + + "\x16check_definition.proto\x12\x06models\x1a\tbbs.proto\"\xa7\x01\n" + + "\x14ProtoCheckDefinition\x12*\n" + + "\x06checks\x18\x01 \x03(\v2\x12.models.ProtoCheckR\x06checks\x12#\n" + + "\n" + + "log_source\x18\x02 \x01(\tB\x03\xc0>\x01R\n" + + "log_source\x12>\n" + + "\x10readiness_checks\x18\x03 \x03(\v2\x12.models.ProtoCheckR\x10readiness_checks\"y\n" + + "\n" + + "ProtoCheck\x123\n" + + "\ttcp_check\x18\x01 \x01(\v2\x15.models.ProtoTCPCheckR\ttcp_check\x126\n" + + "\n" + + "http_check\x18\x02 \x01(\v2\x16.models.ProtoHTTPCheckR\n" + + "http_check\"z\n" + + "\rProtoTCPCheck\x12\x17\n" + + "\x04port\x18\x01 \x01(\rB\x03\xc0>\x01R\x04port\x12.\n" + + "\x12connect_timeout_ms\x18\x02 \x01(\x04R\x12connect_timeout_ms\x12 \n" + + "\vinterval_ms\x18\x03 \x01(\x04R\vinterval_ms\"\x94\x01\n" + + "\x0eProtoHTTPCheck\x12\x17\n" + + "\x04port\x18\x01 \x01(\rB\x03\xc0>\x01R\x04port\x12.\n" + + "\x12request_timeout_ms\x18\x02 \x01(\x04R\x12request_timeout_ms\x12\x17\n" + + "\x04path\x18\x03 \x01(\tB\x03\xc0>\x01R\x04path\x12 \n" + + "\vinterval_ms\x18\x04 \x01(\x04R\vinterval_msB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_check_definition_proto_rawDescOnce sync.Once diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 2f92916c..0a84ed9b 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index e45b1bd5..4882f305 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: desired_lrp.proto package models @@ -978,353 +978,144 @@ func (x *ProtoDesiredLRP) GetVolumeMountedFiles() []*ProtoFile { var File_desired_lrp_proto protoreflect.FileDescriptor -var file_desired_lrp_proto_rawDesc = string([]byte{ - 0x0a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x0d, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, - 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x65, 0x6e, - 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, - 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x63, 0x68, 0x65, 0x63, - 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, - 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, - 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, - 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x66, - 0x69, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x87, 0x04, 0x0a, 0x1d, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, - 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4c, 0x0a, 0x0f, 0x64, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, - 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, - 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x73, 0x12, 0x5b, 0x0a, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x14, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x30, - 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x74, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, - 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, - 0x61, 0x67, 0x12, 0x48, 0x0a, 0x10, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, - 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x76, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0d, - 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x08, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x22, 0xcf, 0x0d, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4c, - 0x0a, 0x0f, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x4c, 0x0a, 0x15, - 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, - 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, - 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x06, 0xc0, - 0x3e, 0x01, 0x90, 0x3f, 0x00, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, - 0x74, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, - 0x73, 0x65, 0x74, 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, - 0x72, 0x12, 0x35, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x23, 0x0a, - 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, - 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x47, 0x0a, 0x0c, - 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, - 0x6c, 0x65, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, - 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, - 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x29, 0x0a, 0x0c, 0x6d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, - 0x5f, 0x61, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x4e, 0x0a, 0x13, 0x63, 0x61, - 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, - 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x12, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, - 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, - 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, - 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, - 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, - 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, - 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, - 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, - 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, - 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, - 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2f, - 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, - 0x6d, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, 0x12, - 0x5f, 0x0a, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x22, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, - 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x12, 0x48, 0x0a, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, - 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, - 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x54, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x75, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4d, 0x65, 0x74, - 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x02, 0x18, 0x01, - 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x30, 0x0a, - 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, - 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x12, - 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, - 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, - 0x69, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, - 0x69, 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, - 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, 0x5a, - 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x81, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x1a, 0x39, - 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xeb, 0x02, 0x0a, 0x15, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, - 0x48, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, - 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x02, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, - 0x01, 0x01, 0x12, 0x4f, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, - 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, - 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x09, 0x0a, - 0x07, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7b, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, - 0x61, 0x69, 0x6e, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, - 0x5f, 0x6d, 0x62, 0x12, 0x1d, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, - 0x6d, 0x62, 0x12, 0x1c, 0x0a, 0x07, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, - 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, - 0x73, 0x22, 0xae, 0x10, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, - 0x65, 0x64, 0x4c, 0x52, 0x50, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, - 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, - 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x07, 0x72, - 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x09, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x49, 0x0a, 0x15, - 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, - 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, - 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x65, 0x74, 0x75, 0x70, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73, 0x65, 0x74, - 0x75, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x2f, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x5f, 0x6d, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x73, - 0x12, 0x3d, 0x0a, 0x1a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, - 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x73, 0x12, - 0x2d, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x12, 0x1d, - 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x21, 0x0a, - 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, - 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, - 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, - 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x05, 0x70, 0x6f, - 0x72, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, 0x70, - 0x6f, 0x72, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x0f, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x03, 0x90, 0x3f, 0x00, 0x48, 0x00, - 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x6c, - 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x12, 0x29, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x42, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x52, 0x0c, - 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, - 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, - 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, - 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x52, 0x10, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, - 0x4f, 0x0a, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, - 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, - 0x12, 0x36, 0x0a, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, - 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, - 0x18, 0x01, 0x52, 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, - 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, - 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x18, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, - 0x70, 0x61, 0x74, 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, - 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, - 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x54, 0x61, 0x67, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5f, 0x0a, 0x16, - 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x48, 0x01, 0x52, 0x16, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x26, 0x0a, - 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x48, 0x0a, - 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, - 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, - 0x79, 0x65, 0x72, 0x73, 0x12, 0x49, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, - 0x30, 0x0a, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x73, 0x18, 0x24, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x52, 0x08, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, - 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, - 0x6d, 0x69, 0x74, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, - 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, - 0x69, 0x6d, 0x69, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x26, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, - 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, - 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x65, 0x72, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, - 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_desired_lrp_proto_rawDesc = "" + + "\n" + + "\x11desired_lrp.proto\x12\x06models\x1a\ractions.proto\x1a\tbbs.proto\x1a\x17cached_dependency.proto\x1a\x1ccertificate_properties.proto\x1a\x1benvironment_variables.proto\x1a\x16modification_tag.proto\x1a\rnetwork.proto\x1a\x14security_group.proto\x1a\x12volume_mount.proto\x1a\x16check_definition.proto\x1a\x11image_layer.proto\x1a\x11metric_tags.proto\x1a\rsidecar.proto\x1a\x14log_rate_limit.proto\x1a\n" + + "file.proto\"\x87\x04\n" + + "\x1dProtoDesiredLRPSchedulingInfo\x12L\n" + + "\x0fdesired_lrp_key\x18\x01 \x01(\v2\x1a.models.ProtoDesiredLRPKeyB\x06\xc0>\x01\x90?\x01R\x0fdesired_lrp_key\x12#\n" + + "\n" + + "annotation\x18\x02 \x01(\tB\x03\xc0>\x01R\n" + + "annotation\x12!\n" + + "\tinstances\x18\x03 \x01(\x05B\x03\xc0>\x01R\tinstances\x12[\n" + + "\x14desired_lrp_resource\x18\x04 \x01(\v2\x1f.models.ProtoDesiredLRPResourceB\x06\xc0>\x01\x90?\x01R\x14desired_lrp_resource\x120\n" + + "\x06routes\x18\x05 \x01(\v2\x13.models.ProtoRoutesB\x03\x90?\x00R\x06routes\x12P\n" + + "\x10modification_tag\x18\x06 \x01(\v2\x1c.models.ProtoModificationTagB\x06\xc0>\x01\x90?\x01R\x10modification_tag\x12H\n" + + "\x10volume_placement\x18\a \x01(\v2\x1c.models.ProtoVolumePlacementR\x10volume_placement\x12%\n" + + "\rPlacementTags\x18\b \x03(\tR\x0eplacement_tags\"\xcf\r\n" + + "\x16ProtoDesiredLRPRunInfo\x12L\n" + + "\x0fdesired_lrp_key\x18\x01 \x01(\v2\x1a.models.ProtoDesiredLRPKeyB\x06\xc0>\x01\x90?\x01R\x0fdesired_lrp_key\x12L\n" + + "\x15environment_variables\x18\x02 \x03(\v2 .models.ProtoEnvironmentVariableB\x06\xc0>\x01\x90?\x00R\x03env\x12)\n" + + "\x05setup\x18\x03 \x01(\v2\x13.models.ProtoActionR\x05setup\x12+\n" + + "\x06action\x18\x04 \x01(\v2\x13.models.ProtoActionR\x06action\x12-\n" + + "\amonitor\x18\x05 \x01(\v2\x13.models.ProtoActionR\amonitor\x125\n" + + "\x1adeprecated_start_timeout_s\x18\x06 \x01(\rB\x02\x18\x01R\rstart_timeout\x12#\n" + + "\n" + + "privileged\x18\a \x01(\bB\x03\xc0>\x01R\n" + + "privileged\x12#\n" + + "\n" + + "cpu_weight\x18\b \x01(\rB\x03\xc0>\x01R\n" + + "cpu_weight\x12\x18\n" + + "\x05ports\x18\t \x03(\rB\x02\x10\x00R\x05ports\x12G\n" + + "\fegress_rules\x18\n" + + " \x03(\v2\x1e.models.ProtoSecurityGroupRuleB\x03\x90?\x00R\fegress_rules\x12#\n" + + "\n" + + "log_source\x18\v \x01(\tB\x03\xc0>\x01R\n" + + "log_source\x12)\n" + + "\fmetrics_guid\x18\f \x01(\tB\x05\xc0>\x01\x18\x01R\fmetrics_guid\x12#\n" + + "\n" + + "created_at\x18\r \x01(\x03B\x03\xc0>\x01R\n" + + "created_at\x12N\n" + + "\x13cached_dependencies\x18\x0e \x03(\v2\x1d.models.ProtoCachedDependencyR\x12cachedDependencies\x126\n" + + "\x14legacy_download_user\x18\x0f \x01(\tB\x02\x18\x01R\x14legacy_download_user\x12J\n" + + " trusted_system_certificates_path\x18\x10 \x01(\tR trusted_system_certificates_path\x12>\n" + + "\rvolume_mounts\x18\x11 \x03(\v2\x18.models.ProtoVolumeMountR\rvolume_mounts\x12.\n" + + "\anetwork\x18\x12 \x01(\v2\x14.models.ProtoNetworkR\anetwork\x12/\n" + + "\x10start_timeout_ms\x18\x13 \x01(\x03B\x03\xc0>\x01R\x10start_timeout_ms\x12_\n" + + "\x16certificate_properties\x18\x14 \x01(\v2\".models.ProtoCertificatePropertiesH\x00R\x16certificate_properties\x88\x01\x01\x12&\n" + + "\x0eimage_username\x18\x15 \x01(\tR\x0eimage_username\x12&\n" + + "\x0eimage_password\x18\x16 \x01(\tR\x0eimage_password\x12H\n" + + "\x10check_definition\x18\x17 \x01(\v2\x1c.models.ProtoCheckDefinitionR\x10check_definition\x12;\n" + + "\fimage_layers\x18\x18 \x03(\v2\x17.models.ProtoImageLayerR\fimage_layers\x12T\n" + + "\vmetric_tags\x18\x19 \x03(\v2..models.ProtoDesiredLRPRunInfo.MetricTagsEntryB\x02\x18\x01R\vmetric_tags\x120\n" + + "\bsidecars\x18\x1a \x03(\v2\x14.models.ProtoSidecarR\bsidecars\x12A\n" + + "\x0elog_rate_limit\x18\x1b \x01(\v2\x19.models.ProtoLogRateLimitR\x0elog_rate_limit\x12J\n" + + "\x14volume_mounted_files\x18\x1c \x03(\v2\x11.models.ProtoFileB\x03\xc0>\x01R\x14volume_mounted_files\x1aZ\n" + + "\x0fMetricTagsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x121\n" + + "\x05value\x18\x02 \x01(\v2\x1b.models.ProtoMetricTagValueR\x05value:\x028\x01B\x19\n" + + "\x17_certificate_properties\"\x81\x01\n" + + "\vProtoRoutes\x127\n" + + "\x06routes\x18\x01 \x03(\v2\x1f.models.ProtoRoutes.RoutesEntryR\x06routes\x1a9\n" + + "\vRoutesEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + + "\x05value\x18\x02 \x01(\fR\x05value:\x028\x01\"\xeb\x02\n" + + "\x15ProtoDesiredLRPUpdate\x12!\n" + + "\tinstances\x18\x01 \x01(\x05H\x00R\tinstances\x88\x01\x01\x125\n" + + "\x06routes\x18\x02 \x01(\v2\x13.models.ProtoRoutesB\x03\x90?\x00H\x01R\x06routes\x88\x01\x01\x12#\n" + + "\n" + + "annotation\x18\x03 \x01(\tH\x02R\n" + + "annotation\x88\x01\x01\x12O\n" + + "\vmetric_tags\x18\x04 \x03(\v2-.models.ProtoDesiredLRPUpdate.MetricTagsEntryR\vmetric_tags\x1aZ\n" + + "\x0fMetricTagsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x121\n" + + "\x05value\x18\x02 \x01(\v2\x1b.models.ProtoMetricTagValueR\x05value:\x028\x01B\f\n" + + "\n" + + "_instancesB\t\n" + + "\a_routesB\r\n" + + "\v_annotation\"{\n" + + "\x12ProtoDesiredLRPKey\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x12\x1b\n" + + "\x06domain\x18\x02 \x01(\tB\x03\xc0>\x01R\x06domain\x12\x1f\n" + + "\blog_guid\x18\x03 \x01(\tB\x03\xc0>\x01R\blog_guid\"\x9a\x01\n" + + "\x17ProtoDesiredLRPResource\x12!\n" + + "\tmemory_mb\x18\x01 \x01(\x05B\x03\xc0>\x01R\tmemory_mb\x12\x1d\n" + + "\adisk_mb\x18\x02 \x01(\x05B\x03\xc0>\x01R\adisk_mb\x12\x1c\n" + + "\aroot_fs\x18\x03 \x01(\tB\x03\xc0>\x01R\x06rootfs\x12\x1f\n" + + "\bmax_pids\x18\x04 \x01(\x05B\x03\xc0>\x01R\bmax_pids\"\xae\x10\n" + + "\x0fProtoDesiredLRP\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x12\x1b\n" + + "\x06domain\x18\x02 \x01(\tB\x03\xc0>\x01R\x06domain\x12\x1c\n" + + "\aroot_fs\x18\x03 \x01(\tB\x03\xc0>\x01R\x06rootfs\x12!\n" + + "\tinstances\x18\x04 \x01(\x05B\x03\xc0>\x01R\tinstances\x12I\n" + + "\x15environment_variables\x18\x05 \x03(\v2 .models.ProtoEnvironmentVariableB\x03\xc0>\x01R\x03env\x12)\n" + + "\x05setup\x18\x06 \x01(\v2\x13.models.ProtoActionR\x05setup\x12+\n" + + "\x06action\x18\a \x01(\v2\x13.models.ProtoActionR\x06action\x12/\n" + + "\x10start_timeout_ms\x18\x1b \x01(\x03B\x03\xc0>\x01R\x10start_timeout_ms\x12=\n" + + "\x1adeprecated_start_timeout_s\x18\b \x01(\rB\x02\x18\x01R\x15deprecated_timeout_ns\x12-\n" + + "\amonitor\x18\t \x01(\v2\x13.models.ProtoActionR\amonitor\x12\x1d\n" + + "\adisk_mb\x18\n" + + " \x01(\x05B\x03\xc0>\x01R\adisk_mb\x12!\n" + + "\tmemory_mb\x18\v \x01(\x05B\x03\xc0>\x01R\tmemory_mb\x12#\n" + + "\n" + + "cpu_weight\x18\f \x01(\rB\x03\xc0>\x01R\n" + + "cpu_weight\x12#\n" + + "\n" + + "privileged\x18\r \x01(\bB\x03\xc0>\x01R\n" + + "privileged\x12\x18\n" + + "\x05ports\x18\x0e \x03(\rB\x02\x10\x00R\x05ports\x125\n" + + "\x06routes\x18\x0f \x01(\v2\x13.models.ProtoRoutesB\x03\x90?\x00H\x00R\x06routes\x88\x01\x01\x12#\n" + + "\n" + + "log_source\x18\x10 \x01(\tB\x03\xc0>\x01R\n" + + "log_source\x12\x1f\n" + + "\blog_guid\x18\x11 \x01(\tB\x03\xc0>\x01R\blog_guid\x12)\n" + + "\fmetrics_guid\x18\x12 \x01(\tB\x05\xc0>\x01\x18\x01R\fmetrics_guid\x12#\n" + + "\n" + + "annotation\x18\x13 \x01(\tB\x03\xc0>\x01R\n" + + "annotation\x12B\n" + + "\fegress_rules\x18\x14 \x03(\v2\x1e.models.ProtoSecurityGroupRuleR\fegress_rules\x12H\n" + + "\x10modification_tag\x18\x15 \x01(\v2\x1c.models.ProtoModificationTagR\x10modification_tag\x12O\n" + + "\x13cached_dependencies\x18\x16 \x03(\v2\x1d.models.ProtoCachedDependencyR\x13cached_dependencies\x126\n" + + "\x14legacy_download_user\x18\x17 \x01(\tB\x02\x18\x01R\x14legacy_download_user\x12J\n" + + " trusted_system_certificates_path\x18\x18 \x01(\tR trusted_system_certificates_path\x12>\n" + + "\rvolume_mounts\x18\x19 \x03(\v2\x18.models.ProtoVolumeMountR\rvolume_mounts\x12.\n" + + "\anetwork\x18\x1a \x01(\v2\x14.models.ProtoNetworkR\anetwork\x12%\n" + + "\rPlacementTags\x18\x1c \x03(\tR\x0eplacement_tags\x12\x1f\n" + + "\bmax_pids\x18\x1d \x01(\x05B\x03\xc0>\x01R\bmax_pids\x12_\n" + + "\x16certificate_properties\x18\x1e \x01(\v2\".models.ProtoCertificatePropertiesH\x01R\x16certificate_properties\x88\x01\x01\x12&\n" + + "\x0eimage_username\x18\x1f \x01(\tR\x0eimage_username\x12&\n" + + "\x0eimage_password\x18 \x01(\tR\x0eimage_password\x12H\n" + + "\x10check_definition\x18! \x01(\v2\x1c.models.ProtoCheckDefinitionR\x10check_definition\x12;\n" + + "\fimage_layers\x18\" \x03(\v2\x17.models.ProtoImageLayerR\fimage_layers\x12I\n" + + "\vmetric_tags\x18# \x03(\v2'.models.ProtoDesiredLRP.MetricTagsEntryR\vmetric_tags\x120\n" + + "\bsidecars\x18$ \x03(\v2\x14.models.ProtoSidecarR\bsidecars\x12A\n" + + "\x0elog_rate_limit\x18% \x01(\v2\x19.models.ProtoLogRateLimitR\x0elog_rate_limit\x12J\n" + + "\x14volume_mounted_files\x18& \x03(\v2\x11.models.ProtoFileB\x03\xc0>\x01R\x14volume_mounted_files\x1aZ\n" + + "\x0fMetricTagsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x121\n" + + "\x05value\x18\x02 \x01(\v2\x1b.models.ProtoMetricTagValueR\x05value:\x028\x01B\t\n" + + "\a_routesB\x19\n" + + "\x17_certificate_propertiesB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_desired_lrp_proto_rawDescOnce sync.Once diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index fcb15f1d..c6b99750 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 1b126d90..45e0ddeb 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: desired_lrp_requests.proto package models @@ -511,91 +511,35 @@ func (x *ProtoRemoveDesiredLRPRequest) GetProcessGuid() string { var File_desired_lrp_requests_proto protoreflect.FileDescriptor -var file_desired_lrp_requests_proto_rawDesc = string([]byte{ - 0x0a, 0x1a, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x72, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x4c, 0x0a, 0x20, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x81, 0x01, - 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, - 0x50, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x12, 0x3b, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, - 0x6c, 0x72, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, - 0x73, 0x22, 0x5c, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, - 0x64, 0x4c, 0x52, 0x50, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, - 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x73, 0x22, - 0x7e, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, - 0x6c, 0x72, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, - 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x22, - 0xbd, 0x01, 0x0a, 0x26, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, - 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x12, 0x69, 0x0a, 0x1c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, - 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x1c, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x73, - 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x22, - 0xc7, 0x01, 0x0a, 0x32, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, - 0x6f, 0x42, 0x79, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x12, 0x67, 0x0a, 0x1b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x53, 0x63, - 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x1b, 0x64, 0x65, - 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, - 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4e, 0x0a, 0x23, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x42, 0x79, 0x50, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x15, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, - 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, - 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x22, 0x7e, 0x0a, - 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x47, 0x0a, - 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x73, 0x69, - 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, - 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, - 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, - 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, -}) +const file_desired_lrp_requests_proto_rawDesc = "" + + "\n" + + "\x1adesired_lrp_requests.proto\x12\x06models\x1a\tbbs.proto\x1a\x11desired_lrp.proto\x1a\verror.proto\"L\n" + + " ProtoDesiredLRPLifecycleResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\"\x81\x01\n" + + "\x18ProtoDesiredLRPsResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12;\n" + + "\fdesired_lrps\x18\x02 \x03(\v2\x17.models.ProtoDesiredLRPR\fdesired_lrps\"\\\n" + + "\x17ProtoDesiredLRPsRequest\x12\x1b\n" + + "\x06domain\x18\x01 \x01(\tB\x03\xc0>\x01R\x06domain\x12$\n" + + "\rprocess_guids\x18\x02 \x03(\tR\rprocess_guids\"~\n" + + "\x17ProtoDesiredLRPResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x129\n" + + "\vdesired_lrp\x18\x02 \x01(\v2\x17.models.ProtoDesiredLRPR\vdesired_lrp\"\xbd\x01\n" + + "&ProtoDesiredLRPSchedulingInfosResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12i\n" + + "\x1cdesired_lrp_scheduling_infos\x18\x02 \x03(\v2%.models.ProtoDesiredLRPSchedulingInfoR\x1cdesired_lrp_scheduling_infos\"\xc7\x01\n" + + "2ProtoDesiredLRPSchedulingInfoByProcessGuidResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12g\n" + + "\x1bdesired_lrp_scheduling_info\x18\x02 \x01(\v2%.models.ProtoDesiredLRPSchedulingInfoR\x1bdesired_lrp_scheduling_info\"N\n" + + "#ProtoDesiredLRPByProcessGuidRequest\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\"R\n" + + "\x15ProtoDesireLRPRequest\x129\n" + + "\vdesired_lrp\x18\x01 \x01(\v2\x17.models.ProtoDesiredLRPR\vdesired_lrp\"~\n" + + "\x1cProtoUpdateDesiredLRPRequest\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guid\x125\n" + + "\x06update\x18\x02 \x01(\v2\x1d.models.ProtoDesiredLRPUpdateR\x06update\"G\n" + + "\x1cProtoRemoveDesiredLRPRequest\x12'\n" + + "\fprocess_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\fprocess_guidB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_desired_lrp_requests_proto_rawDescOnce sync.Once diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index 80713a08..4718eebc 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index d8d7a69f..eda3b13e 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: domain.proto package models @@ -171,29 +171,17 @@ func (x *ProtoUpsertDomainRequest) GetTtl() uint32 { var File_domain_proto protoreflect.FileDescriptor -var file_domain_proto_rawDesc = string([]byte{ - 0x0a, 0x0c, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5a, - 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x12, 0x18, 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x22, 0x45, 0x0a, 0x19, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x22, 0x4e, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, - 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, - 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x15, 0x0a, 0x03, 0x74, 0x74, - 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x74, 0x74, - 0x6c, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, - 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_domain_proto_rawDesc = "" + + "\n" + + "\fdomain.proto\x12\x06models\x1a\tbbs.proto\x1a\verror.proto\"Z\n" + + "\x14ProtoDomainsResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12\x18\n" + + "\adomains\x18\x02 \x03(\tR\adomains\"E\n" + + "\x19ProtoUpsertDomainResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\"N\n" + + "\x18ProtoUpsertDomainRequest\x12\x1b\n" + + "\x06domain\x18\x01 \x01(\tB\x03\xc0>\x01R\x06domain\x12\x15\n" + + "\x03ttl\x18\x02 \x01(\rB\x03\xc0>\x01R\x03ttlB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_domain_proto_rawDescOnce sync.Once diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index d3b30338..ed7b3bdd 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 85d09fd2..6f81227a 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: environment_variables.proto package models @@ -75,19 +75,12 @@ func (x *ProtoEnvironmentVariable) GetValue() string { var File_environment_variables_proto protoreflect.FileDescriptor -var file_environment_variables_proto_rawDesc = string([]byte{ - 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, - 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x4e, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, - 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x17, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, - 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_environment_variables_proto_rawDesc = "" + + "\n" + + "\x1benvironment_variables.proto\x12\x06models\x1a\tbbs.proto\"N\n" + + "\x18ProtoEnvironmentVariable\x12\x17\n" + + "\x04name\x18\x01 \x01(\tB\x03\xc0>\x01R\x04name\x12\x19\n" + + "\x05value\x18\x02 \x01(\tB\x03\xc0>\x01R\x05valueB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_environment_variables_proto_rawDescOnce sync.Once diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index c57a3117..4f6f04d9 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index f14bffdd..8b000c01 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: error.proto package models @@ -190,58 +190,41 @@ func (x *ProtoError) GetMessage() string { var File_error_proto protoreflect.FileDescriptor -var file_error_proto_rawDesc = string([]byte{ - 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0xcc, 0x05, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, - 0x30, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x74, 0x79, 0x70, - 0x65, 0x12, 0x20, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0xe0, 0x3f, 0x01, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x22, 0xe9, 0x04, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, - 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x00, 0x12, 0x11, - 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, - 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x10, 0x04, 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x10, 0x05, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, - 0x76, 0x61, 0x6c, 0x69, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x10, 0x06, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, - 0x64, 0x4a, 0x53, 0x4f, 0x4e, 0x10, 0x07, 0x12, 0x18, 0x0a, 0x14, 0x46, 0x61, 0x69, 0x6c, 0x65, - 0x64, 0x54, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x10, - 0x08, 0x12, 0x1a, 0x0a, 0x16, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x09, 0x12, 0x14, 0x0a, - 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, - 0x74, 0x10, 0x0b, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, - 0x78, 0x69, 0x73, 0x74, 0x73, 0x10, 0x0c, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0d, 0x12, 0x0f, 0x0a, - 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x0e, 0x12, 0x1c, - 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x42, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x1c, 0x0a, 0x18, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, - 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 0x10, 0x10, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x43, - 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x10, 0x11, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x46, 0x61, 0x69, - 0x6c, 0x65, 0x64, 0x10, 0x12, 0x12, 0x1c, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x64, 0x10, 0x13, 0x12, 0x1e, 0x0a, 0x1a, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x42, 0x65, 0x55, 0x6e, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x65, - 0x64, 0x10, 0x15, 0x12, 0x1a, 0x0a, 0x16, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x4f, 0x6e, - 0x44, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x6c, 0x6c, 0x10, 0x18, 0x12, - 0x12, 0x0a, 0x0e, 0x47, 0x55, 0x49, 0x44, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x10, 0x1a, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, - 0x7a, 0x65, 0x10, 0x1b, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x65, 0x61, 0x64, 0x6c, 0x6f, 0x63, 0x6b, - 0x10, 0x1c, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x6e, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, - 0x62, 0x6c, 0x65, 0x10, 0x1d, 0x12, 0x11, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x6c, - 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x1e, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x10, 0x1f, 0x22, 0x04, 0x08, 0x01, 0x10, 0x01, 0x22, 0x04, 0x08, 0x02, 0x10, - 0x02, 0x22, 0x04, 0x08, 0x0a, 0x10, 0x0a, 0x22, 0x04, 0x08, 0x14, 0x10, 0x14, 0x22, 0x04, 0x08, - 0x16, 0x10, 0x16, 0x22, 0x04, 0x08, 0x17, 0x10, 0x17, 0x22, 0x04, 0x08, 0x19, 0x10, 0x19, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_error_proto_rawDesc = "" + + "\n" + + "\verror.proto\x12\x06models\x1a\tbbs.proto\"\xcc\x05\n" + + "\n" + + "ProtoError\x120\n" + + "\x04type\x18\x01 \x01(\x0e2\x17.models.ProtoError.TypeB\x03\xc0>\x01R\x04type\x12 \n" + + "\amessage\x18\x02 \x01(\tB\x06\xc0>\x01\xe0?\x01R\amessage\"\xe9\x04\n" + + "\x04Type\x12\x10\n" + + "\fUnknownError\x10\x00\x12\x11\n" + + "\rInvalidRecord\x10\x03\x12\x12\n" + + "\x0eInvalidRequest\x10\x04\x12\x13\n" + + "\x0fInvalidResponse\x10\x05\x12\x1a\n" + + "\x16InvalidProtobufMessage\x10\x06\x12\x0f\n" + + "\vInvalidJSON\x10\a\x12\x18\n" + + "\x14FailedToOpenEnvelope\x10\b\x12\x1a\n" + + "\x16InvalidStateTransition\x10\t\x12\x14\n" + + "\x10ResourceConflict\x10\v\x12\x12\n" + + "\x0eResourceExists\x10\f\x12\x14\n" + + "\x10ResourceNotFound\x10\r\x12\x0f\n" + + "\vRouterError\x10\x0e\x12\x1c\n" + + "\x18ActualLRPCannotBeClaimed\x10\x0f\x12\x1c\n" + + "\x18ActualLRPCannotBeStarted\x10\x10\x12\x1c\n" + + "\x18ActualLRPCannotBeCrashed\x10\x11\x12\x1b\n" + + "\x17ActualLRPCannotBeFailed\x10\x12\x12\x1c\n" + + "\x18ActualLRPCannotBeRemoved\x10\x13\x12\x1e\n" + + "\x1aActualLRPCannotBeUnclaimed\x10\x15\x12\x1a\n" + + "\x16RunningOnDifferentCell\x10\x18\x12\x12\n" + + "\x0eGUIDGeneration\x10\x1a\x12\x0f\n" + + "\vDeserialize\x10\x1b\x12\f\n" + + "\bDeadlock\x10\x1c\x12\x11\n" + + "\rUnrecoverable\x10\x1d\x12\x11\n" + + "\rLockCollision\x10\x1e\x12\v\n" + + "\aTimeout\x10\x1f\"\x04\b\x01\x10\x01\"\x04\b\x02\x10\x02\"\x04\b\n" + + "\x10\n" + + "\"\x04\b\x14\x10\x14\"\x04\b\x16\x10\x16\"\x04\b\x17\x10\x17\"\x04\b\x19\x10\x19B\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_error_proto_rawDescOnce sync.Once diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index ec23fcff..f67d6d77 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index a826ee8f..721b342e 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: evacuation.proto package models @@ -427,121 +427,39 @@ func (x *ProtoRemoveEvacuatingActualLRPResponse) GetError() *ProtoError { var File_evacuation_proto protoreflect.FileDescriptor -var file_evacuation_proto_rawDesc = string([]byte{ - 0x0a, 0x10, 0x65, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x70, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, - 0x63, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, - 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2b, 0x0a, 0x0e, 0x6b, 0x65, 0x65, - 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x22, 0xc6, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, - 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, - 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, - 0x82, 0x05, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, - 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, - 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x4f, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x63, 0x0a, 0x1a, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x5e, - 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, - 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, - 0x0a, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, - 0x48, 0x00, 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, - 0x31, 0x0a, 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, - 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, - 0x6e, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x04, - 0x08, 0x04, 0x10, 0x05, 0x22, 0xc6, 0x01, 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, - 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x70, 0x65, 0x64, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, - 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, - 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, - 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, - 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0xf1, 0x01, - 0x0a, 0x24, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x65, 0x43, - 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, 0x0a, 0x17, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x17, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x22, 0xc7, 0x01, 0x0a, 0x25, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, - 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x52, 0x0e, - 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x5b, - 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, - 0x65, 0x79, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x22, 0x52, 0x0a, 0x26, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x45, 0x76, 0x61, 0x63, 0x75, 0x61, - 0x74, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_evacuation_proto_rawDesc = "" + + "\n" + + "\x10evacuation.proto\x12\x06models\x1a\tbbs.proto\x1a\x10actual_lrp.proto\x1a\verror.proto\"p\n" + + "\x17ProtoEvacuationResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12+\n" + + "\x0ekeep_container\x18\x02 \x01(\bB\x03\xc0>\x01R\x0ekeep_container\"\xc6\x01\n" + + "$ProtoEvacuateClaimedActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12[\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\"\x82\x05\n" + + "$ProtoEvacuateRunningActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12[\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\x12O\n" + + "\x13actual_lrp_net_info\x18\x03 \x01(\v2\x1d.models.ProtoActualLRPNetInfoR\x13actual_lrp_net_info\x12c\n" + + "\x1aactual_lrp_internal_routes\x18\x05 \x03(\v2#.models.ProtoActualLRPInternalRouteR\x1aactual_lrp_internal_routes\x12^\n" + + "\vmetric_tags\x18\x06 \x03(\v2<.models.ProtoEvacuateRunningActualLRPRequest.MetricTagsEntryR\vmetric_tags\x12\x1f\n" + + "\bRoutable\x18\a \x01(\bH\x00R\bRoutable\x88\x01\x01\x121\n" + + "\x11availability_zone\x18\b \x01(\tB\x03\xc0>\x01R\x11availability_zone\x1a=\n" + + "\x0fMetricTagsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\v\n" + + "\t_RoutableJ\x04\b\x04\x10\x05\"\xc6\x01\n" + + "$ProtoEvacuateStoppedActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12[\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\"\xf1\x01\n" + + "$ProtoEvacuateCrashedActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12[\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\x12)\n" + + "\rerror_message\x18\x03 \x01(\tB\x03\xc0>\x01R\rerror_message\"\xc7\x01\n" + + "%ProtoRemoveEvacuatingActualLRPRequest\x12A\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyR\x0eactual_lrp_key\x12[\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyR\x17actual_lrp_instance_key\"R\n" + + "&ProtoRemoveEvacuatingActualLRPResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05errorB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_evacuation_proto_rawDescOnce sync.Once diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index c585e367..465efdec 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index 2278aad4..fb0c933d 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: events.proto package models @@ -930,176 +930,73 @@ func (x *ProtoFakeEvent) GetToken() string { var File_events_proto protoreflect.FileDescriptor -var file_events_proto_rawDesc = string([]byte{ - 0x0a, 0x0c, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x69, 0x0a, 0x1a, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x47, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x66, 0x74, - 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x3a, 0x02, 0x18, 0x01, - 0x22, 0x69, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, - 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x47, - 0x0a, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x10, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x7d, 0x0a, 0x22, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x90, 0x04, 0x0a, 0x12, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x57, 0x0a, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, - 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x4e, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0xc0, - 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x13, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, - 0x70, 0x5f, 0x6e, 0x65, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x25, 0x0a, 0x0b, 0x63, 0x72, - 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, - 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x69, - 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, - 0x73, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, - 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x67, 0x42, 0x06, 0xc0, - 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x10, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x43, 0x0a, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, - 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, - 0x50, 0x2e, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, - 0x3f, 0x01, 0x52, 0x08, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x08, - 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, - 0x52, 0x08, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, - 0x11, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, - 0x6e, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x11, 0x61, - 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, - 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x52, 0x6f, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xdb, 0x02, - 0x0a, 0x22, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x12, 0x49, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, - 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, - 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, - 0x63, 0x0a, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x21, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x17, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x66, 0x6f, - 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x30, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, - 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, - 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x7d, 0x0a, 0x22, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, 0x52, 0x0a, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x79, 0x0a, 0x1b, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, - 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x5f, 0x6c, 0x72, 0x70, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x74, 0x72, 0x61, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x9e, 0x01, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x06, - 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x05, - 0x61, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x74, 0x72, - 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x22, 0x79, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, - 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x52, 0x50, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x5f, 0x6c, 0x72, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, - 0x4c, 0x52, 0x50, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x6c, 0x72, 0x70, - 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, - 0x64, 0x22, 0xb2, 0x02, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x43, 0x72, 0x61, 0x73, 0x68, 0x65, 0x64, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x12, 0x49, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x52, 0x50, - 0x4b, 0x65, 0x79, 0x42, 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x0e, 0x61, 0x63, 0x74, - 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x12, 0x63, 0x0a, 0x17, 0x61, - 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x4c, 0x52, 0x50, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4b, 0x65, 0x79, 0x42, - 0x06, 0xc0, 0x3e, 0x01, 0x90, 0x3f, 0x01, 0x52, 0x17, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x5f, - 0x6c, 0x72, 0x70, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6b, 0x65, 0x79, - 0x12, 0x25, 0x0a, 0x0b, 0x63, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x61, 0x73, - 0x68, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x72, 0x61, 0x73, 0x68, - 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, - 0x72, 0x61, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x05, 0x73, - 0x69, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x05, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x34, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x79, 0x43, 0x65, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x1d, 0x0a, - 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x15, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x6b, 0x0a, 0x15, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x06, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, - 0x12, 0x27, 0x0a, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, - 0x73, 0x6b, 0x52, 0x05, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x15, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, - 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x26, 0x0a, 0x0e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x46, 0x61, 0x6b, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, - 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, - 0x6e, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, - 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_events_proto_rawDesc = "" + + "\n" + + "\fevents.proto\x12\x06models\x1a\x10actual_lrp.proto\x1a\tbbs.proto\x1a\x11desired_lrp.proto\x1a\n" + + "task.proto\x1a\x16modification_tag.proto\"i\n" + + "\x1aProtoActualLRPCreatedEvent\x12G\n" + + "\x10actual_lrp_group\x18\x01 \x01(\v2\x1b.models.ProtoActualLRPGroupR\x10actual_lrp_group:\x02\x18\x01\"\x88\x01\n" + + "\x1aProtoActualLRPChangedEvent\x123\n" + + "\x06before\x18\x01 \x01(\v2\x1b.models.ProtoActualLRPGroupR\x06before\x121\n" + + "\x05after\x18\x02 \x01(\v2\x1b.models.ProtoActualLRPGroupR\x05after:\x02\x18\x01\"i\n" + + "\x1aProtoActualLRPRemovedEvent\x12G\n" + + "\x10actual_lrp_group\x18\x01 \x01(\v2\x1b.models.ProtoActualLRPGroupR\x10actual_lrp_group:\x02\x18\x01\"}\n" + + "\"ProtoActualLRPInstanceCreatedEvent\x126\n" + + "\n" + + "actual_lrp\x18\x01 \x01(\v2\x16.models.ProtoActualLRPR\n" + + "actual_lrp\x12\x1f\n" + + "\btrace_id\x18\x02 \x01(\tB\x03\xc0>\x01R\btrace_id\"\x90\x04\n" + + "\x12ProtoActualLRPInfo\x12W\n" + + "\x13actual_lrp_net_info\x18\x03 \x01(\v2\x1d.models.ProtoActualLRPNetInfoB\x06\xc0>\x01\x90?\x01R\x13actual_lrp_net_info\x12%\n" + + "\vcrash_count\x18\x04 \x01(\x05B\x03\xc0>\x01R\vcrash_count\x12\"\n" + + "\fcrash_reason\x18\x05 \x01(\tR\fcrash_reason\x12\x19\n" + + "\x05state\x18\x06 \x01(\tB\x03\xc0>\x01R\x05state\x12(\n" + + "\x0fplacement_error\x18\a \x01(\tR\x0fplacement_error\x12\x19\n" + + "\x05since\x18\b \x01(\x03B\x03\xc0>\x01R\x05since\x12P\n" + + "\x10modification_tag\x18\t \x01(\v2\x1c.models.ProtoModificationTagB\x06\xc0>\x01\x90?\x01R\x10modification_tag\x12C\n" + + "\bpresence\x18\n" + + " \x01(\x0e2\x1f.models.ProtoActualLRP.PresenceB\x06\xc0>\x01\x90?\x01R\bpresence\x12\x1f\n" + + "\bRoutable\x18\v \x01(\bH\x00R\bRoutable\x88\x01\x01\x121\n" + + "\x11availability_zone\x18\f \x01(\tB\x03\xc0>\x01R\x11availability_zoneB\v\n" + + "\t_Routable\"\xdb\x02\n" + + "\"ProtoActualLRPInstanceChangedEvent\x12I\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyB\x06\xc0>\x01\x90?\x01R\x0eactual_lrp_key\x12c\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyB\x06\xc0>\x01\x90?\x01R\x17actual_lrp_instance_key\x122\n" + + "\x06before\x18\x03 \x01(\v2\x1a.models.ProtoActualLRPInfoR\x06before\x120\n" + + "\x05after\x18\x04 \x01(\v2\x1a.models.ProtoActualLRPInfoR\x05after\x12\x1f\n" + + "\btrace_id\x18\x05 \x01(\tB\x03\xc0>\x01R\btrace_id\"}\n" + + "\"ProtoActualLRPInstanceRemovedEvent\x126\n" + + "\n" + + "actual_lrp\x18\x01 \x01(\v2\x16.models.ProtoActualLRPR\n" + + "actual_lrp\x12\x1f\n" + + "\btrace_id\x18\x02 \x01(\tB\x03\xc0>\x01R\btrace_id\"y\n" + + "\x1bProtoDesiredLRPCreatedEvent\x129\n" + + "\vdesired_lrp\x18\x01 \x01(\v2\x17.models.ProtoDesiredLRPR\vdesired_lrp\x12\x1f\n" + + "\btrace_id\x18\x02 \x01(\tB\x03\xc0>\x01R\btrace_id\"\x9e\x01\n" + + "\x1bProtoDesiredLRPChangedEvent\x12/\n" + + "\x06before\x18\x01 \x01(\v2\x17.models.ProtoDesiredLRPR\x06before\x12-\n" + + "\x05after\x18\x02 \x01(\v2\x17.models.ProtoDesiredLRPR\x05after\x12\x1f\n" + + "\btrace_id\x18\x03 \x01(\tB\x03\xc0>\x01R\btrace_id\"y\n" + + "\x1bProtoDesiredLRPRemovedEvent\x129\n" + + "\vdesired_lrp\x18\x01 \x01(\v2\x17.models.ProtoDesiredLRPR\vdesired_lrp\x12\x1f\n" + + "\btrace_id\x18\x02 \x01(\tB\x03\xc0>\x01R\btrace_id\"\xb2\x02\n" + + "\x1aProtoActualLRPCrashedEvent\x12I\n" + + "\x0eactual_lrp_key\x18\x01 \x01(\v2\x19.models.ProtoActualLRPKeyB\x06\xc0>\x01\x90?\x01R\x0eactual_lrp_key\x12c\n" + + "\x17actual_lrp_instance_key\x18\x02 \x01(\v2!.models.ProtoActualLRPInstanceKeyB\x06\xc0>\x01\x90?\x01R\x17actual_lrp_instance_key\x12%\n" + + "\vcrash_count\x18\x03 \x01(\x05B\x03\xc0>\x01R\vcrash_count\x12\"\n" + + "\fcrash_reason\x18\x04 \x01(\tR\fcrash_reason\x12\x19\n" + + "\x05since\x18\x05 \x01(\x03B\x03\xc0>\x01R\x05since\"4\n" + + "\x13ProtoEventsByCellId\x12\x1d\n" + + "\acell_id\x18\x01 \x01(\tB\x03\xc0>\x01R\acell_id\">\n" + + "\x15ProtoTaskCreatedEvent\x12%\n" + + "\x04task\x18\x01 \x01(\v2\x11.models.ProtoTaskR\x04task\"k\n" + + "\x15ProtoTaskChangedEvent\x12)\n" + + "\x06before\x18\x01 \x01(\v2\x11.models.ProtoTaskR\x06before\x12'\n" + + "\x05after\x18\x02 \x01(\v2\x11.models.ProtoTaskR\x05after\">\n" + + "\x15ProtoTaskRemovedEvent\x12%\n" + + "\x04task\x18\x01 \x01(\v2\x11.models.ProtoTaskR\x04task\"&\n" + + "\x0eProtoFakeEvent\x12\x14\n" + + "\x05token\x18\x01 \x01(\tR\x05tokenB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_events_proto_rawDescOnce sync.Once diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 9134bc68..3b938f37 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: events.proto package models diff --git a/models/file.pb.go b/models/file.pb.go index f4059b85..7f86ba4c 100644 --- a/models/file.pb.go +++ b/models/file.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: file.proto package models @@ -75,16 +75,13 @@ func (x *ProtoFile) GetContent() string { var File_file_proto protoreflect.FileDescriptor -var file_file_proto_rawDesc = string([]byte{ - 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x22, 0x39, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, - 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_file_proto_rawDesc = "" + + "\n" + + "\n" + + "file.proto\x12\x06models\"9\n" + + "\tProtoFile\x12\x12\n" + + "\x04path\x18\x01 \x01(\tR\x04path\x12\x18\n" + + "\acontent\x18\x02 \x01(\tR\acontentB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_file_proto_rawDescOnce sync.Once diff --git a/models/file_bbs.pb.go b/models/file_bbs.pb.go index ed4584e6..021fd0d1 100644 --- a/models/file_bbs.pb.go +++ b/models/file_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: file.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 50f27c80..496c3862 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: image_layer.proto package models @@ -266,58 +266,34 @@ func (x *ProtoImageLayer) GetDigestValue() string { var File_image_layer_proto protoreflect.FileDescriptor -var file_image_layer_proto_rawDesc = string([]byte{ - 0x0a, 0x11, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc3, 0x05, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x15, - 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x2f, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x12, 0x41, 0x0a, 0x0a, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, - 0x79, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6c, - 0x61, 0x79, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x46, 0x0a, 0x0a, 0x6d, 0x65, 0x64, - 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, - 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, - 0x65, 0x12, 0x53, 0x0a, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, 0x6f, - 0x72, 0x69, 0x74, 0x68, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, - 0x61, 0x79, 0x65, 0x72, 0x2e, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, - 0x69, 0x74, 0x68, 0x6d, 0x52, 0x10, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x67, - 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, - 0x67, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7b, 0x0a, 0x0f, 0x44, 0x69, - 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x1a, 0x0a, - 0x16, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, - 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x06, 0x53, 0x48, 0x41, - 0x32, 0x35, 0x36, 0x10, 0x01, 0x1a, 0x18, 0x82, 0x7d, 0x15, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, - 0x26, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x35, 0x31, 0x32, 0x10, 0x02, 0x1a, 0x1a, 0x82, 0x7d, 0x15, - 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x53, - 0x68, 0x61, 0x35, 0x31, 0x32, 0x08, 0x01, 0x22, 0x6f, 0x0a, 0x09, 0x4d, 0x65, 0x64, 0x69, 0x61, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, - 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x47, - 0x5a, 0x10, 0x01, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, - 0x65, 0x54, 0x67, 0x7a, 0x12, 0x18, 0x0a, 0x03, 0x54, 0x41, 0x52, 0x10, 0x02, 0x1a, 0x0f, 0x82, - 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x54, 0x61, 0x72, 0x12, 0x18, - 0x0a, 0x03, 0x5a, 0x49, 0x50, 0x10, 0x03, 0x1a, 0x0f, 0x82, 0x7d, 0x0c, 0x4d, 0x65, 0x64, 0x69, - 0x61, 0x54, 0x79, 0x70, 0x65, 0x5a, 0x69, 0x70, 0x22, 0x62, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x76, - 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, - 0x10, 0x01, 0x1a, 0x12, 0x82, 0x7d, 0x0f, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, - 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x12, 0x24, 0x0a, 0x09, 0x45, 0x58, 0x43, 0x4c, 0x55, 0x53, - 0x49, 0x56, 0x45, 0x10, 0x02, 0x1a, 0x15, 0x82, 0x7d, 0x12, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x54, - 0x79, 0x70, 0x65, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x42, 0x22, 0x5a, 0x20, - 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, - 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_image_layer_proto_rawDesc = "" + + "\n" + + "\x11image_layer.proto\x12\x06models\x1a\tbbs.proto\"\xc3\x05\n" + + "\x0fProtoImageLayer\x12\x12\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12\x15\n" + + "\x03url\x18\x02 \x01(\tB\x03\xc0>\x01R\x03url\x12/\n" + + "\x10destination_path\x18\x03 \x01(\tB\x03\xc0>\x01R\x10destination_path\x12A\n" + + "\n" + + "layer_type\x18\x04 \x01(\x0e2\x1c.models.ProtoImageLayer.TypeB\x03\xc0>\x01R\n" + + "layer_type\x12F\n" + + "\n" + + "media_type\x18\x05 \x01(\x0e2!.models.ProtoImageLayer.MediaTypeB\x03\xc0>\x01R\n" + + "media_type\x12S\n" + + "\x10digest_algorithm\x18\x06 \x01(\x0e2'.models.ProtoImageLayer.DigestAlgorithmR\x10digest_algorithm\x12\"\n" + + "\fdigest_value\x18\a \x01(\tR\fdigest_value\"{\n" + + "\x0fDigestAlgorithm\x12\x1a\n" + + "\x16DigestAlgorithmInvalid\x10\x00\x12$\n" + + "\x06SHA256\x10\x01\x1a\x18\x82}\x15DigestAlgorithmSha256\x12&\n" + + "\x06SHA512\x10\x02\x1a\x1a\x82}\x15DigestAlgorithmSha512\b\x01\"o\n" + + "\tMediaType\x12\x14\n" + + "\x10MediaTypeInvalid\x10\x00\x12\x18\n" + + "\x03TGZ\x10\x01\x1a\x0f\x82}\fMediaTypeTgz\x12\x18\n" + + "\x03TAR\x10\x02\x1a\x0f\x82}\fMediaTypeTar\x12\x18\n" + + "\x03ZIP\x10\x03\x1a\x0f\x82}\fMediaTypeZip\"b\n" + + "\x04Type\x12\x14\n" + + "\x10LayerTypeInvalid\x10\x00\x12\x1e\n" + + "\x06SHARED\x10\x01\x1a\x12\x82}\x0fLayerTypeShared\x12$\n" + + "\tEXCLUSIVE\x10\x02\x1a\x15\x82}\x12LayerTypeExclusiveB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_image_layer_proto_rawDescOnce sync.Once diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 6936cbde..2145b37b 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index 0bedf7d2..f0e843b0 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: log_rate_limit.proto package models @@ -67,17 +67,11 @@ func (x *ProtoLogRateLimit) GetBytesPerSecond() int64 { var File_log_rate_limit_proto protoreflect.FileDescriptor -var file_log_rate_limit_proto_rawDesc = string([]byte{ - 0x0a, 0x14, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x3f, - 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, - 0x6d, 0x69, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, - 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x62, - 0x79, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x42, - 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, - 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_log_rate_limit_proto_rawDesc = "" + + "\n" + + "\x14log_rate_limit.proto\x12\x06models\"?\n" + + "\x11ProtoLogRateLimit\x12*\n" + + "\x10bytes_per_second\x18\x01 \x01(\x03R\x10bytes_per_secondB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_log_rate_limit_proto_rawDescOnce sync.Once diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index fe4bfe0d..e97bbdd0 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index ee012473..713e2951 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: metric_tags.proto package models @@ -126,30 +126,16 @@ func (x *ProtoMetricTagValue) GetDynamic() ProtoMetricTagValue_DynamicValue { var File_metric_tags_proto protoreflect.FileDescriptor -var file_metric_tags_proto_rawDesc = string([]byte{ - 0x0a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, - 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x12, 0x42, 0x0a, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, - 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x52, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x22, 0x8a, 0x01, 0x0a, 0x0c, 0x44, - 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x44, - 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x76, 0x61, 0x6c, - 0x69, 0x64, 0x10, 0x00, 0x12, 0x28, 0x0a, 0x05, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0x01, 0x1a, - 0x1d, 0x82, 0x7d, 0x1a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x44, 0x79, 0x6e, - 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x37, - 0x0a, 0x0d, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x47, 0x55, 0x49, 0x44, 0x10, - 0x02, 0x1a, 0x24, 0x82, 0x7d, 0x21, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x44, - 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x47, 0x75, 0x69, 0x64, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, -}) +const file_metric_tags_proto_rawDesc = "" + + "\n" + + "\x11metric_tags.proto\x12\x06models\x1a\tbbs.proto\"\xfe\x01\n" + + "\x13ProtoMetricTagValue\x12\x16\n" + + "\x06static\x18\x01 \x01(\tR\x06static\x12B\n" + + "\adynamic\x18\x02 \x01(\x0e2(.models.ProtoMetricTagValue.DynamicValueR\adynamic\"\x8a\x01\n" + + "\fDynamicValue\x12\x17\n" + + "\x13DynamicValueInvalid\x10\x00\x12(\n" + + "\x05INDEX\x10\x01\x1a\x1d\x82}\x1aMetricTagDynamicValueIndex\x127\n" + + "\rINSTANCE_GUID\x10\x02\x1a$\x82}!MetricTagDynamicValueInstanceGuidB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_metric_tags_proto_rawDescOnce sync.Once diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 4f083f61..6e9aeac8 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index ebba47d9..49c1953d 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: modification_tag.proto package models @@ -75,19 +75,12 @@ func (x *ProtoModificationTag) GetIndex() uint32 { var File_modification_tag_proto protoreflect.FileDescriptor -var file_modification_tag_proto_rawDesc = string([]byte{ - 0x0a, 0x16, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, - 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, - 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4c, 0x0a, 0x14, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x54, 0x61, 0x67, 0x12, 0x19, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x19, - 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, - 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, - 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_modification_tag_proto_rawDesc = "" + + "\n" + + "\x16modification_tag.proto\x12\x06models\x1a\tbbs.proto\"L\n" + + "\x14ProtoModificationTag\x12\x19\n" + + "\x05epoch\x18\x01 \x01(\tB\x03\xc0>\x01R\x05epoch\x12\x19\n" + + "\x05index\x18\x02 \x01(\rB\x03\xc0>\x01R\x05indexB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_modification_tag_proto_rawDescOnce sync.Once diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 52e88836..ad981979 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index d2e7c3fa..27fdd4fe 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: network.proto package models @@ -67,22 +67,16 @@ func (x *ProtoNetwork) GetProperties() map[string]string { var File_network_proto protoreflect.FileDescriptor -var file_network_proto_rawDesc = string([]byte{ - 0x0a, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, - 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x22, 0x93, 0x01, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x44, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x3d, - 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x22, 0x5a, - 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, - 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_network_proto_rawDesc = "" + + "\n" + + "\rnetwork.proto\x12\x06models\"\x93\x01\n" + + "\fProtoNetwork\x12D\n" + + "\n" + + "properties\x18\x01 \x03(\v2$.models.ProtoNetwork.PropertiesEntryR\n" + + "properties\x1a=\n" + + "\x0fPropertiesEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_network_proto_rawDescOnce sync.Once diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index bdea4d76..640551a5 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 8b3c4b10..2240134d 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: ping.proto package models @@ -67,17 +67,12 @@ func (x *ProtoPingResponse) GetAvailable() bool { var File_ping_proto protoreflect.FileDescriptor -var file_ping_proto_rawDesc = string([]byte{ - 0x0a, 0x0a, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x36, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x61, 0x76, - 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, -}) +const file_ping_proto_rawDesc = "" + + "\n" + + "\n" + + "ping.proto\x12\x06models\x1a\tbbs.proto\"6\n" + + "\x11ProtoPingResponse\x12!\n" + + "\tavailable\x18\x01 \x01(\bB\x03\xc0>\x01R\tavailableB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_ping_proto_rawDescOnce sync.Once diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 1ad9afee..011c0c01 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index e0f2b916..d8d0fa57 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: security_group.proto package models @@ -219,40 +219,25 @@ func (x *ProtoSecurityGroupRule) GetAnnotations() []string { var File_security_group_proto protoreflect.FileDescriptor -var file_security_group_proto_rawDesc = string([]byte{ - 0x0a, 0x14, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, - 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x42, 0x0a, 0x0e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x19, 0x0a, 0x05, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x15, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x41, 0x0a, - 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x17, - 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, - 0x22, 0x98, 0x02, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, - 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x64, - 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x05, 0x70, - 0x6f, 0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x02, 0x10, 0x00, 0x52, 0x05, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x36, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, - 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x52, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x33, 0x0a, - 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x15, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, - 0x43, 0x4d, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x69, 0x6e, - 0x66, 0x6f, 0x12, 0x15, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_security_group_proto_rawDesc = "" + + "\n" + + "\x14security_group.proto\x12\x06models\x1a\tbbs.proto\"B\n" + + "\x0eProtoPortRange\x12\x19\n" + + "\x05start\x18\x01 \x01(\rB\x03\xc0>\x01R\x05start\x12\x15\n" + + "\x03end\x18\x02 \x01(\rB\x03\xc0>\x01R\x03end\"A\n" + + "\rProtoICMPInfo\x12\x17\n" + + "\x04type\x18\x01 \x01(\x05B\x03\xc0>\x01R\x04type\x12\x17\n" + + "\x04code\x18\x02 \x01(\x05B\x03\xc0>\x01R\x04code\"\x98\x02\n" + + "\x16ProtoSecurityGroupRule\x12\x1a\n" + + "\bprotocol\x18\x01 \x01(\tR\bprotocol\x12\"\n" + + "\fdestinations\x18\x02 \x03(\tR\fdestinations\x12\x18\n" + + "\x05ports\x18\x03 \x03(\rB\x02\x10\x00R\x05ports\x126\n" + + "\n" + + "port_range\x18\x04 \x01(\v2\x16.models.ProtoPortRangeR\n" + + "port_range\x123\n" + + "\ticmp_info\x18\x05 \x01(\v2\x15.models.ProtoICMPInfoR\ticmp_info\x12\x15\n" + + "\x03log\x18\x06 \x01(\bB\x03\xc0>\x01R\x03log\x12 \n" + + "\vannotations\x18\a \x03(\tR\vannotationsB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_security_group_proto_rawDescOnce sync.Once diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 079a82cb..aa321f31 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 7451df80..38a0242a 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: sidecar.proto package models @@ -83,22 +83,13 @@ func (x *ProtoSidecar) GetMemoryMb() int32 { var File_sidecar_proto protoreflect.FileDescriptor -var file_sidecar_proto_rawDesc = string([]byte{ - 0x0a, 0x0d, 0x73, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, - 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x7d, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, - 0x72, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, - 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x21, 0x0a, - 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, - 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, - 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_sidecar_proto_rawDesc = "" + + "\n" + + "\rsidecar.proto\x12\x06models\x1a\tbbs.proto\x1a\ractions.proto\"}\n" + + "\fProtoSidecar\x12+\n" + + "\x06action\x18\x01 \x01(\v2\x13.models.ProtoActionR\x06action\x12\x1d\n" + + "\adisk_mb\x18\x02 \x01(\x05B\x03\xc0>\x01R\adisk_mb\x12!\n" + + "\tmemory_mb\x18\x03 \x01(\x05B\x03\xc0>\x01R\tmemory_mbB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_sidecar_proto_rawDescOnce sync.Once diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 79f650c3..119a85a5 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index 921052b0..7d2ee449 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: task.proto package models @@ -480,166 +480,77 @@ func (x *ProtoTask) GetRejectionReason() string { var File_task_proto protoreflect.FileDescriptor -var file_task_proto_rawDesc = string([]byte{ - 0x0a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x0d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, - 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, - 0x61, 0x62, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x73, 0x65, 0x63, - 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x17, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x76, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, - 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, - 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0xa1, 0x0c, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, - 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x07, 0x72, - 0x6f, 0x6f, 0x74, 0x5f, 0x66, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x74, 0x66, 0x73, 0x12, 0x44, 0x0a, 0x15, 0x65, 0x6e, 0x76, - 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, - 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, - 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, - 0x2b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x07, - 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6d, 0x62, 0x12, 0x21, 0x0a, 0x09, 0x6d, - 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x62, 0x12, 0x23, - 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x0d, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x70, 0x75, 0x5f, 0x77, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, - 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x70, 0x72, - 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x0a, 0x6c, 0x6f, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1f, 0x0a, - 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x27, - 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x73, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x0b, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x38, - 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x61, 0x6c, - 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x17, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x61, 0x6c, 0x6c, - 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x6e, - 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x0c, 0x65, 0x67, 0x72, 0x65, - 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x63, - 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, - 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x4f, 0x0a, 0x13, - 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x44, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x13, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, - 0x5f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x36, 0x0a, - 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, - 0x14, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, - 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, - 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x70, 0x61, 0x74, - 0x68, 0x12, 0x3e, 0x0a, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, - 0x6e, 0x74, 0x52, 0x0d, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x73, 0x12, 0x2e, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x13, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, - 0x61, 0x67, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x08, 0x6d, 0x61, 0x78, - 0x5f, 0x70, 0x69, 0x64, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x64, 0x73, 0x12, 0x5a, 0x0a, 0x16, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x52, 0x16, - 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x0e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x12, 0x3b, 0x0a, 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, - 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x52, - 0x0c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x41, 0x0a, - 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, - 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x4c, 0x6f, 0x67, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x52, 0x0e, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, - 0x12, 0x4d, 0x0a, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, - 0x1b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x12, - 0x4a, 0x0a, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, - 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x14, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, 0x5a, 0x0a, 0x0f, 0x4d, - 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x31, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, - 0x74, 0x72, 0x69, 0x63, 0x54, 0x61, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfe, 0x04, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x4a, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, - 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, - 0x6e, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x64, 0x5f, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x12, 0x33, 0x0a, 0x12, 0x66, - 0x69, 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, - 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x12, 0x66, 0x69, - 0x72, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, - 0x12, 0x32, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x17, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, - 0x73, 0x6b, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x05, 0x73, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, - 0x5f, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x09, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x12, 0x1b, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, - 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x2b, 0x0a, - 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, - 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, - 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x0f, 0x72, 0x65, - 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x05, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x10, 0x72, 0x65, 0x6a, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0d, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x4c, 0x0a, 0x05, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x00, - 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0b, 0x0a, - 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, 0x73, - 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, - 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, - 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, -}) +const file_task_proto_rawDesc = "" + + "\n" + + "\n" + + "task.proto\x12\x06models\x1a\tbbs.proto\x1a\ractions.proto\x1a\x1benvironment_variables.proto\x1a\x14security_group.proto\x1a\x17cached_dependency.proto\x1a\x12volume_mount.proto\x1a\rnetwork.proto\x1a\x1ccertificate_properties.proto\x1a\x11image_layer.proto\x1a\x14log_rate_limit.proto\x1a\x11metric_tags.proto\x1a\n" + + "file.proto\"\xa1\f\n" + + "\x13ProtoTaskDefinition\x12\x1c\n" + + "\aroot_fs\x18\x01 \x01(\tB\x03\xc0>\x01R\x06rootfs\x12D\n" + + "\x15environment_variables\x18\x02 \x03(\v2 .models.ProtoEnvironmentVariableR\x03env\x12+\n" + + "\x06action\x18\x03 \x01(\v2\x13.models.ProtoActionR\x06action\x12\x1d\n" + + "\adisk_mb\x18\x04 \x01(\x05B\x03\xc0>\x01R\adisk_mb\x12!\n" + + "\tmemory_mb\x18\x05 \x01(\x05B\x03\xc0>\x01R\tmemory_mb\x12#\n" + + "\n" + + "cpu_weight\x18\x06 \x01(\rB\x03\xc0>\x01R\n" + + "cpu_weight\x12#\n" + + "\n" + + "privileged\x18\a \x01(\bB\x03\xc0>\x01R\n" + + "privileged\x12#\n" + + "\n" + + "log_source\x18\b \x01(\tB\x03\xc0>\x01R\n" + + "log_source\x12\x1f\n" + + "\blog_guid\x18\t \x01(\tB\x03\xc0>\x01R\blog_guid\x12'\n" + + "\fmetrics_guid\x18\n" + + " \x01(\tB\x03\xc0>\x01R\fmetrics_guid\x12%\n" + + "\vresult_file\x18\v \x01(\tB\x03\xc0>\x01R\vresult_file\x128\n" + + "\x17completion_callback_url\x18\f \x01(\tR\x17completion_callback_url\x12\x1e\n" + + "\n" + + "annotation\x18\r \x01(\tR\n" + + "annotation\x12B\n" + + "\fegress_rules\x18\x0e \x03(\v2\x1e.models.ProtoSecurityGroupRuleR\fegress_rules\x12O\n" + + "\x13cached_dependencies\x18\x0f \x03(\v2\x1d.models.ProtoCachedDependencyR\x13cached_dependencies\x126\n" + + "\x14legacy_download_user\x18\x10 \x01(\tB\x02\x18\x01R\x14legacy_download_user\x12J\n" + + " trusted_system_certificates_path\x18\x11 \x01(\tR trusted_system_certificates_path\x12>\n" + + "\rvolume_mounts\x18\x12 \x03(\v2\x18.models.ProtoVolumeMountR\rvolume_mounts\x12.\n" + + "\anetwork\x18\x13 \x01(\v2\x14.models.ProtoNetworkR\anetwork\x12&\n" + + "\x0eplacement_tags\x18\x14 \x03(\tR\x0eplacement_tags\x12\x1f\n" + + "\bmax_pids\x18\x15 \x01(\x05B\x03\xc0>\x01R\bmax_pids\x12Z\n" + + "\x16certificate_properties\x18\x16 \x01(\v2\".models.ProtoCertificatePropertiesR\x16certificate_properties\x12+\n" + + "\x0eimage_username\x18\x17 \x01(\tB\x03\xc0>\x01R\x0eimage_username\x12+\n" + + "\x0eimage_password\x18\x18 \x01(\tB\x03\xc0>\x01R\x0eimage_password\x12;\n" + + "\fimage_layers\x18\x19 \x03(\v2\x17.models.ProtoImageLayerR\fimage_layers\x12A\n" + + "\x0elog_rate_limit\x18\x1a \x01(\v2\x19.models.ProtoLogRateLimitR\x0elog_rate_limit\x12M\n" + + "\vmetric_tags\x18\x1b \x03(\v2+.models.ProtoTaskDefinition.MetricTagsEntryR\vmetric_tags\x12J\n" + + "\x14volume_mounted_files\x18\x1c \x03(\v2\x11.models.ProtoFileB\x03\xc0>\x01R\x14volume_mounted_files\x1aZ\n" + + "\x0fMetricTagsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x121\n" + + "\x05value\x18\x02 \x01(\v2\x1b.models.ProtoMetricTagValueR\x05value:\x028\x01\"\xfe\x04\n" + + "\tProtoTask\x12J\n" + + "\x0ftask_definition\x18\x01 \x01(\v2\x1b.models.ProtoTaskDefinitionB\x03\xc0>\x01R\x0ftask_definition\x12!\n" + + "\ttask_guid\x18\x02 \x01(\tB\x03\xc0>\x01R\ttask_guid\x12\x1b\n" + + "\x06domain\x18\x03 \x01(\tB\x03\xc0>\x01R\x06domain\x12#\n" + + "\n" + + "created_at\x18\x04 \x01(\x03B\x03\xc0>\x01R\n" + + "created_at\x12#\n" + + "\n" + + "updated_at\x18\x05 \x01(\x03B\x03\xc0>\x01R\n" + + "updated_at\x123\n" + + "\x12first_completed_at\x18\x06 \x01(\x03B\x03\xc0>\x01R\x12first_completed_at\x122\n" + + "\x05state\x18\a \x01(\x0e2\x17.models.ProtoTask.StateB\x03\xc0>\x01R\x05state\x12\x1d\n" + + "\acell_id\x18\b \x01(\tB\x03\xc0>\x01R\acell_id\x12\x1b\n" + + "\x06result\x18\t \x01(\tB\x03\xc0>\x01R\x06result\x12\x1b\n" + + "\x06failed\x18\n" + + " \x01(\bB\x03\xc0>\x01R\x06failed\x12+\n" + + "\x0efailure_reason\x18\v \x01(\tB\x03\xc0>\x01R\x0efailure_reason\x12-\n" + + "\x0frejection_count\x18\f \x01(\x05B\x03\xc0>\x01R\x0frejection_count\x12/\n" + + "\x10rejection_reason\x18\r \x01(\tB\x03\xc0>\x01R\x10rejection_reason\"L\n" + + "\x05State\x12\v\n" + + "\aInvalid\x10\x00\x12\v\n" + + "\aPending\x10\x01\x12\v\n" + + "\aRunning\x10\x02\x12\r\n" + + "\tCompleted\x10\x03\x12\r\n" + + "\tResolving\x10\x04B\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_task_proto_rawDescOnce sync.Once diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index ec1335fd..6782ea1a 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index 75f17d9c..3e9b99bc 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: task_requests.proto package models @@ -740,109 +740,58 @@ func (x *ProtoTaskResponse) GetTask() *ProtoTask { var File_task_requests_proto protoreflect.FileDescriptor -var file_task_requests_proto_rawDesc = string([]byte{ - 0x0a, 0x13, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, - 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x46, 0x0a, 0x1a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, - 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, - 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0xa4, 0x01, 0x0a, 0x16, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x69, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x4a, 0x0a, 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, - 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, - 0x0f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, - 0x22, 0x59, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, - 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, - 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x07, - 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x22, 0x6b, 0x0a, 0x16, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, - 0x27, 0x0a, 0x0c, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x73, 0x68, 0x6f, 0x75, - 0x6c, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x6a, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x46, 0x61, 0x69, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, - 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, - 0x3a, 0x02, 0x18, 0x01, 0x22, 0x6c, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x6a, - 0x65, 0x63, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, - 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x12, 0x2f, 0x0a, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, - 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, - 0x52, 0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x73, - 0x6f, 0x6e, 0x22, 0x39, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x47, - 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, - 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0xc3, 0x01, - 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, - 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, - 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, - 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, - 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, - 0x01, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, - 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, - 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0xea, 0x01, 0x0a, 0x19, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, - 0x6b, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, - 0x67, 0x75, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x08, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x66, 0x61, 0x69, 0x6c, 0x65, - 0x64, 0x12, 0x2b, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, - 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0e, - 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x1b, - 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, - 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x61, - 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0a, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, - 0x22, 0x4f, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x07, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x69, - 0x64, 0x22, 0x67, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x12, 0x27, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x54, - 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3b, 0x0a, 0x16, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x79, 0x47, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x74, 0x61, - 0x73, 0x6b, 0x5f, 0x67, 0x75, 0x69, 0x64, 0x22, 0x64, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x05, - 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, - 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x22, 0x5a, - 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, - 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_task_requests_proto_rawDesc = "" + + "\n" + + "\x13task_requests.proto\x12\x06models\x1a\tbbs.proto\x1a\n" + + "task.proto\x1a\verror.proto\"F\n" + + "\x1aProtoTaskLifecycleResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\"\xa4\x01\n" + + "\x16ProtoDesireTaskRequest\x12J\n" + + "\x0ftask_definition\x18\x01 \x01(\v2\x1b.models.ProtoTaskDefinitionB\x03\xc0>\x01R\x0ftask_definition\x12!\n" + + "\ttask_guid\x18\x02 \x01(\tB\x03\xc0>\x01R\ttask_guid\x12\x1b\n" + + "\x06domain\x18\x03 \x01(\tB\x03\xc0>\x01R\x06domain\"Y\n" + + "\x15ProtoStartTaskRequest\x12!\n" + + "\ttask_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\ttask_guid\x12\x1d\n" + + "\acell_id\x18\x02 \x01(\tB\x03\xc0>\x01R\acell_id\"k\n" + + "\x16ProtoStartTaskResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12'\n" + + "\fshould_start\x18\x02 \x01(\bB\x03\xc0>\x01R\fshould_start\"j\n" + + "\x14ProtoFailTaskRequest\x12!\n" + + "\ttask_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\ttask_guid\x12+\n" + + "\x0efailure_reason\x18\x02 \x01(\tB\x03\xc0>\x01R\x0efailure_reason:\x02\x18\x01\"l\n" + + "\x16ProtoRejectTaskRequest\x12!\n" + + "\ttask_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\ttask_guid\x12/\n" + + "\x10rejection_reason\x18\x02 \x01(\tB\x03\xc0>\x01R\x10rejection_reason\"9\n" + + "\x14ProtoTaskGuidRequest\x12!\n" + + "\ttask_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\ttask_guid\"\xc3\x01\n" + + "\x18ProtoCompleteTaskRequest\x12!\n" + + "\ttask_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\ttask_guid\x12\x1d\n" + + "\acell_id\x18\x02 \x01(\tB\x03\xc0>\x01R\acell_id\x12\x1b\n" + + "\x06failed\x18\x03 \x01(\bB\x03\xc0>\x01R\x06failed\x12+\n" + + "\x0efailure_reason\x18\x04 \x01(\tB\x03\xc0>\x01R\x0efailure_reason\x12\x1b\n" + + "\x06result\x18\x05 \x01(\tB\x03\xc0>\x01R\x06result\"\xea\x01\n" + + "\x19ProtoTaskCallbackResponse\x12!\n" + + "\ttask_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\ttask_guid\x12\x1b\n" + + "\x06failed\x18\x02 \x01(\bB\x03\xc0>\x01R\x06failed\x12+\n" + + "\x0efailure_reason\x18\x03 \x01(\tB\x03\xc0>\x01R\x0efailure_reason\x12\x1b\n" + + "\x06result\x18\x04 \x01(\tB\x03\xc0>\x01R\x06result\x12\x1e\n" + + "\n" + + "annotation\x18\x05 \x01(\tR\n" + + "annotation\x12#\n" + + "\n" + + "created_at\x18\x06 \x01(\x03B\x03\xc0>\x01R\n" + + "created_at\"O\n" + + "\x11ProtoTasksRequest\x12\x1b\n" + + "\x06domain\x18\x01 \x01(\tB\x03\xc0>\x01R\x06domain\x12\x1d\n" + + "\acell_id\x18\x02 \x01(\tB\x03\xc0>\x01R\acell_id\"g\n" + + "\x12ProtoTasksResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12'\n" + + "\x05tasks\x18\x02 \x03(\v2\x11.models.ProtoTaskR\x05tasks\";\n" + + "\x16ProtoTaskByGuidRequest\x12!\n" + + "\ttask_guid\x18\x01 \x01(\tB\x03\xc0>\x01R\ttask_guid\"d\n" + + "\x11ProtoTaskResponse\x12(\n" + + "\x05error\x18\x01 \x01(\v2\x12.models.ProtoErrorR\x05error\x12%\n" + + "\x04task\x18\x02 \x01(\v2\x11.models.ProtoTaskR\x04taskB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_task_requests_proto_rawDescOnce sync.Once diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index a75347cf..d4684440 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 0632b328..52d830e4 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: volume_mount.proto package models @@ -188,36 +188,19 @@ func (x *ProtoVolumePlacement) GetDriverNames() []string { var File_volume_mount_proto protoreflect.FileDescriptor -var file_volume_mount_proto_rawDesc = string([]byte{ - 0x0a, 0x12, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x1a, 0x09, 0x62, 0x62, - 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5f, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x09, - 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x12, - 0x27, 0x0a, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xbd, 0x01, 0x0a, 0x10, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1b, 0x0a, - 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, - 0x3e, 0x01, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x29, 0x0a, 0x0d, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x64, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x5f, 0x64, 0x69, 0x72, 0x12, 0x17, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x36, - 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x53, 0x68, 0x61, - 0x72, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x06, - 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x04, - 0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x22, 0x3f, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x56, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x12, 0x27, 0x0a, 0x0c, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x03, 0xc0, 0x3e, 0x01, 0x52, 0x0c, 0x64, 0x72, 0x69, - 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x6f, 0x64, - 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x2e, 0x6f, - 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_volume_mount_proto_rawDesc = "" + + "\n" + + "\x12volume_mount.proto\x12\x06models\x1a\tbbs.proto\"_\n" + + "\x11ProtoSharedDevice\x12!\n" + + "\tvolume_id\x18\x01 \x01(\tB\x03\xc0>\x01R\tvolume_id\x12'\n" + + "\fmount_config\x18\x02 \x01(\tB\x03\xc0>\x01R\fmount_config\"\xbd\x01\n" + + "\x10ProtoVolumeMount\x12\x1b\n" + + "\x06driver\x18\x01 \x01(\tB\x03\xc0>\x01R\x06driver\x12)\n" + + "\rcontainer_dir\x18\x03 \x01(\tB\x03\xc0>\x01R\rcontainer_dir\x12\x17\n" + + "\x04mode\x18\x06 \x01(\tB\x03\xc0>\x01R\x04mode\x126\n" + + "\x06shared\x18\a \x01(\v2\x19.models.ProtoSharedDeviceB\x03\xc0>\x01R\x06sharedJ\x04\b\x02\x10\x03J\x04\b\x04\x10\x05J\x04\b\x05\x10\x06\"?\n" + + "\x14ProtoVolumePlacement\x12'\n" + + "\fdriver_names\x18\x01 \x03(\tB\x03\xc0>\x01R\fdriver_namesB\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var ( file_volume_mount_proto_rawDescOnce sync.Once diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 7c46b837..68cdfe7c 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.0 +// - protoc v5.29.4 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index a41eec62..e3c58f34 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.5 -// protoc v6.30.0 +// protoc-gen-go v1.36.6 +// protoc v5.29.4 // source: bbs.proto package main @@ -94,45 +94,16 @@ var ( var File_bbs_proto protoreflect.FileDescriptor -var file_bbs_proto_rawDesc = string([]byte{ - 0x0a, 0x09, 0x62, 0x62, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x62, 0x62, 0x73, - 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x3a, 0x52, 0x0a, 0x14, 0x62, 0x62, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x61, - 0x6c, 0x77, 0x61, 0x79, 0x73, 0x5f, 0x65, 0x6d, 0x69, 0x74, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, - 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x11, 0x62, 0x62, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x41, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x45, - 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, 0x3a, 0x43, 0x0a, 0x0c, 0x62, 0x62, 0x73, 0x5f, 0x62, 0x79, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xf2, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x62, 0x62, - 0x73, 0x42, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x56, 0x0a, 0x16, 0x62, - 0x62, 0x73, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, - 0x65, 0x71, 0x75, 0x61, 0x6c, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xfc, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x62, 0x62, 0x73, - 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x71, 0x75, 0x61, 0x6c, - 0x88, 0x01, 0x01, 0x3a, 0x49, 0x0a, 0x0f, 0x62, 0x62, 0x73, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x62, - 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x4d, - 0x0a, 0x11, 0x62, 0x62, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x18, 0x90, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x62, 0x62, 0x73, 0x44, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x5f, 0x0a, - 0x18, 0x62, 0x62, 0x73, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, - 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x0f, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x62, 0x73, 0x45, 0x6e, 0x75, 0x6d, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x22, - 0x5a, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, - 0x64, 0x72, 0x79, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x62, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -}) +const file_bbs_proto_rawDesc = "" + + "\n" + + "\tbbs.proto\x12\x03bbs\x1a google/protobuf/descriptor.proto:R\n" + + "\x14bbs_json_always_emit\x12\x1d.google.protobuf.FieldOptions\x18\xe8\a \x01(\bR\x11bbsJsonAlwaysEmit\x88\x01\x01:C\n" + + "\fbbs_by_value\x12\x1d.google.protobuf.FieldOptions\x18\xf2\a \x01(\bR\n" + + "bbsByValue\x88\x01\x01:V\n" + + "\x16bbs_exclude_from_equal\x12\x1d.google.protobuf.FieldOptions\x18\xfc\a \x01(\bR\x13bbsExcludeFromEqual\x88\x01\x01:I\n" + + "\x0fbbs_custom_type\x12\x1d.google.protobuf.FieldOptions\x18\x86\b \x01(\tR\rbbsCustomType\x88\x01\x01:M\n" + + "\x11bbs_default_value\x12\x1d.google.protobuf.FieldOptions\x18\x90\b \x01(\tR\x0fbbsDefaultValue\x88\x01\x01:_\n" + + "\x18bbs_enumvalue_customname\x12!.google.protobuf.EnumValueOptions\x18\xd0\x0f \x01(\tR\x16bbsEnumvalueCustomname\x88\x01\x01B\"Z code.cloudfoundry.org/bbs/modelsb\x06proto3" var file_bbs_proto_goTypes = []any{ (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions diff --git a/serviceclient/service_client.go b/serviceclient/service_client.go index 8b1106a4..3d968add 100644 --- a/serviceclient/service_client.go +++ b/serviceclient/service_client.go @@ -39,7 +39,7 @@ func (s *serviceClient) Cells(logger lager.Logger) (models.CellSet, error) { var cellSet = models.CellSet{} - resp, err := s.locketClient.FetchAll(context.Background(), &locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.TypeCode_PRESENCE}) + resp, err := s.locketClient.FetchAll(context.Background(), &locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.PRESENCE}) if err != nil { logger.Error("failed-to-fetch-cells-from-locket", err) return nil, err diff --git a/serviceclient/service_client_test.go b/serviceclient/service_client_test.go index d3f7f820..e1a66c5f 100644 --- a/serviceclient/service_client_test.go +++ b/serviceclient/service_client_test.go @@ -80,7 +80,7 @@ var _ = Describe("ServiceClient", func() { Expect(locketClient.FetchAllCallCount()).To(Equal(1)) _, request, _ := locketClient.FetchAllArgsForCall(0) - Expect(request).To(Equal(&locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.TypeCode_PRESENCE})) + Expect(request).To(Equal(&locketmodels.FetchAllRequest{Type: locketmodels.PresenceType, TypeCode: locketmodels.PRESENCE})) }) Context("when fetching the cells from the locket client fails", func() { From 56fdbc8c607ad19615de20dbe6a6d25a87d53cbf Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 31 Mar 2025 15:19:14 +0000 Subject: [PATCH 146/155] Regen protos with protoc v6.30.2 --- models/actions.pb.go | 2 +- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 2 +- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 2 +- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 2 +- models/cached_dependency.pb.go | 2 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 2 +- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 2 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 2 +- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 2 +- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 2 +- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 2 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 2 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 2 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 2 +- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 2 +- models/events_bbs.pb.go | 2 +- models/file.pb.go | 2 +- models/file_bbs.pb.go | 2 +- models/image_layer.pb.go | 2 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 2 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 2 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 2 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 2 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 2 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 2 +- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 2 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 2 +- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 2 +- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 2 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index 0a2a0db1..7e53a8d8 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: actions.proto package models diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 0be1d0a1..7f597876 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index d141cf09..1070706d 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 08996002..626a07f6 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index 249f2cc0..f775ece3 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: actual_lrp_requests.proto package models diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 0764cdca..74d3d36f 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 6b76ca11..9357c15b 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: bbs.proto package models diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 731e2822..6e60b6d5 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: cached_dependency.proto package models diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index f97b4fce..8636cb03 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index af6e1356..61f1f19f 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: cells.proto package models diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index 33b585ad..c17c7f92 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 37c83b47..19c394f9 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: certificate_properties.proto package models diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index 31c1ac27..e6364d13 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index fea5994f..185cb165 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: check_definition.proto package models diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 0a84ed9b..0c8099f9 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 4882f305..d15700d2 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index c6b99750..d3e53918 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 45e0ddeb..3667a8d4 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: desired_lrp_requests.proto package models diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index 4718eebc..c9a083cc 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index eda3b13e..7f1190c9 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: domain.proto package models diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index ed7b3bdd..6ea27655 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index 6f81227a..bdbf58e9 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: environment_variables.proto package models diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index 4f6f04d9..d83a724c 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index 8b000c01..37155781 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: error.proto package models diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index f67d6d77..50a27024 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index 721b342e..b4dc46de 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: evacuation.proto package models diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index 465efdec..ed647ee0 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index fb0c933d..26845e1f 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: events.proto package models diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index 3b938f37..c60fd750 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: events.proto package models diff --git a/models/file.pb.go b/models/file.pb.go index 7f86ba4c..f11a19ad 100644 --- a/models/file.pb.go +++ b/models/file.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: file.proto package models diff --git a/models/file_bbs.pb.go b/models/file_bbs.pb.go index 021fd0d1..3813a03c 100644 --- a/models/file_bbs.pb.go +++ b/models/file_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: file.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 496c3862..57739010 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: image_layer.proto package models diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index 2145b37b..f0d42fcc 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index f0e843b0..2d900990 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: log_rate_limit.proto package models diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index e97bbdd0..661e9dfa 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 713e2951..336fdbdf 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: metric_tags.proto package models diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 6e9aeac8..9bd06c1d 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 49c1953d..8e7cecfb 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: modification_tag.proto package models diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index ad981979..377a2190 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index 27fdd4fe..1539cf4a 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: network.proto package models diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 640551a5..0100b77f 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 2240134d..8ce23701 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: ping.proto package models diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index 011c0c01..de5945ea 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index d8d0fa57..c1c499f8 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: security_group.proto package models diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index aa321f31..327fc852 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index 38a0242a..a9e67f87 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: sidecar.proto package models diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index 119a85a5..a125e8e7 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index 7d2ee449..3b9d0f83 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: task.proto package models diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 6782ea1a..84e72bf6 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index 3e9b99bc..6791576b 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: task_requests.proto package models diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index d4684440..e9182a68 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 52d830e4..5c029ebe 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: volume_mount.proto package models diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index 68cdfe7c..aa576528 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v5.29.4 +// - protoc v6.30.2 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index e3c58f34..2f3ba6ed 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.4 +// protoc v6.30.2 // source: bbs.proto package main From 8bdabc94f7e5925d1e7631b66740e46f6a09fc44 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 1 Apr 2025 15:53:38 +0000 Subject: [PATCH 147/155] Update grpc templates to convert to/from Proto structs --- protoc-gen-go-bbs/templates.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protoc-gen-go-bbs/templates.go b/protoc-gen-go-bbs/templates.go index c2ceb06d..658a07d7 100644 --- a/protoc-gen-go-bbs/templates.go +++ b/protoc-gen-go-bbs/templates.go @@ -45,12 +45,12 @@ var clientInterfaceMethod = ` var clientMethod = ` func (c *{{.Service.Name | LowerFirst}}Client) {{.MethodName}}(ctx context.Context, in *{{.MethodName}}Request, opts ...grpc.CallOption) (*{{.MethodName}}Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new({{.MethodName}}Response) - err := c.cc.Invoke(ctx, {{.Service.Name}}_{{.MethodName}}_FullMethodName, in, out, cOpts...) + out := new(Proto{{.MethodName}}Response) + err := c.cc.Invoke(ctx, {{.Service.Name}}_{{.MethodName}}_FullMethodName, in.ToProto(), out, cOpts...) if err != nil { return nil, err } - return out, nil + return out.FromProto(), nil } ` From 3a39082dc26b7e61e4dc194bc5dd2641d59db49e Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Thu, 10 Apr 2025 17:36:49 +0000 Subject: [PATCH 148/155] Refactor emit* functions to conform to metrics documentation linter --- metrics/request_stat_metron_notifier.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/metrics/request_stat_metron_notifier.go b/metrics/request_stat_metron_notifier.go index 35677bca..09b88fe2 100644 --- a/metrics/request_stat_metron_notifier.go +++ b/metrics/request_stat_metron_notifier.go @@ -126,10 +126,10 @@ func (notifier *RequestStatMetronNotifier) emitMetrics(logger lager.Logger) { // Emit Default Metrics requestCountMetricValue := readAndResetMetric(¬ifier.requestMetricsAll.requestCount) - notifier.emitRequestCount(requestCounter, requestCountMetricValue, logger) + notifier.emitRequestCount("", requestCountMetricValue, logger) requestLatencyMetricValue := readAndResetMetric(¬ifier.requestMetricsAll.maxRequestLatency) - notifier.emitRequestLatency(requestLatencyDuration, requestLatencyMetricValue, logger) + notifier.emitRequestLatency("", requestLatencyMetricValue, logger) // Emit Route Specific/Advanced Metrics if !notifier.advancedMetricsConfig.Enabled { @@ -138,34 +138,34 @@ func (notifier *RequestStatMetronNotifier) emitMetrics(logger lager.Logger) { for _, route := range notifier.advancedMetricsConfig.RouteConfig.RequestCountRoutes { requestCountMetricValue := readAndResetMetric(¬ifier.requestMetricsPerRoute[route].requestCount) - notifier.emitRequestCount(requestCounter+"."+route, requestCountMetricValue, logger) + notifier.emitRequestCount("."+route, requestCountMetricValue, logger) } for _, route := range notifier.advancedMetricsConfig.RouteConfig.RequestLatencyRoutes { requestLatencyMetricValue := readAndResetMetric(¬ifier.requestMetricsPerRoute[route].maxRequestLatency) - notifier.emitRequestLatency(requestLatencyDuration+"."+route, requestLatencyMetricValue, logger) + notifier.emitRequestLatency("."+route, requestLatencyMetricValue, logger) } } func (notifier *RequestStatMetronNotifier) emitRequestLatency( - requestLatencyMetricName string, + postfix string, requestLatencyMetricValue time.Duration, logger lager.Logger) { logger.Info("sending-latency", lager.Data{"latency": requestLatencyMetricValue}) - metricErr := notifier.metronClient.SendDuration(requestLatencyMetricName, requestLatencyMetricValue) + metricErr := notifier.metronClient.SendDuration(requestLatencyDuration+postfix, requestLatencyMetricValue) if metricErr != nil { logger.Debug("failed-to-emit-request-latency-metric", lager.Data{"error": metricErr}) } } func (notifier *RequestStatMetronNotifier) emitRequestCount( - requestCountMetricName string, + postfix string, requestCountMetricValue uint64, logger lager.Logger) { logger.Info("adding-counter", lager.Data{"add": requestCountMetricValue}) - metricErr := notifier.metronClient.IncrementCounterWithDelta(requestCountMetricName, requestCountMetricValue) + metricErr := notifier.metronClient.IncrementCounterWithDelta(requestCounter+postfix, requestCountMetricValue) if metricErr != nil { logger.Debug("failed-to-emit-request-counter", lager.Data{"error": metricErr}) } From 66bcdfe30d221c7f4800ed8445bb9ef34f631467 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 14 Apr 2025 16:39:41 +0000 Subject: [PATCH 149/155] Update grpc templates to use Proto clients --- protoc-gen-go-bbs/templates.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/protoc-gen-go-bbs/templates.go b/protoc-gen-go-bbs/templates.go index 658a07d7..a6241f43 100644 --- a/protoc-gen-go-bbs/templates.go +++ b/protoc-gen-go-bbs/templates.go @@ -30,10 +30,12 @@ type {{.Service.Name}}Client interface { type {{.Service.Name | LowerFirst}}Client struct { cc grpc.ClientConnInterface + plc Proto{{.Service.Name}}Client } func New{{.Service.Name}}Client(cc grpc.ClientConnInterface) {{.Service.Name}}Client { - return &{{.Service.Name | LowerFirst}}Client{cc} + proto := NewProto{{.Service.Name}}Client(cc) + return &{{.Service.Name | LowerFirst}}Client{cc, proto} } {{.ClientMethods}} @@ -45,8 +47,7 @@ var clientInterfaceMethod = ` var clientMethod = ` func (c *{{.Service.Name | LowerFirst}}Client) {{.MethodName}}(ctx context.Context, in *{{.MethodName}}Request, opts ...grpc.CallOption) (*{{.MethodName}}Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Proto{{.MethodName}}Response) - err := c.cc.Invoke(ctx, {{.Service.Name}}_{{.MethodName}}_FullMethodName, in.ToProto(), out, cOpts...) + out, err := c.plc.Proto{{.MethodName}}(ctx, in.ToProto(), cOpts...) if err != nil { return nil, err } From 184cae382a7188bb4064448de7730b00f69aed6e Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Tue, 6 May 2025 17:41:24 +0000 Subject: [PATCH 150/155] Resolve staticcheck ST1023 (omit gmeasure.PrecisionBundle from declaration) --- models/performance/bbs_plugin_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/performance/bbs_plugin_test.go b/models/performance/bbs_plugin_test.go index 6afd247f..eaa1ae08 100644 --- a/models/performance/bbs_plugin_test.go +++ b/models/performance/bbs_plugin_test.go @@ -13,7 +13,7 @@ import ( ) var _ = Describe("BBS Plugin Conversion: Desired LRP", func() { - var nanosecondPrecision gmeasure.PrecisionBundle = gmeasure.Precision(1 * time.Nanosecond) + var nanosecondPrecision = gmeasure.Precision(1 * time.Nanosecond) var desiredLRP models.DesiredLRP desiredLRPjson := `{ From af32436d379871e505db30950918633697d327ca Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 9 May 2025 19:54:38 +0000 Subject: [PATCH 151/155] Remove ProtoLocketClient Call methods directly and do conversions --- protoc-gen-go-bbs/templates.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/protoc-gen-go-bbs/templates.go b/protoc-gen-go-bbs/templates.go index a6241f43..2bc5e7b3 100644 --- a/protoc-gen-go-bbs/templates.go +++ b/protoc-gen-go-bbs/templates.go @@ -30,12 +30,10 @@ type {{.Service.Name}}Client interface { type {{.Service.Name | LowerFirst}}Client struct { cc grpc.ClientConnInterface - plc Proto{{.Service.Name}}Client } func New{{.Service.Name}}Client(cc grpc.ClientConnInterface) {{.Service.Name}}Client { - proto := NewProto{{.Service.Name}}Client(cc) - return &{{.Service.Name | LowerFirst}}Client{cc, proto} + return &{{.Service.Name | LowerFirst}}Client{cc} } {{.ClientMethods}} @@ -47,7 +45,9 @@ var clientInterfaceMethod = ` var clientMethod = ` func (c *{{.Service.Name | LowerFirst}}Client) {{.MethodName}}(ctx context.Context, in *{{.MethodName}}Request, opts ...grpc.CallOption) (*{{.MethodName}}Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out, err := c.plc.Proto{{.MethodName}}(ctx, in.ToProto(), cOpts...) + out := new(Proto{{.MethodName}}Response) + protoIn := in.ToProto() + err := c.cc.Invoke(ctx, {{.Service.Name}}_{{.MethodName}}_FullMethodName, protoIn, out, cOpts...) if err != nil { return nil, err } @@ -104,18 +104,20 @@ var serverInterfaceMethod = ` var serverHandler = ` func _{{.Service.Name}}_{{.MethodName}}_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new({{.MethodName}}Request) - if err := dec(in); err != nil { + if err := dec(in.ToProto()); err != nil { return nil, err } if interceptor == nil { - return srv.({{.Service.Name}}Server).{{.MethodName}}(ctx, in) + response, err := srv.({{.Service.Name}}Server).{{.MethodName}}(ctx, in) + return response.ToProto(), err } info := &grpc.UnaryServerInfo{ Server: srv, FullMethod: {{.Service.Name}}_{{.MethodName}}_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.({{.Service.Name}}Server).{{.MethodName}}(ctx, req.(*{{.MethodName}}Request)) + response, err := srv.({{.Service.Name}}Server).{{.MethodName}}(ctx, req.(*{{.MethodName}}Request)) + return response.ToProto(), err } return interceptor(ctx, in, info, handler) } From 40607362e4564810e73e5fefd6303136eddfa28d Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Fri, 9 May 2025 20:27:20 +0000 Subject: [PATCH 152/155] Have to initialize in after dec(protoIn) has run --- protoc-gen-go-bbs/templates.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/protoc-gen-go-bbs/templates.go b/protoc-gen-go-bbs/templates.go index 2bc5e7b3..ec883989 100644 --- a/protoc-gen-go-bbs/templates.go +++ b/protoc-gen-go-bbs/templates.go @@ -103,10 +103,12 @@ var serverInterfaceMethod = ` var serverHandler = ` func _{{.Service.Name}}_{{.MethodName}}_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new({{.MethodName}}Request) - if err := dec(in.ToProto()); err != nil { + protoIn := new(Proto{{.MethodName}}Request) + if err := dec(protoIn); err != nil { return nil, err } + in := protoIn.FromProto() + if interceptor == nil { response, err := srv.({{.Service.Name}}Server).{{.MethodName}}(ctx, in) return response.ToProto(), err From c85c0fb4c3d60d9e39abaa812ef4df424e3d58ae Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 12 May 2025 14:06:34 +0000 Subject: [PATCH 153/155] Allow performance tests to be skipped easily Default to skipping performance tests --- models/performance/bbs_plugin_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/models/performance/bbs_plugin_test.go b/models/performance/bbs_plugin_test.go index eaa1ae08..6fcb6088 100644 --- a/models/performance/bbs_plugin_test.go +++ b/models/performance/bbs_plugin_test.go @@ -12,6 +12,8 @@ import ( "code.cloudfoundry.org/bbs/models" ) +var skipPerformanceTests = true + var _ = Describe("BBS Plugin Conversion: Desired LRP", func() { var nanosecondPrecision = gmeasure.Precision(1 * time.Nanosecond) var desiredLRP models.DesiredLRP @@ -335,6 +337,9 @@ var _ = Describe("BBS Plugin Conversion: Desired LRP", func() { Context("Conversion Performance Testing", func() { Context("Starting with a BBS Plugin Struct", func() { BeforeEach(func() { + if skipPerformanceTests { + Skip("Skipping Performnace Tests") + } desiredLRP = models.DesiredLRP{} err := json.Unmarshal([]byte(desiredLRPjson), &desiredLRP) Expect(err).NotTo(HaveOccurred()) @@ -368,6 +373,9 @@ var _ = Describe("BBS Plugin Conversion: Desired LRP", func() { Context("Starting with a Protobuf Struct", func() { var protoDesiredLRP *models.ProtoDesiredLRP BeforeEach(func() { + if skipPerformanceTests { + Skip("Skipping Performnace Tests") + } desiredLRP = models.DesiredLRP{} err := json.Unmarshal([]byte(desiredLRPjson), &desiredLRP) protoDesiredLRP = desiredLRP.ToProto() @@ -403,6 +411,9 @@ var _ = Describe("BBS Plugin Conversion: Desired LRP", func() { var binaryDesiredLRP []byte var protoDesiredLRP *models.ProtoDesiredLRP BeforeEach(func() { + if skipPerformanceTests { + Skip("Skipping Performnace Tests") + } desiredLRP = models.DesiredLRP{} err := json.Unmarshal([]byte(desiredLRPjson), &desiredLRP) protoDesiredLRP = desiredLRP.ToProto() From 95eb400a6522f041b23b17a79ade6a4a549f446a Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 12 May 2025 15:38:03 +0000 Subject: [PATCH 154/155] Fix scoping problem with reuse of task variable --- models/task_test.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/models/task_test.go b/models/task_test.go index 5f024d8a..3fb216e8 100644 --- a/models/task_test.go +++ b/models/task_test.go @@ -15,7 +15,7 @@ import ( var _ = Describe("Task", func() { var taskPayload string - var task models.Task + var initTask models.Task BeforeEach(func() { taskPayload = `{ @@ -117,30 +117,34 @@ var _ = Describe("Task", func() { } }` - err := json.Unmarshal([]byte(taskPayload), &task) + err := json.Unmarshal([]byte(taskPayload), &initTask) Expect(err).NotTo(HaveOccurred()) }) Describe("serialization", func() { It("successfully round trips through json and protobuf", func() { - jsonSerialization, err := json.Marshal(task) + var serializeTask models.Task + err := json.Unmarshal([]byte(taskPayload), &serializeTask) + Expect(err).NotTo(HaveOccurred()) + + jsonSerialization, err := json.Marshal(serializeTask) Expect(err).NotTo(HaveOccurred()) Expect(jsonSerialization).To(MatchJSON(taskPayload)) - protoSerialization, err := proto.Marshal(task.ToProto()) + protoSerialization, err := proto.Marshal(serializeTask.ToProto()) Expect(err).NotTo(HaveOccurred()) var protoDeserialization models.ProtoTask err = proto.Unmarshal(protoSerialization, &protoDeserialization) Expect(err).NotTo(HaveOccurred()) - Expect(*protoDeserialization.FromProto()).To(Equal(task)) + Expect(*protoDeserialization.FromProto()).To(Equal(serializeTask)) }) }) Describe("Validate", func() { Context("when the task has a domain, valid guid, stack, and valid action", func() { It("is valid", func() { - task = models.Task{ + validateTask := models.Task{ Domain: "some-domain", TaskGuid: "some-task-guid", TaskDefinition: &models.TaskDefinition{ @@ -152,14 +156,14 @@ var _ = Describe("Task", func() { }, } - err := task.Validate() + err := validateTask.Validate() Expect(err).NotTo(HaveOccurred()) }) }) Context("when the task GUID is present but invalid", func() { It("returns an error indicating so", func() { - task = models.Task{ + validateTask := models.Task{ Domain: "some-domain", TaskGuid: "invalid/guid", TaskDefinition: &models.TaskDefinition{ @@ -171,7 +175,7 @@ var _ = Describe("Task", func() { }, } - err := task.Validate() + err := validateTask.Validate() Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("task_guid")) }) From af26f0772cead290cc1b5c20a2727e16d6408267 Mon Sep 17 00:00:00 2001 From: Brandon Roberson Date: Mon, 30 Jun 2025 17:43:56 +0000 Subject: [PATCH 155/155] Regen protos --- models/actions.pb.go | 2 +- models/actions_bbs.pb.go | 2 +- models/actual_lrp.pb.go | 2 +- models/actual_lrp_bbs.pb.go | 2 +- models/actual_lrp_requests.pb.go | 2 +- models/actual_lrp_requests_bbs.pb.go | 2 +- models/bbs.pb.go | 2 +- models/cached_dependency.pb.go | 2 +- models/cached_dependency_bbs.pb.go | 2 +- models/cells.pb.go | 2 +- models/cells_bbs.pb.go | 2 +- models/certificate_properties.pb.go | 2 +- models/certificate_properties_bbs.pb.go | 2 +- models/check_definition.pb.go | 2 +- models/check_definition_bbs.pb.go | 2 +- models/desired_lrp.pb.go | 2 +- models/desired_lrp_bbs.pb.go | 2 +- models/desired_lrp_requests.pb.go | 2 +- models/desired_lrp_requests_bbs.pb.go | 2 +- models/domain.pb.go | 2 +- models/domain_bbs.pb.go | 2 +- models/environment_variables.pb.go | 2 +- models/environment_variables_bbs.pb.go | 2 +- models/error.pb.go | 2 +- models/error_bbs.pb.go | 2 +- models/evacuation.pb.go | 2 +- models/evacuation_bbs.pb.go | 2 +- models/events.pb.go | 2 +- models/events_bbs.pb.go | 2 +- models/file.pb.go | 2 +- models/file_bbs.pb.go | 2 +- models/image_layer.pb.go | 2 +- models/image_layer_bbs.pb.go | 2 +- models/log_rate_limit.pb.go | 2 +- models/log_rate_limit_bbs.pb.go | 2 +- models/metric_tags.pb.go | 2 +- models/metric_tags_bbs.pb.go | 2 +- models/modification_tag.pb.go | 2 +- models/modification_tag_bbs.pb.go | 2 +- models/network.pb.go | 2 +- models/network_bbs.pb.go | 2 +- models/ping.pb.go | 2 +- models/ping_bbs.pb.go | 2 +- models/security_group.pb.go | 2 +- models/security_group_bbs.pb.go | 2 +- models/sidecar.pb.go | 2 +- models/sidecar_bbs.pb.go | 2 +- models/task.pb.go | 2 +- models/task_bbs.pb.go | 2 +- models/task_requests.pb.go | 2 +- models/task_requests_bbs.pb.go | 2 +- models/volume_mount.pb.go | 2 +- models/volume_mount_bbs.pb.go | 2 +- protoc-gen-go-bbs/bbs.pb.go | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/models/actions.pb.go b/models/actions.pb.go index 7e53a8d8..0a49fae7 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: actions.proto package models diff --git a/models/actions_bbs.pb.go b/models/actions_bbs.pb.go index 7f597876..7c451576 100644 --- a/models/actions_bbs.pb.go +++ b/models/actions_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: actions.proto package models diff --git a/models/actual_lrp.pb.go b/models/actual_lrp.pb.go index 1070706d..602e5cd1 100644 --- a/models/actual_lrp.pb.go +++ b/models/actual_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_bbs.pb.go b/models/actual_lrp_bbs.pb.go index 626a07f6..81957c06 100644 --- a/models/actual_lrp_bbs.pb.go +++ b/models/actual_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: actual_lrp.proto package models diff --git a/models/actual_lrp_requests.pb.go b/models/actual_lrp_requests.pb.go index f775ece3..9c2135e6 100644 --- a/models/actual_lrp_requests.pb.go +++ b/models/actual_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: actual_lrp_requests.proto package models diff --git a/models/actual_lrp_requests_bbs.pb.go b/models/actual_lrp_requests_bbs.pb.go index 74d3d36f..f407513d 100644 --- a/models/actual_lrp_requests_bbs.pb.go +++ b/models/actual_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: actual_lrp_requests.proto package models diff --git a/models/bbs.pb.go b/models/bbs.pb.go index 9357c15b..50a4cab3 100644 --- a/models/bbs.pb.go +++ b/models/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: bbs.proto package models diff --git a/models/cached_dependency.pb.go b/models/cached_dependency.pb.go index 6e60b6d5..b874bd65 100644 --- a/models/cached_dependency.pb.go +++ b/models/cached_dependency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: cached_dependency.proto package models diff --git a/models/cached_dependency_bbs.pb.go b/models/cached_dependency_bbs.pb.go index 8636cb03..a7dafdc7 100644 --- a/models/cached_dependency_bbs.pb.go +++ b/models/cached_dependency_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: cached_dependency.proto package models diff --git a/models/cells.pb.go b/models/cells.pb.go index 61f1f19f..a8a3164d 100644 --- a/models/cells.pb.go +++ b/models/cells.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: cells.proto package models diff --git a/models/cells_bbs.pb.go b/models/cells_bbs.pb.go index c17c7f92..2be018f5 100644 --- a/models/cells_bbs.pb.go +++ b/models/cells_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: cells.proto package models diff --git a/models/certificate_properties.pb.go b/models/certificate_properties.pb.go index 19c394f9..70429688 100644 --- a/models/certificate_properties.pb.go +++ b/models/certificate_properties.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: certificate_properties.proto package models diff --git a/models/certificate_properties_bbs.pb.go b/models/certificate_properties_bbs.pb.go index e6364d13..791c5184 100644 --- a/models/certificate_properties_bbs.pb.go +++ b/models/certificate_properties_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: certificate_properties.proto package models diff --git a/models/check_definition.pb.go b/models/check_definition.pb.go index 185cb165..47ea15d0 100644 --- a/models/check_definition.pb.go +++ b/models/check_definition.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: check_definition.proto package models diff --git a/models/check_definition_bbs.pb.go b/models/check_definition_bbs.pb.go index 0c8099f9..ff3a0596 100644 --- a/models/check_definition_bbs.pb.go +++ b/models/check_definition_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: check_definition.proto package models diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index d15700d2..9ebc041d 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_bbs.pb.go b/models/desired_lrp_bbs.pb.go index d3e53918..fd781d9d 100644 --- a/models/desired_lrp_bbs.pb.go +++ b/models/desired_lrp_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: desired_lrp.proto package models diff --git a/models/desired_lrp_requests.pb.go b/models/desired_lrp_requests.pb.go index 3667a8d4..93d40094 100644 --- a/models/desired_lrp_requests.pb.go +++ b/models/desired_lrp_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: desired_lrp_requests.proto package models diff --git a/models/desired_lrp_requests_bbs.pb.go b/models/desired_lrp_requests_bbs.pb.go index c9a083cc..f293f7fb 100644 --- a/models/desired_lrp_requests_bbs.pb.go +++ b/models/desired_lrp_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: desired_lrp_requests.proto package models diff --git a/models/domain.pb.go b/models/domain.pb.go index 7f1190c9..8d66ef35 100644 --- a/models/domain.pb.go +++ b/models/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: domain.proto package models diff --git a/models/domain_bbs.pb.go b/models/domain_bbs.pb.go index 6ea27655..880722e8 100644 --- a/models/domain_bbs.pb.go +++ b/models/domain_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: domain.proto package models diff --git a/models/environment_variables.pb.go b/models/environment_variables.pb.go index bdbf58e9..b1679266 100644 --- a/models/environment_variables.pb.go +++ b/models/environment_variables.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: environment_variables.proto package models diff --git a/models/environment_variables_bbs.pb.go b/models/environment_variables_bbs.pb.go index d83a724c..fc19804f 100644 --- a/models/environment_variables_bbs.pb.go +++ b/models/environment_variables_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: environment_variables.proto package models diff --git a/models/error.pb.go b/models/error.pb.go index 37155781..00fe87c6 100644 --- a/models/error.pb.go +++ b/models/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: error.proto package models diff --git a/models/error_bbs.pb.go b/models/error_bbs.pb.go index 50a27024..47d7e022 100644 --- a/models/error_bbs.pb.go +++ b/models/error_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: error.proto package models diff --git a/models/evacuation.pb.go b/models/evacuation.pb.go index b4dc46de..09667c78 100644 --- a/models/evacuation.pb.go +++ b/models/evacuation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: evacuation.proto package models diff --git a/models/evacuation_bbs.pb.go b/models/evacuation_bbs.pb.go index ed647ee0..92cf5ada 100644 --- a/models/evacuation_bbs.pb.go +++ b/models/evacuation_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: evacuation.proto package models diff --git a/models/events.pb.go b/models/events.pb.go index 26845e1f..1b50f484 100644 --- a/models/events.pb.go +++ b/models/events.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: events.proto package models diff --git a/models/events_bbs.pb.go b/models/events_bbs.pb.go index c60fd750..8c541dab 100644 --- a/models/events_bbs.pb.go +++ b/models/events_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: events.proto package models diff --git a/models/file.pb.go b/models/file.pb.go index f11a19ad..d501ab7d 100644 --- a/models/file.pb.go +++ b/models/file.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: file.proto package models diff --git a/models/file_bbs.pb.go b/models/file_bbs.pb.go index 3813a03c..f0e2e1fa 100644 --- a/models/file_bbs.pb.go +++ b/models/file_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: file.proto package models diff --git a/models/image_layer.pb.go b/models/image_layer.pb.go index 57739010..9355d1ed 100644 --- a/models/image_layer.pb.go +++ b/models/image_layer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: image_layer.proto package models diff --git a/models/image_layer_bbs.pb.go b/models/image_layer_bbs.pb.go index f0d42fcc..e3c9e52b 100644 --- a/models/image_layer_bbs.pb.go +++ b/models/image_layer_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: image_layer.proto package models diff --git a/models/log_rate_limit.pb.go b/models/log_rate_limit.pb.go index 2d900990..fa721329 100644 --- a/models/log_rate_limit.pb.go +++ b/models/log_rate_limit.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: log_rate_limit.proto package models diff --git a/models/log_rate_limit_bbs.pb.go b/models/log_rate_limit_bbs.pb.go index 661e9dfa..8c989c28 100644 --- a/models/log_rate_limit_bbs.pb.go +++ b/models/log_rate_limit_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: log_rate_limit.proto package models diff --git a/models/metric_tags.pb.go b/models/metric_tags.pb.go index 336fdbdf..859ccdbd 100644 --- a/models/metric_tags.pb.go +++ b/models/metric_tags.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: metric_tags.proto package models diff --git a/models/metric_tags_bbs.pb.go b/models/metric_tags_bbs.pb.go index 9bd06c1d..bbe5d3e5 100644 --- a/models/metric_tags_bbs.pb.go +++ b/models/metric_tags_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: metric_tags.proto package models diff --git a/models/modification_tag.pb.go b/models/modification_tag.pb.go index 8e7cecfb..9bc08d13 100644 --- a/models/modification_tag.pb.go +++ b/models/modification_tag.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: modification_tag.proto package models diff --git a/models/modification_tag_bbs.pb.go b/models/modification_tag_bbs.pb.go index 377a2190..a312da0d 100644 --- a/models/modification_tag_bbs.pb.go +++ b/models/modification_tag_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: modification_tag.proto package models diff --git a/models/network.pb.go b/models/network.pb.go index 1539cf4a..d52d6e39 100644 --- a/models/network.pb.go +++ b/models/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: network.proto package models diff --git a/models/network_bbs.pb.go b/models/network_bbs.pb.go index 0100b77f..33cbba46 100644 --- a/models/network_bbs.pb.go +++ b/models/network_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: network.proto package models diff --git a/models/ping.pb.go b/models/ping.pb.go index 8ce23701..bfd91c26 100644 --- a/models/ping.pb.go +++ b/models/ping.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: ping.proto package models diff --git a/models/ping_bbs.pb.go b/models/ping_bbs.pb.go index de5945ea..8e730f66 100644 --- a/models/ping_bbs.pb.go +++ b/models/ping_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: ping.proto package models diff --git a/models/security_group.pb.go b/models/security_group.pb.go index c1c499f8..afd5210d 100644 --- a/models/security_group.pb.go +++ b/models/security_group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: security_group.proto package models diff --git a/models/security_group_bbs.pb.go b/models/security_group_bbs.pb.go index 327fc852..608de7b7 100644 --- a/models/security_group_bbs.pb.go +++ b/models/security_group_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: security_group.proto package models diff --git a/models/sidecar.pb.go b/models/sidecar.pb.go index a9e67f87..f029c788 100644 --- a/models/sidecar.pb.go +++ b/models/sidecar.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: sidecar.proto package models diff --git a/models/sidecar_bbs.pb.go b/models/sidecar_bbs.pb.go index a125e8e7..61696e29 100644 --- a/models/sidecar_bbs.pb.go +++ b/models/sidecar_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: sidecar.proto package models diff --git a/models/task.pb.go b/models/task.pb.go index 3b9d0f83..3c789021 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: task.proto package models diff --git a/models/task_bbs.pb.go b/models/task_bbs.pb.go index 84e72bf6..37a5da11 100644 --- a/models/task_bbs.pb.go +++ b/models/task_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: task.proto package models diff --git a/models/task_requests.pb.go b/models/task_requests.pb.go index 6791576b..83037e98 100644 --- a/models/task_requests.pb.go +++ b/models/task_requests.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: task_requests.proto package models diff --git a/models/task_requests_bbs.pb.go b/models/task_requests_bbs.pb.go index e9182a68..e78f34c7 100644 --- a/models/task_requests_bbs.pb.go +++ b/models/task_requests_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: task_requests.proto package models diff --git a/models/volume_mount.pb.go b/models/volume_mount.pb.go index 5c029ebe..21431986 100644 --- a/models/volume_mount.pb.go +++ b/models/volume_mount.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: volume_mount.proto package models diff --git a/models/volume_mount_bbs.pb.go b/models/volume_mount_bbs.pb.go index aa576528..7d033710 100644 --- a/models/volume_mount_bbs.pb.go +++ b/models/volume_mount_bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-bbs. DO NOT EDIT. // versions: // - protoc-gen-go-bbs v0.0.1 -// - protoc v6.30.2 +// - protoc v6.31.1 // source: volume_mount.proto package models diff --git a/protoc-gen-go-bbs/bbs.pb.go b/protoc-gen-go-bbs/bbs.pb.go index 2f3ba6ed..92f80438 100644 --- a/protoc-gen-go-bbs/bbs.pb.go +++ b/protoc-gen-go-bbs/bbs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v6.30.2 +// protoc v6.31.1 // source: bbs.proto package main