diff --git a/README.md b/README.md index 65345abe..d54bc9c2 100644 --- a/README.md +++ b/README.md @@ -199,26 +199,6 @@ We consider ourselves "internet plumbers" of sort - so the name seemed to fit :) NOTE: If your messaging tech is not supported - submit an issue and we'll do our best to make it happen! -## Dynamic Replay Destination - -Plumber can now act as a replay destination. Dynamic replay mode allows you to -run an instance of plumber, on your local network, which will then be available -in the Batch platform as a _replay destination_. - -This mitigates the need make firewall changes to replay messages from a Batch -collection back to your message bus. - -See https://docs.batch.sh/what-are/what-are-destinations/plumber-as-a-destination -for full documentation - -## High Availability -When running `plumber` in relay mode in production, you will want to run at -least 2 instances of `plumber` - that way updates, maintenances or unexpected -problems will not interfere with data collection. - -You can achieve H/A by launching 2+ instances of plumber with identical -configurations. - ### Kafka You need to ensure that you are using the same consumer group on all plumber instances. @@ -231,6 +211,24 @@ In order to flip a boolean flag to `false`, prepend `--no` to the flag. ie. `--queue-declare` is `true` by default. To make it false, use `--no-queue-declare`. +## Tunnels + +`plumber` can now act as a replay destination (tunnel). Tunnel mode allows you to +run an instance of plumber, on your local network, which will then be available +in the Batch platform as a _replay destination_. + +This mitigates the need make firewall changes to replay messages from a Batch +collection back to your message bus. + +See https://docs.batch.sh/what-are/what-are-destinations/plumber-as-a-destination +for full documentation. + +## High Performance & High Availability +`plumber` comes with a "server" mode which will cause plumber to operate as a +highly available cluster. + +You can read more about "server mode" [here](https://docs.batch.sh/plumber/server-mode). + ## Acknowledgments **Huge** shoutout to [jhump](https://github.com/jhump) and for his excellent diff --git a/go.mod b/go.mod index 3d469831..0f31b2a1 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/batchcorp/kong v0.2.17-batch-fix github.com/batchcorp/natty v0.0.16 github.com/batchcorp/pgoutput v0.3.2 - github.com/batchcorp/plumber-schemas v0.0.149 + github.com/batchcorp/plumber-schemas v0.0.153 github.com/batchcorp/rabbit v0.1.17 github.com/dustin/go-humanize v1.0.0 // indirect github.com/eclipse/paho.mqtt.golang v1.2.0 diff --git a/go.sum b/go.sum index 493f73c5..40f1ddf7 100644 --- a/go.sum +++ b/go.sum @@ -151,6 +151,10 @@ github.com/batchcorp/plumber-schemas v0.0.147 h1:xNwKH/UijDE1av61M6phT1hULa78RFA github.com/batchcorp/plumber-schemas v0.0.147/go.mod h1:YULMKnfZ8X7tglTfUzKXhWc1Bfq6dy5ysIQbvsbCOkY= github.com/batchcorp/plumber-schemas v0.0.149 h1:1mJkLS+LW6azzXI15svMys4CW30IlCkT4H73rjIi/3o= github.com/batchcorp/plumber-schemas v0.0.149/go.mod h1:YULMKnfZ8X7tglTfUzKXhWc1Bfq6dy5ysIQbvsbCOkY= +github.com/batchcorp/plumber-schemas v0.0.151 h1:NoZdrJJkNns7QgAHoum5Q4ooPEz52lvxUO5/J3IuiLE= +github.com/batchcorp/plumber-schemas v0.0.151/go.mod h1:YULMKnfZ8X7tglTfUzKXhWc1Bfq6dy5ysIQbvsbCOkY= +github.com/batchcorp/plumber-schemas v0.0.153 h1:CoSNwiy8l6sNOOfWzRyr3APag+A/7BLL5PmZcv2ZKxo= +github.com/batchcorp/plumber-schemas v0.0.153/go.mod h1:YULMKnfZ8X7tglTfUzKXhWc1Bfq6dy5ysIQbvsbCOkY= github.com/batchcorp/rabbit v0.1.17 h1:dui1W7FLTrNxyVlDN+G+6d8LXz8HBhVAcUethXql9vQ= github.com/batchcorp/rabbit v0.1.17/go.mod h1:2nplLhzjXrddaHWxrnduZS6tFwpF9QSpJ0a2A3erNYw= github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= diff --git a/plumber/cli_manage_relay.go b/plumber/cli_manage_relay.go index b370a4e7..78a25abe 100644 --- a/plumber/cli_manage_relay.go +++ b/plumber/cli_manage_relay.go @@ -109,7 +109,7 @@ func (p *Plumber) HandleCreateRelayCmd(ctx context.Context, client protos.Plumbe // Create relay options from CLI opts relayOpts, err := generateRelayOptionsForManageCreate(p.CLIOptions) if err != nil { - return errors.Wrap(err, "failed to generate connection options") + return errors.Wrap(err, "failed to generate relay options") } resp, err := client.CreateRelay(ctx, &protos.CreateRelayRequest{ @@ -147,8 +147,6 @@ func generateRelayOptionsForManageCreate(cliOpts *opts.CLIOptions) (*opts.RelayO // taken care of by the Merge function. backendName := strings.Replace(cliOpts.Global.XBackend, "-", "", -1) - relayOpts.Kafka = &opts.RelayGroupKafkaOptions{Args: cliOpts.Manage.Create.Relay.Kafka} - if err := opts.MergeRelayOptions(backendName, relayOpts, cliOpts.Manage.Create.Relay); err != nil { return nil, errors.Wrap(err, "unable to merge relay options") } diff --git a/plumber/cli_manage_tunnel.go b/plumber/cli_manage_tunnel.go index 940c2a28..fc92e978 100644 --- a/plumber/cli_manage_tunnel.go +++ b/plumber/cli_manage_tunnel.go @@ -2,9 +2,11 @@ package plumber import ( "context" + "strings" "github.com/batchcorp/plumber-schemas/build/go/protos" "github.com/batchcorp/plumber-schemas/build/go/protos/common" + "github.com/batchcorp/plumber-schemas/build/go/protos/opts" "github.com/pkg/errors" ) @@ -46,8 +48,27 @@ func (p *Plumber) HandleGetAllTunnelsCmd(ctx context.Context, client protos.Plum return nil } -// TODO: Implement func (p *Plumber) HandleCreateTunnelCmd(ctx context.Context, client protos.PlumberServerClient) error { + // Create tunnel options from CLI opts + tunnelOpts, err := generateTunnelOptionsForManageCreate(p.CLIOptions) + if err != nil { + return errors.Wrap(err, "failed to generate tunnel options") + } + + resp, err := client.CreateTunnel(ctx, &protos.CreateTunnelRequest{ + Auth: &common.Auth{ + Token: p.CLIOptions.Manage.GlobalOptions.ManageToken, + }, + Opts: tunnelOpts, + }) + + if err != nil { + p.displayJSON(map[string]string{"error": err.Error()}) + return nil + } + + p.displayProtobuf(resp) + return nil } @@ -107,3 +128,31 @@ func (p *Plumber) HandleResumeTunnelCmd(ctx context.Context, client protos.Plumb return nil } + +func generateTunnelOptionsForManageCreate(cliOpts *opts.CLIOptions) (*opts.TunnelOptions, error) { + tunnelOpts := &opts.TunnelOptions{ + ApiToken: cliOpts.Manage.Create.Tunnel.TunnelToken, + ConnectionId: cliOpts.Manage.Create.Tunnel.ConnectionId, + XGrpcAddress: cliOpts.Manage.Create.Tunnel.XTunnelAddress, + XGrpcTimeoutSeconds: cliOpts.Manage.Create.Tunnel.XTunnelTimeoutSeconds, + XGrpcInsecure: cliOpts.Manage.Create.Tunnel.XTunnelInsecure, + Name: cliOpts.Manage.Create.Tunnel.Name, + } + + // We need to assign the CLI opts to the correct backend field in the request. + // As in, cliOpts.Manage.Create.Tunnel.Kafka needs to be assigned to tunnelOpts.Kafka + // (if kafka was specified). To do this, we will rely on a helper func that + // is generated via code-gen in plumber-schemas. + + // Some backends have a dash, remove it; all further normalization will be + // taken care of by the Merge function. + backendName := strings.Replace(cliOpts.Global.XBackend, "-", "", -1) + + tunnelOpts.Kafka = &opts.TunnelGroupKafkaOptions{Args: cliOpts.Manage.Create.Tunnel.Kafka} + + if err := opts.MergeTunnelOptions(backendName, tunnelOpts, cliOpts.Manage.Create.Tunnel); err != nil { + return nil, errors.Wrap(err, "unable to merge relay options") + } + + return tunnelOpts, nil +} diff --git a/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/batch_connection_options.pb.go b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/batch_connection_options.pb.go index bfe12ba7..88cf5a33 100644 --- a/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/batch_connection_options.pb.go +++ b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/batch_connection_options.pb.go @@ -8,32 +8,14 @@ import ( func GenerateConnOpts(backend string, connArgs interface{}) (IsConnectionOptions_Conn, bool) { switch backend { - case "activemq": - asserted, ok := connArgs.(args.ActiveMQConn) - if !ok { - return nil, false - } - - return &ConnectionOptions_ActiveMq{ - ActiveMq: &asserted, - }, true - case "nsq": - asserted, ok := connArgs.(args.NSQConn) - if !ok { - return nil, false - } - - return &ConnectionOptions_Nsq{ - Nsq: &asserted, - }, true - case "gcppubsub": - asserted, ok := connArgs.(args.GCPPubSubConn) + case "pulsar": + asserted, ok := connArgs.(args.PulsarConn) if !ok { return nil, false } - return &ConnectionOptions_GcpPubsub{ - GcpPubsub: &asserted, + return &ConnectionOptions_Pulsar{ + Pulsar: &asserted, }, true case "awskinesis": asserted, ok := connArgs.(args.AWSKinesisConn) @@ -44,113 +26,113 @@ func GenerateConnOpts(backend string, connArgs interface{}) (IsConnectionOptions return &ConnectionOptions_AwsKinesis{ AwsKinesis: &asserted, }, true - case "natsstreaming": - asserted, ok := connArgs.(args.NatsStreamingConn) + case "mongo": + asserted, ok := connArgs.(args.MongoConn) if !ok { return nil, false } - return &ConnectionOptions_NatsStreaming{ - NatsStreaming: &asserted, + return &ConnectionOptions_Mongo{ + Mongo: &asserted, }, true - case "rabbit": - asserted, ok := connArgs.(args.RabbitConn) + case "nsq": + asserted, ok := connArgs.(args.NSQConn) if !ok { return nil, false } - return &ConnectionOptions_Rabbit{ - Rabbit: &asserted, + return &ConnectionOptions_Nsq{ + Nsq: &asserted, }, true - case "rabbitstreams": - asserted, ok := connArgs.(args.RabbitStreamsConn) + case "redisstreams": + asserted, ok := connArgs.(args.RedisStreamsConn) if !ok { return nil, false } - return &ConnectionOptions_RabbitStreams{ - RabbitStreams: &asserted, + return &ConnectionOptions_RedisStreams{ + RedisStreams: &asserted, }, true - case "redispubsub": - asserted, ok := connArgs.(args.RedisPubSubConn) + case "azureeventhub": + asserted, ok := connArgs.(args.AzureEventHubConn) if !ok { return nil, false } - return &ConnectionOptions_RedisPubsub{ - RedisPubsub: &asserted, + return &ConnectionOptions_AzureEventHub{ + AzureEventHub: &asserted, }, true - case "azureeventhub": - asserted, ok := connArgs.(args.AzureEventHubConn) + case "azureservicebus": + asserted, ok := connArgs.(args.AzureServiceBusConn) if !ok { return nil, false } - return &ConnectionOptions_AzureEventHub{ - AzureEventHub: &asserted, + return &ConnectionOptions_AzureServiceBus{ + AzureServiceBus: &asserted, }, true - case "awssns": - asserted, ok := connArgs.(args.AWSSNSConn) + case "kubemqqueue": + asserted, ok := connArgs.(args.KubeMQQueueConn) if !ok { return nil, false } - return &ConnectionOptions_AwsSns{ - AwsSns: &asserted, + return &ConnectionOptions_KubemqQueue{ + KubemqQueue: &asserted, }, true - case "mongo": - asserted, ok := connArgs.(args.MongoConn) + case "activemq": + asserted, ok := connArgs.(args.ActiveMQConn) if !ok { return nil, false } - return &ConnectionOptions_Mongo{ - Mongo: &asserted, + return &ConnectionOptions_ActiveMq{ + ActiveMq: &asserted, }, true - case "nats": - asserted, ok := connArgs.(args.NatsConn) + case "natsstreaming": + asserted, ok := connArgs.(args.NatsStreamingConn) if !ok { return nil, false } - return &ConnectionOptions_Nats{ - Nats: &asserted, + return &ConnectionOptions_NatsStreaming{ + NatsStreaming: &asserted, }, true - case "pulsar": - asserted, ok := connArgs.(args.PulsarConn) + case "mqtt": + asserted, ok := connArgs.(args.MQTTConn) if !ok { return nil, false } - return &ConnectionOptions_Pulsar{ - Pulsar: &asserted, + return &ConnectionOptions_Mqtt{ + Mqtt: &asserted, }, true - case "natsjetstream": - asserted, ok := connArgs.(args.NatsJetstreamConn) + case "gcppubsub": + asserted, ok := connArgs.(args.GCPPubSubConn) if !ok { return nil, false } - return &ConnectionOptions_NatsJetstream{ - NatsJetstream: &asserted, + return &ConnectionOptions_GcpPubsub{ + GcpPubsub: &asserted, }, true - case "mqtt": - asserted, ok := connArgs.(args.MQTTConn) + case "rabbitstreams": + asserted, ok := connArgs.(args.RabbitStreamsConn) if !ok { return nil, false } - return &ConnectionOptions_Mqtt{ - Mqtt: &asserted, + return &ConnectionOptions_RabbitStreams{ + RabbitStreams: &asserted, }, true - case "kubemqqueue": - asserted, ok := connArgs.(args.KubeMQQueueConn) + case "redispubsub": + asserted, ok := connArgs.(args.RedisPubSubConn) if !ok { return nil, false } - return &ConnectionOptions_KubemqQueue{ - KubemqQueue: &asserted, + return &ConnectionOptions_RedisPubsub{ + RedisPubsub: &asserted, }, true case "kafka": asserted, ok := connArgs.(args.KafkaConn) @@ -170,6 +152,24 @@ func GenerateConnOpts(backend string, connArgs interface{}) (IsConnectionOptions return &ConnectionOptions_AwsSqs{ AwsSqs: &asserted, }, true + case "awssns": + asserted, ok := connArgs.(args.AWSSNSConn) + if !ok { + return nil, false + } + + return &ConnectionOptions_AwsSns{ + AwsSns: &asserted, + }, true + case "nats": + asserted, ok := connArgs.(args.NatsConn) + if !ok { + return nil, false + } + + return &ConnectionOptions_Nats{ + Nats: &asserted, + }, true case "postgres": asserted, ok := connArgs.(args.PostgresConn) if !ok { @@ -179,23 +179,23 @@ func GenerateConnOpts(backend string, connArgs interface{}) (IsConnectionOptions return &ConnectionOptions_Postgres{ Postgres: &asserted, }, true - case "redisstreams": - asserted, ok := connArgs.(args.RedisStreamsConn) + case "rabbit": + asserted, ok := connArgs.(args.RabbitConn) if !ok { return nil, false } - return &ConnectionOptions_RedisStreams{ - RedisStreams: &asserted, + return &ConnectionOptions_Rabbit{ + Rabbit: &asserted, }, true - case "azureservicebus": - asserted, ok := connArgs.(args.AzureServiceBusConn) + case "natsjetstream": + asserted, ok := connArgs.(args.NatsJetstreamConn) if !ok { return nil, false } - return &ConnectionOptions_AzureServiceBus{ - AzureServiceBus: &asserted, + return &ConnectionOptions_NatsJetstream{ + NatsJetstream: &asserted, }, true default: return nil, false diff --git a/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/batch_merge_tunnel_opts.pb.go b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/batch_merge_tunnel_opts.pb.go new file mode 100644 index 00000000..5e5f0cbc --- /dev/null +++ b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/batch_merge_tunnel_opts.pb.go @@ -0,0 +1,54 @@ +// Code generated by generate-merge-relay-opts.go. DO NOT EDIT. + +package opts + +import ( + "errors" +) + +func MergeTunnelOptions(backend string, tunnelOpts *TunnelOptions, createTunnelOpts *CreateTunnelOptions) error { + switch backend { + case "activemq": + tunnelOpts.Activemq = &TunnelGroupActiveMQOptions{Args: createTunnelOpts.Activemq} + case "awskinesis": + tunnelOpts.AwsKinesis = &TunnelGroupAWSKinesisOptions{Args: createTunnelOpts.AwsKinesis} + case "awssns": + tunnelOpts.AwsSns = &TunnelGroupAWSSNSOptions{Args: createTunnelOpts.AwsSns} + case "awssqs": + tunnelOpts.AwsSqs = &TunnelGroupAWSSQSOptions{Args: createTunnelOpts.AwsSqs} + case "azureeventhub": + tunnelOpts.AzureEventHub = &TunnelGroupAzureEventHubOptions{Args: createTunnelOpts.AzureEventHub} + case "azureservicebus": + tunnelOpts.AzureServiceBus = &TunnelGroupAzureServiceBusOptions{Args: createTunnelOpts.AzureServiceBus} + case "gcppubsub": + tunnelOpts.GcpPubsub = &TunnelGroupGCPPubSubOptions{Args: createTunnelOpts.GcpPubsub} + case "kafka": + tunnelOpts.Kafka = &TunnelGroupKafkaOptions{Args: createTunnelOpts.Kafka} + case "kubemqqueue": + tunnelOpts.KubemqQueue = &TunnelGroupKubeMQQueueOptions{Args: createTunnelOpts.KubemqQueue} + case "mqtt": + tunnelOpts.Mqtt = &TunnelGroupMQTTOptions{Args: createTunnelOpts.Mqtt} + case "nats": + tunnelOpts.Nats = &TunnelGroupNatsOptions{Args: createTunnelOpts.Nats} + case "natsjetstream": + tunnelOpts.NatsJetstream = &TunnelGroupNatsJetstreamOptions{Args: createTunnelOpts.NatsJetstream} + case "natsstreaming": + tunnelOpts.NatsStreaming = &TunnelGroupNatsStreamingOptions{Args: createTunnelOpts.NatsStreaming} + case "nsq": + tunnelOpts.Nsq = &TunnelGroupNSQOptions{Args: createTunnelOpts.Nsq} + case "pulsar": + tunnelOpts.Pulsar = &TunnelGroupPulsarOptions{Args: createTunnelOpts.Pulsar} + case "rabbit": + tunnelOpts.Rabbit = &TunnelGroupRabbitOptions{Args: createTunnelOpts.Rabbit} + case "rabbitstreams": + tunnelOpts.RabbitStreams = &TunnelGroupRabbitStreamsOptions{Args: createTunnelOpts.RabbitStreams} + case "redispubsub": + tunnelOpts.RedisPubsub = &TunnelGroupRedisPubSubOptions{Args: createTunnelOpts.RedisPubsub} + case "redisstreams": + tunnelOpts.RedisStreams = &TunnelGroupRedisStreamsOptions{Args: createTunnelOpts.RedisStreams} + default: + return errors.New("unknown backend") + } + + return nil +} diff --git a/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_relay.pb.go b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_relay.pb.go index 50d8b265..aa03f46c 100644 --- a/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_relay.pb.go +++ b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_relay.pb.go @@ -72,6 +72,12 @@ type CreateRelayOptions struct { BatchMaxRetry int32 `protobuf:"varint,4,opt,name=batch_max_retry,json=batchMaxRetry,proto3" json:"batch_max_retry,omitempty" kong:"help='How many times plumber will try re-sending a batch',default=3"` // @gotags: kong:"help='How many workers to launch per relay',default=10" NumWorkers int32 `protobuf:"varint,5,opt,name=num_workers,json=numWorkers,proto3" json:"num_workers,omitempty" kong:"help='How many workers to launch per relay',default=10"` + // @gotags: kong:"help='Alternative collector to relay events to',default='grpc-collector.batch.sh:9000'" + BatchshGrpcAddress string `protobuf:"bytes,6,opt,name=batchsh_grpc_address,json=batchshGrpcAddress,proto3" json:"batchsh_grpc_address,omitempty" kong:"help='Alternative collector to relay events to',default='grpc-collector.batch.sh:9000'"` + // @gotags: kong:"help='Whether to use TLS with collector'" + BatchshGrpcDisableTls bool `protobuf:"varint,7,opt,name=batchsh_grpc_disable_tls,json=batchshGrpcDisableTls,proto3" json:"batchsh_grpc_disable_tls,omitempty" kong:"help='Whether to use TLS with collector'"` + // @gotags: kong:"help='How long to wait before giving up talking to the gRPC collector',default=5" + BatchshGrpcTimeoutSeconds int32 `protobuf:"varint,8,opt,name=batchsh_grpc_timeout_seconds,json=batchshGrpcTimeoutSeconds,proto3" json:"batchsh_grpc_timeout_seconds,omitempty" kong:"help='How long to wait before giving up talking to the gRPC collector',default=5"` // @gotags: kong:"cmd,help='Apache Kafka'" Kafka *args.KafkaRelayArgs `protobuf:"bytes,100,opt,name=kafka,proto3" json:"kafka,omitempty" kong:"cmd,help='Apache Kafka'"` // @gotags: kong:"cmd,help='AWS Simple Queue System'" @@ -167,6 +173,27 @@ func (m *CreateRelayOptions) GetNumWorkers() int32 { return 0 } +func (m *CreateRelayOptions) GetBatchshGrpcAddress() string { + if m != nil { + return m.BatchshGrpcAddress + } + return "" +} + +func (m *CreateRelayOptions) GetBatchshGrpcDisableTls() bool { + if m != nil { + return m.BatchshGrpcDisableTls + } + return false +} + +func (m *CreateRelayOptions) GetBatchshGrpcTimeoutSeconds() int32 { + if m != nil { + return m.BatchshGrpcTimeoutSeconds + } + return 0 +} + func (m *CreateRelayOptions) GetKafka() *args.KafkaRelayArgs { if m != nil { return m.Kafka @@ -403,52 +430,58 @@ func init() { func init() { proto.RegisterFile("opts/ps_opts_manage_relay.proto", fileDescriptor_86dbec1f9d2837a2) } var fileDescriptor_86dbec1f9d2837a2 = []byte{ - // 751 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x95, 0x5b, 0x4f, 0xe3, 0x46, - 0x1c, 0xc5, 0x15, 0x20, 0x14, 0x26, 0x84, 0xd0, 0x79, 0x68, 0x87, 0x50, 0x4a, 0x48, 0xa3, 0x8a, - 0x56, 0x22, 0x69, 0x8b, 0xfa, 0x80, 0x56, 0xfb, 0x00, 0xac, 0x16, 0xb1, 0x2b, 0xd8, 0xc4, 0x46, - 0x42, 0xda, 0x17, 0x6b, 0xec, 0xfc, 0x71, 0x4c, 0x62, 0x8f, 0x3d, 0x97, 0xe5, 0xf2, 0x55, 0xf7, - 0xcb, 0xac, 0x66, 0xec, 0x38, 0x0c, 0x09, 0x3c, 0x59, 0x39, 0xe7, 0x77, 0x8e, 0xc7, 0x73, 0x0b, - 0xda, 0x63, 0xa9, 0x14, 0xbd, 0x54, 0x78, 0xfa, 0xe9, 0xc5, 0x34, 0xa1, 0x21, 0x78, 0x1c, 0x26, - 0xf4, 0xb1, 0x9b, 0x72, 0x26, 0x19, 0xae, 0x99, 0x87, 0xe8, 0x6a, 0xbf, 0xd9, 0xa4, 0x3c, 0x34, - 0xb4, 0x7e, 0x7a, 0xf4, 0x5e, 0x78, 0x22, 0x13, 0x39, 0xd8, 0xec, 0xd8, 0xde, 0x93, 0xe2, 0xe0, - 0x09, 0xe0, 0xdf, 0xa2, 0x00, 0x3c, 0x5f, 0x4d, 0xa9, 0x5d, 0x8b, 0x0a, 0x83, 0xd4, 0x4b, 0x95, - 0x2f, 0x94, 0x5f, 0xd8, 0xc4, 0xb2, 0xc7, 0xf4, 0x76, 0x4c, 0x0b, 0x67, 0xcf, 0x76, 0x94, 0x0f, - 0x71, 0xe6, 0x65, 0x0a, 0x14, 0x2c, 0x8c, 0xc6, 0x2c, 0x09, 0x59, 0xe1, 0xfc, 0x6a, 0x3b, 0x99, - 0x94, 0x0b, 0x8d, 0x84, 0xca, 0xe9, 0x28, 0xf7, 0xe7, 0x0c, 0xef, 0x0e, 0xa4, 0x90, 0x1c, 0x68, - 0xfc, 0x3a, 0x92, 0xfb, 0x51, 0x12, 0x16, 0xc8, 0x2f, 0x36, 0x22, 0xb2, 0x42, 0xdf, 0xb1, 0xf4, - 0x94, 0x09, 0x19, 0x72, 0x98, 0xbe, 0x7a, 0xdb, 0x32, 0x39, 0xf5, 0xfd, 0x48, 0x2e, 0x9c, 0x02, - 0x0e, 0xc3, 0x48, 0xd8, 0xb3, 0xd7, 0x5a, 0x00, 0xe4, 0x83, 0x2a, 0xda, 0xdb, 0xfb, 0xa8, 0x71, - 0x0e, 0xd2, 0xd1, 0xeb, 0xfb, 0x25, 0x95, 0x11, 0x4b, 0x04, 0xde, 0x44, 0x4b, 0xd1, 0x90, 0x54, - 0x5a, 0x95, 0x83, 0x75, 0x67, 0x29, 0x1a, 0xb6, 0xbf, 0xaf, 0x21, 0x7c, 0xc6, 0x81, 0x4a, 0xb0, - 0xb0, 0x3f, 0x50, 0x3d, 0x60, 0x49, 0x02, 0x81, 0xfe, 0xe9, 0x95, 0x89, 0x8d, 0x99, 0x78, 0x31, - 0xc4, 0x7f, 0xa1, 0xad, 0x80, 0x4d, 0x26, 0x05, 0x24, 0xd9, 0x18, 0x12, 0xb2, 0x64, 0xb8, 0xc6, - 0x4c, 0xbf, 0xd6, 0x32, 0xde, 0x45, 0xc8, 0xa7, 0x32, 0x18, 0x79, 0x22, 0x7a, 0x02, 0xb2, 0xdc, - 0xaa, 0x1c, 0x54, 0x9d, 0x75, 0xa3, 0xb8, 0xd1, 0x13, 0xe0, 0x3f, 0x51, 0x23, 0xb7, 0x63, 0xfa, - 0xe0, 0x71, 0x90, 0xfc, 0x91, 0xac, 0x18, 0xa6, 0x6e, 0xe4, 0x4b, 0xfa, 0xe0, 0x68, 0x11, 0xef, - 0xa1, 0x5a, 0xa2, 0x62, 0xef, 0x9e, 0xf1, 0x31, 0x70, 0x41, 0xaa, 0x86, 0x41, 0x89, 0x8a, 0x6f, - 0x72, 0x05, 0xff, 0x8b, 0xaa, 0x66, 0x1b, 0x91, 0x61, 0xab, 0x72, 0x50, 0xfb, 0x6f, 0xa7, 0x5b, - 0xec, 0x67, 0x3d, 0x45, 0xdd, 0xcf, 0xda, 0x31, 0x9f, 0x79, 0xc2, 0x43, 0xe1, 0xe4, 0x24, 0xfe, - 0x1f, 0xfd, 0x54, 0x6c, 0x6d, 0x02, 0x26, 0xf4, 0x9b, 0x15, 0x3a, 0xb9, 0x71, 0xdd, 0x81, 0x3b, - 0x4b, 0xad, 0xd2, 0x7b, 0xe1, 0x66, 0x02, 0xff, 0x83, 0xaa, 0x66, 0xd7, 0x91, 0x5b, 0x13, 0x6a, - 0x5a, 0xa1, 0x4b, 0xed, 0x38, 0x40, 0x87, 0xf9, 0x8b, 0x0c, 0x88, 0xff, 0x46, 0xcb, 0x89, 0xc8, - 0x48, 0x68, 0x78, 0x62, 0xf1, 0x57, 0xee, 0xa0, 0xa4, 0x35, 0x84, 0x8f, 0xd0, 0x6a, 0xbe, 0x19, - 0xc8, 0x68, 0xc1, 0x87, 0x38, 0xc6, 0x2a, 0x13, 0x05, 0x8a, 0x0f, 0xd1, 0x8a, 0xde, 0xee, 0x24, - 0x32, 0x91, 0x6d, 0x7b, 0x44, 0x83, 0xeb, 0xeb, 0x32, 0x60, 0x30, 0xdc, 0x47, 0x3f, 0xcf, 0x9d, - 0x5b, 0x72, 0x67, 0xb2, 0x1d, 0x7b, 0x0a, 0x34, 0xe5, 0xe6, 0xd0, 0xa9, 0x12, 0x65, 0x4d, 0x83, - 0xda, 0x06, 0x7e, 0x8f, 0xd0, 0xec, 0x8c, 0x93, 0xb1, 0xa9, 0xfa, 0xdd, 0xaa, 0x3a, 0x3f, 0xeb, - 0xf7, 0x95, 0xef, 0x2a, 0xbf, 0x2c, 0x59, 0x0f, 0x83, 0xb4, 0x6f, 0x02, 0xf8, 0x0c, 0x6d, 0x3c, - 0x3f, 0xe9, 0x64, 0x62, 0x0a, 0x5a, 0xf6, 0x1a, 0x2a, 0x1f, 0x2e, 0x07, 0x03, 0xed, 0x97, 0x15, - 0xb5, 0x3c, 0x65, 0x44, 0x5d, 0xf2, 0xfc, 0xac, 0x90, 0x78, 0x41, 0x89, 0xa3, 0x81, 0x17, 0xe3, - 0xa8, 0xf1, 0x42, 0xd4, 0x23, 0xf9, 0x88, 0xea, 0xd6, 0x79, 0x22, 0xcc, 0xb4, 0xec, 0xcf, 0xb7, - 0xb8, 0x39, 0x50, 0xd6, 0xe4, 0x2f, 0x2f, 0x54, 0x7c, 0x8c, 0xd6, 0xa6, 0x07, 0x9e, 0xa4, 0xa6, - 0x62, 0xd7, 0xaa, 0xe8, 0x17, 0x66, 0x19, 0x2f, 0x71, 0xbd, 0x98, 0xfa, 0x9a, 0x21, 0xd9, 0x82, - 0xc5, 0xbc, 0xa2, 0x72, 0x16, 0x31, 0x18, 0xbe, 0x40, 0x9b, 0xf6, 0xad, 0x44, 0xb8, 0x09, 0xb6, - 0xe7, 0x82, 0xee, 0x94, 0x28, 0x1b, 0xea, 0xc9, 0x73, 0xb9, 0xac, 0x2a, 0xef, 0x40, 0x22, 0x5e, - 0xa9, 0xfa, 0x34, 0x25, 0xec, 0xaa, 0x52, 0x6e, 0x77, 0x10, 0xfe, 0x00, 0x13, 0x78, 0x71, 0xb9, - 0xbc, 0xbc, 0x83, 0xda, 0x68, 0xcb, 0x95, 0x2c, 0x7d, 0x93, 0xe9, 0x20, 0xec, 0x80, 0x50, 0xf1, - 0x9b, 0x4d, 0xa7, 0xef, 0xbe, 0x1e, 0x87, 0x91, 0x1c, 0x29, 0xbf, 0x1b, 0xb0, 0xb8, 0x67, 0xee, - 0x8e, 0x80, 0xf1, 0xb4, 0x97, 0x4e, 0x54, 0xec, 0x03, 0x3f, 0x14, 0xc1, 0x08, 0x62, 0x2a, 0x7a, - 0xbe, 0x8a, 0x26, 0xc3, 0x5e, 0xc8, 0x7a, 0xf9, 0x17, 0xf5, 0xf4, 0xdf, 0x9d, 0xbf, 0x6a, 0x7e, - 0x1c, 0xfd, 0x08, 0x00, 0x00, 0xff, 0xff, 0x66, 0xd0, 0x57, 0x09, 0x25, 0x07, 0x00, 0x00, + // 833 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x95, 0xed, 0x6e, 0xdb, 0x36, + 0x18, 0x85, 0xe1, 0xb4, 0x49, 0x13, 0xba, 0x69, 0x3a, 0x62, 0x1f, 0x4c, 0xda, 0x2c, 0x8e, 0x17, + 0x0c, 0xde, 0x80, 0xda, 0xdb, 0x8a, 0x61, 0x28, 0x86, 0x61, 0x48, 0x53, 0x2c, 0xe8, 0x86, 0x74, + 0xb6, 0x64, 0xa0, 0xc0, 0xfe, 0x10, 0x94, 0xf4, 0x56, 0x56, 0x2d, 0x89, 0x12, 0x3f, 0x96, 0x36, + 0x37, 0xb0, 0xdb, 0x1e, 0x48, 0xca, 0xb2, 0x19, 0xbb, 0xf9, 0x25, 0xf8, 0x9c, 0xe7, 0x1c, 0xd1, + 0xa4, 0xf9, 0x1a, 0x9d, 0xf0, 0x4a, 0xc9, 0x51, 0x25, 0xa9, 0x79, 0xd2, 0x82, 0x95, 0x2c, 0x05, + 0x2a, 0x20, 0x67, 0x1f, 0x87, 0x95, 0xe0, 0x8a, 0xe3, 0xae, 0x7d, 0xc8, 0xa1, 0xf1, 0x8f, 0x8e, + 0x98, 0x48, 0x2d, 0x6d, 0x9e, 0x94, 0x5d, 0x4b, 0x2a, 0x6b, 0xe9, 0xc0, 0xa3, 0x33, 0xdf, 0xbb, + 0xd1, 0x02, 0xa8, 0x04, 0xf1, 0x6f, 0x16, 0x03, 0x8d, 0xf4, 0x82, 0x3a, 0xf6, 0xa8, 0x34, 0xae, + 0x68, 0xa5, 0x23, 0xa9, 0xa3, 0xc6, 0x26, 0x9e, 0x3d, 0x67, 0xef, 0xe6, 0xac, 0x71, 0x4e, 0x7c, + 0x47, 0x47, 0x50, 0xd4, 0xb4, 0xd6, 0xa0, 0x61, 0x63, 0xb4, 0xe0, 0x65, 0xca, 0x1b, 0xe7, 0x2b, + 0xdf, 0xa9, 0x95, 0xda, 0x68, 0x94, 0x4c, 0x2d, 0x56, 0x79, 0xba, 0x66, 0xd0, 0xf7, 0xa0, 0xa4, + 0x12, 0xc0, 0x8a, 0x4f, 0x23, 0xce, 0xcf, 0xca, 0xb4, 0x41, 0xbe, 0xf4, 0x11, 0x59, 0x37, 0xfa, + 0x13, 0x4f, 0xaf, 0xb8, 0x54, 0xa9, 0x80, 0xc5, 0xab, 0x0f, 0x3d, 0x53, 0xb0, 0x28, 0xca, 0xd4, + 0xc6, 0x2d, 0x10, 0x90, 0x64, 0xd2, 0xdf, 0xbd, 0xde, 0x06, 0xc0, 0x2d, 0xaa, 0x69, 0xef, 0x9f, + 0xa2, 0x83, 0x4b, 0x50, 0x81, 0x39, 0xdf, 0xbf, 0x2b, 0x95, 0xf1, 0x52, 0xe2, 0x47, 0x68, 0x2b, + 0x4b, 0x48, 0xa7, 0xd7, 0x19, 0xec, 0x05, 0x5b, 0x59, 0xd2, 0xff, 0x0f, 0x21, 0x7c, 0x21, 0x80, + 0x29, 0xf0, 0xb0, 0x6f, 0xd0, 0x7e, 0xcc, 0xcb, 0x12, 0x62, 0xf3, 0x91, 0xb6, 0x89, 0x87, 0x4b, + 0xf1, 0x75, 0x82, 0xbf, 0x43, 0x8f, 0x63, 0x9e, 0xe7, 0x0d, 0xa4, 0xf8, 0x1c, 0x4a, 0xb2, 0x65, + 0xb9, 0x83, 0xa5, 0x3e, 0x35, 0x32, 0x3e, 0x46, 0x28, 0x62, 0x2a, 0x9e, 0x51, 0x99, 0xdd, 0x00, + 0xb9, 0xd7, 0xeb, 0x0c, 0xb6, 0x83, 0x3d, 0xab, 0x84, 0xd9, 0x0d, 0xe0, 0x6f, 0xd1, 0x81, 0xb3, + 0x0b, 0xf6, 0x81, 0x0a, 0x50, 0xe2, 0x23, 0xb9, 0x6f, 0x99, 0x7d, 0x2b, 0x5f, 0xb1, 0x0f, 0x81, + 0x11, 0xf1, 0x09, 0xea, 0x96, 0xba, 0xa0, 0xd7, 0x5c, 0xcc, 0x41, 0x48, 0xb2, 0x6d, 0x19, 0x54, + 0xea, 0xe2, 0xad, 0x53, 0xf0, 0x0f, 0xe8, 0x73, 0x9b, 0x90, 0x33, 0x9a, 0x8a, 0x2a, 0xa6, 0x2c, + 0x49, 0x04, 0x48, 0x49, 0x76, 0xec, 0xb2, 0x70, 0xe3, 0x5d, 0x8a, 0x2a, 0x3e, 0x77, 0x0e, 0xfe, + 0x05, 0x11, 0x2f, 0x91, 0x64, 0x92, 0x45, 0x39, 0x50, 0x95, 0x4b, 0xf2, 0xa0, 0xd7, 0x19, 0xec, + 0x06, 0x5f, 0xac, 0xa4, 0x5e, 0x39, 0x77, 0x9a, 0x4b, 0xfc, 0x3b, 0x7a, 0xea, 0x05, 0x55, 0x56, + 0x00, 0xd7, 0x8a, 0x4a, 0x88, 0x79, 0x99, 0x48, 0xb2, 0x6b, 0x17, 0x77, 0xb8, 0x12, 0x9e, 0x3a, + 0x22, 0x74, 0x00, 0xfe, 0x11, 0x6d, 0xdb, 0x9f, 0x3c, 0x49, 0x7a, 0x9d, 0x41, 0xf7, 0xa7, 0x27, + 0xc3, 0xe6, 0xee, 0x99, 0xe3, 0x1c, 0xfe, 0x65, 0x1c, 0x7b, 0x24, 0xe7, 0x22, 0x95, 0x81, 0x23, + 0xf1, 0xcf, 0xe8, 0x41, 0x73, 0x0d, 0x09, 0xd8, 0xd0, 0x53, 0x2f, 0x74, 0xfe, 0x36, 0x0c, 0x27, + 0xe1, 0x32, 0xb5, 0xc3, 0xae, 0x65, 0x58, 0x9b, 0x5d, 0xd9, 0xb6, 0x37, 0x84, 0xbc, 0xb3, 0xa1, + 0x23, 0x2f, 0x74, 0x65, 0x9c, 0x00, 0x58, 0xe2, 0x5e, 0x64, 0x41, 0xfc, 0x3d, 0xba, 0x57, 0xca, + 0x9a, 0xa4, 0x96, 0x27, 0x1e, 0xff, 0x26, 0x9c, 0xb4, 0xb4, 0x81, 0xf0, 0x73, 0xb4, 0xe3, 0x7e, + 0xb8, 0x64, 0xb6, 0xe1, 0x8b, 0x04, 0xd6, 0x6a, 0x13, 0x0d, 0x8a, 0x9f, 0xa1, 0xfb, 0xe6, 0x6a, + 0x92, 0xcc, 0x46, 0x0e, 0xfd, 0x15, 0x4d, 0xa6, 0xd3, 0x36, 0x60, 0x31, 0x3c, 0x46, 0x9f, 0xad, + 0xcd, 0x18, 0xf2, 0xde, 0x66, 0xcf, 0xfc, 0x2d, 0x30, 0x54, 0xe8, 0xa0, 0x97, 0x5a, 0xb6, 0x35, + 0x07, 0xcc, 0x37, 0xf0, 0x6f, 0x08, 0x2d, 0xe7, 0x11, 0x99, 0xdb, 0xaa, 0xaf, 0xbd, 0xaa, 0xcb, + 0x8b, 0xf1, 0x58, 0x47, 0xa1, 0x8e, 0xda, 0x92, 0xbd, 0x34, 0xae, 0xc6, 0x36, 0x80, 0x2f, 0xd0, + 0xc3, 0xd5, 0xa9, 0x44, 0x72, 0x5b, 0xd0, 0xf3, 0xcf, 0x50, 0x47, 0x70, 0x35, 0x99, 0x18, 0xbf, + 0xad, 0xe8, 0xba, 0x94, 0x15, 0x4d, 0xc9, 0xea, 0xbd, 0x26, 0xc5, 0x86, 0x92, 0xc0, 0x00, 0xb7, + 0xd6, 0xd1, 0x15, 0x8d, 0x68, 0x56, 0xf2, 0x07, 0xda, 0xf7, 0xee, 0x3e, 0xe1, 0xb6, 0xe5, 0x74, + 0xbd, 0x25, 0x74, 0x40, 0x5b, 0xe3, 0x5e, 0xde, 0xa8, 0xf8, 0x05, 0xda, 0x5d, 0x0c, 0x27, 0x52, + 0xd9, 0x8a, 0x63, 0xaf, 0x62, 0xdc, 0x98, 0x6d, 0xbc, 0xc5, 0xcd, 0x61, 0x9a, 0x91, 0x48, 0xea, + 0x0d, 0x87, 0xf9, 0x86, 0xa9, 0x65, 0xc4, 0x62, 0xf8, 0x35, 0x7a, 0xe4, 0x4f, 0x50, 0x22, 0x6c, + 0xb0, 0xbf, 0x16, 0x0c, 0x17, 0x44, 0xdb, 0xb0, 0x5f, 0xae, 0xca, 0x6d, 0x55, 0x3b, 0xaf, 0x89, + 0xfc, 0x44, 0xd5, 0x9f, 0x0b, 0xc2, 0xaf, 0x6a, 0xe5, 0xfe, 0x19, 0xc2, 0xaf, 0x20, 0x87, 0x5b, + 0x83, 0xf0, 0xf6, 0xbc, 0xec, 0xa3, 0xc7, 0xa1, 0xe2, 0xd5, 0x9d, 0xcc, 0x19, 0xc2, 0x01, 0x48, + 0x5d, 0xdc, 0xd9, 0xf4, 0xf2, 0xd7, 0x7f, 0x5e, 0xa4, 0x99, 0x9a, 0xe9, 0x68, 0x18, 0xf3, 0x62, + 0x64, 0xc7, 0x44, 0xcc, 0x45, 0x35, 0xaa, 0x72, 0x5d, 0x44, 0x20, 0x9e, 0xc9, 0x78, 0x06, 0x05, + 0x93, 0xa3, 0x48, 0x67, 0x79, 0x32, 0x4a, 0xf9, 0xc8, 0x7d, 0xa3, 0x91, 0xf9, 0x6b, 0x8e, 0x76, + 0xec, 0x87, 0xe7, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x21, 0xd9, 0xc4, 0xe5, 0xd1, 0x07, 0x00, + 0x00, } diff --git a/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_tunnel.pb.go b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_tunnel.pb.go index 53a52472..7e7b07b5 100644 --- a/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_tunnel.pb.go +++ b/vendor/github.com/batchcorp/plumber-schemas/build/go/protos/opts/ps_opts_manage_tunnel.pb.go @@ -64,16 +64,18 @@ func (m *GetTunnelOptions) GetId() string { type CreateTunnelOptions struct { // @gotags: kong:"help='Connection ID for the tunnel to use',required=true" ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" kong:"help='Connection ID for the tunnel to use',required=true"` - // @gotags: kong:"help='Optional name for the tunnel (auto-generated if left empty)'" - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" kong:"help='Optional name for the tunnel (auto-generated if left empty)'"` - // @gotags: kong:"help='Optional notes associated with the tunnel'" - Notes string `protobuf:"bytes,3,opt,name=notes,proto3" json:"notes,omitempty" kong:"help='Optional notes associated with the tunnel'"` + // @gotags: kong:"help='Batch API token (create in settings -> security)',required=true" + TunnelToken string `protobuf:"bytes,3,opt,name=tunnel_token,json=tunnelToken,proto3" json:"tunnel_token,omitempty" kong:"help='Batch API token (create in settings -> security)',required=true"` + // @gotags: kong:"help='Name for the tunnel (auto-generated if left empty)'" + Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty" kong:"help='Name for the tunnel (auto-generated if left empty)'"` + // @gotags: kong:"help='Notes associated with the tunnel'" + Notes string `protobuf:"bytes,5,opt,name=notes,proto3" json:"notes,omitempty" kong:"help='Notes associated with the tunnel'"` // @gotags: kong:"help='Tunnel API address',default='dproxy.batch.sh:443'" - XTunnelAddress string `protobuf:"bytes,4,opt,name=_tunnel_address,json=TunnelAddress,proto3" json:"_tunnel_address,omitempty" kong:"help='Tunnel API address',default='dproxy.batch.sh:443'"` + XTunnelAddress string `protobuf:"bytes,6,opt,name=_tunnel_address,json=TunnelAddress,proto3" json:"_tunnel_address,omitempty" kong:"help='Tunnel API address',default='dproxy.batch.sh:443'"` // @gotags: kong:"help='Tunnel API initial connection timeout',default=5" - XTunnelTimeoutSeconds uint32 `protobuf:"varint,5,opt,name=_tunnel_timeout_seconds,json=TunnelTimeoutSeconds,proto3" json:"_tunnel_timeout_seconds,omitempty" kong:"help='Tunnel API initial connection timeout',default=5"` + XTunnelTimeoutSeconds uint32 `protobuf:"varint,7,opt,name=_tunnel_timeout_seconds,json=TunnelTimeoutSeconds,proto3" json:"_tunnel_timeout_seconds,omitempty" kong:"help='Tunnel API initial connection timeout',default=5"` // @gotags: kong:"help='Use gRPC insecure mode when talking to Batch Tunnel API'" - XTunnelInsecure bool `protobuf:"varint,6,opt,name=_tunnel_insecure,json=TunnelInsecure,proto3" json:"_tunnel_insecure,omitempty" kong:"help='Use gRPC insecure mode when talking to Batch Tunnel API'"` + XTunnelInsecure bool `protobuf:"varint,8,opt,name=_tunnel_insecure,json=TunnelInsecure,proto3" json:"_tunnel_insecure,omitempty" kong:"help='Use gRPC insecure mode when talking to Batch Tunnel API'"` // @gotags: kong:"cmd,help='Apache Kafka'" Kafka *args.KafkaWriteArgs `protobuf:"bytes,100,opt,name=kafka,proto3" json:"kafka,omitempty" kong:"cmd,help='Apache Kafka'"` // @gotags: kong:"cmd,help='Apache ActiveMQ'" @@ -149,6 +151,13 @@ func (m *CreateTunnelOptions) GetConnectionId() string { return "" } +func (m *CreateTunnelOptions) GetTunnelToken() string { + if m != nil { + return m.TunnelToken + } + return "" +} + func (m *CreateTunnelOptions) GetName() string { if m != nil { return m.Name @@ -448,59 +457,60 @@ func init() { func init() { proto.RegisterFile("opts/ps_opts_manage_tunnel.proto", fileDescriptor_b9d5e823fc1e6249) } var fileDescriptor_b9d5e823fc1e6249 = []byte{ - // 861 bytes of a gzipped FileDescriptorProto + // 879 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x56, 0x5f, 0x6f, 0xdb, 0x36, - 0x10, 0x87, 0xd3, 0x26, 0x6b, 0xe9, 0x3a, 0x69, 0x99, 0x62, 0x65, 0xd3, 0xad, 0x75, 0x9d, 0x65, + 0x10, 0x87, 0xdb, 0x26, 0x4d, 0xe9, 0x38, 0x69, 0x99, 0x62, 0x65, 0xd3, 0xad, 0x75, 0x9c, 0x65, 0x30, 0x30, 0xcc, 0xc6, 0xfe, 0xf4, 0x61, 0x1b, 0x30, 0x20, 0x6d, 0x87, 0xac, 0x0d, 0xd2, 0xc5, - 0x56, 0x80, 0x02, 0x7b, 0x11, 0x28, 0xe9, 0xaa, 0xa8, 0xb1, 0x28, 0x99, 0x47, 0x3a, 0xc0, 0xbe, - 0xcc, 0xbe, 0x6a, 0x41, 0x52, 0xb2, 0x45, 0x5b, 0xc9, 0x93, 0xac, 0xfb, 0xfd, 0x21, 0x79, 0xba, - 0x3b, 0x9a, 0xf4, 0x8b, 0x52, 0xe1, 0xb8, 0xc4, 0xd0, 0x3c, 0xc3, 0x9c, 0x0b, 0x9e, 0x42, 0xa8, - 0xb4, 0x10, 0x30, 0x1b, 0x95, 0xb2, 0x50, 0x05, 0xed, 0xda, 0x07, 0x8e, 0x0c, 0xe1, 0xe0, 0x19, - 0x97, 0xa9, 0xa5, 0x9b, 0x67, 0xc8, 0x63, 0x95, 0x2d, 0x20, 0x9f, 0x3b, 0xe6, 0xc1, 0x73, 0x1f, - 0xbc, 0xc6, 0xf0, 0x2a, 0x13, 0x80, 0x19, 0x56, 0xf8, 0xc1, 0x06, 0x8e, 0xe2, 0x16, 0x6c, 0x5e, - 0x63, 0x03, 0x1f, 0xfb, 0x4f, 0x4b, 0x08, 0x61, 0x01, 0x42, 0x85, 0x97, 0x3a, 0xaa, 0x38, 0xdf, - 0xb5, 0x70, 0x10, 0xe4, 0x22, 0x8b, 0x21, 0x8c, 0x74, 0xed, 0xf4, 0xad, 0xc7, 0x4a, 0xe3, 0x32, - 0x2c, 0x75, 0x84, 0x4b, 0x13, 0xe6, 0xc1, 0x57, 0xfc, 0xd3, 0x15, 0xaf, 0x90, 0x17, 0x3e, 0xa2, - 0x23, 0xc8, 0xe7, 0xe1, 0x5c, 0x83, 0x86, 0x8a, 0xf0, 0xc4, 0x23, 0xe4, 0x73, 0xa5, 0x5a, 0x01, - 0xc1, 0x55, 0xbd, 0x97, 0x97, 0x1b, 0x40, 0xf8, 0x19, 0x14, 0x2a, 0x09, 0x3c, 0xbf, 0x99, 0xe2, - 0xf0, 0x4c, 0xa4, 0x15, 0xe5, 0x6b, 0x9f, 0x82, 0xf5, 0xb7, 0x78, 0xea, 0xc5, 0x4b, 0x3d, 0x43, - 0x2e, 0x5b, 0x21, 0xc9, 0xa3, 0x28, 0x53, 0xad, 0x0b, 0x3a, 0xa8, 0x5a, 0x12, 0x5b, 0x33, 0x21, - 0x21, 0xc9, 0xd0, 0x4f, 0x62, 0xbf, 0x85, 0xe0, 0x59, 0x0c, 0x06, 0xe4, 0xe1, 0x09, 0xa8, 0x0b, - 0x5b, 0x64, 0xff, 0x94, 0x2a, 0x2b, 0x04, 0xd2, 0x5d, 0xb2, 0x95, 0x25, 0xac, 0xd3, 0xef, 0x0c, - 0xef, 0x4f, 0xb7, 0xb2, 0x64, 0xf0, 0x7f, 0x97, 0xec, 0xbf, 0x91, 0xc0, 0x15, 0xf8, 0xbc, 0x43, - 0xd2, 0x8b, 0x0b, 0x21, 0x20, 0x36, 0xaf, 0xe1, 0x52, 0xf2, 0x60, 0x15, 0x7c, 0x97, 0x50, 0x4a, - 0xee, 0x0a, 0x9e, 0x03, 0xdb, 0xb2, 0x98, 0xfd, 0x4d, 0x1f, 0x93, 0x6d, 0x51, 0x28, 0x40, 0x76, - 0xc7, 0x06, 0xdd, 0x0b, 0xfd, 0x9e, 0xec, 0x55, 0xd5, 0x1e, 0xf2, 0x24, 0x91, 0x80, 0xc8, 0xee, - 0x5a, 0xbc, 0xe7, 0x96, 0x3d, 0x76, 0x41, 0xfa, 0x8a, 0x3c, 0xa9, 0x79, 0x2a, 0xcb, 0xa1, 0xd0, - 0x2a, 0x44, 0x88, 0x0b, 0x91, 0x20, 0xdb, 0xee, 0x77, 0x86, 0xbd, 0xe9, 0x63, 0xc7, 0xbf, 0x70, - 0x60, 0xe0, 0x30, 0x3a, 0x24, 0x0f, 0x6b, 0x59, 0x26, 0x10, 0x62, 0x2d, 0x81, 0xed, 0xf4, 0x3b, - 0xc3, 0x7b, 0xd3, 0x5d, 0xc7, 0x7f, 0x57, 0x45, 0xe9, 0x4f, 0x64, 0xdb, 0xd6, 0x1b, 0x4b, 0xfa, - 0x9d, 0x61, 0xf7, 0xe7, 0x67, 0xa3, 0xaa, 0xeb, 0x4c, 0x12, 0x47, 0xa7, 0x06, 0xf9, 0x28, 0x33, - 0x05, 0xc7, 0x32, 0xc5, 0xa9, 0x63, 0xd2, 0xdf, 0xc9, 0xbd, 0xba, 0x01, 0x19, 0x58, 0xd5, 0x73, - 0x4f, 0x75, 0x6c, 0xc1, 0xb3, 0xc9, 0x4a, 0xb8, 0xe4, 0xd3, 0x57, 0xe4, 0xab, 0xaa, 0xc7, 0xd8, - 0x27, 0x2b, 0xfd, 0xc6, 0x97, 0x7e, 0x0c, 0x82, 0x49, 0xb0, 0x12, 0xee, 0xf0, 0x6b, 0x0c, 0xe6, - 0xb8, 0x94, 0x09, 0x64, 0xe9, 0x0d, 0xb2, 0x0f, 0xeb, 0x32, 0x81, 0x74, 0x64, 0xbe, 0x87, 0x42, - 0x76, 0x69, 0x35, 0x07, 0x9e, 0xe6, 0x03, 0x57, 0xb8, 0x52, 0x58, 0x1e, 0x7d, 0x4f, 0x76, 0xfd, - 0x62, 0x67, 0x99, 0x55, 0x1e, 0x6e, 0x28, 0x83, 0x9a, 0xb1, 0xb2, 0xe8, 0x89, 0x66, 0x9c, 0xfe, - 0x40, 0xee, 0x08, 0x9c, 0xb3, 0xcf, 0xd6, 0xe0, 0xa9, 0x6f, 0x10, 0x34, 0x72, 0x63, 0x58, 0xf4, - 0x57, 0xb2, 0xe3, 0x8a, 0x9e, 0x5d, 0xb5, 0x1c, 0x6f, 0x6a, 0xa1, 0xc6, 0xf1, 0x1c, 0xd7, 0x1c, - 0xcf, 0x34, 0x3c, 0x9b, 0xb5, 0x1c, 0xef, 0x6c, 0x72, 0x71, 0xd1, 0x38, 0x9e, 0xe1, 0xd1, 0x09, - 0x79, 0xb4, 0x31, 0xa0, 0x58, 0x6e, 0xc5, 0x47, 0x7e, 0x3e, 0x0d, 0x2b, 0x70, 0xa4, 0xd7, 0xba, - 0x91, 0xa6, 0x3d, 0xee, 0x23, 0xf4, 0x94, 0xec, 0xad, 0xcd, 0x45, 0x26, 0x5a, 0x52, 0x66, 0x0d, - 0xff, 0x32, 0x94, 0xbf, 0x75, 0xd4, 0x48, 0x19, 0x6f, 0xc6, 0xe9, 0x9f, 0x84, 0xac, 0x46, 0x23, - 0x2b, 0xac, 0xcf, 0x0b, 0xcf, 0xe7, 0xe4, 0xcd, 0xf9, 0xb9, 0x8e, 0x82, 0xa6, 0xc7, 0xfd, 0x34, - 0x2e, 0xcf, 0xad, 0x82, 0xbe, 0x25, 0x0f, 0x9a, 0x13, 0x92, 0x95, 0xd6, 0xe1, 0xa5, 0x5f, 0xd2, - 0x3a, 0x82, 0xb3, 0xc9, 0xc4, 0xe0, 0x2b, 0x8f, 0xae, 0x93, 0xd9, 0xa8, 0x71, 0x69, 0x4e, 0x17, - 0x36, 0x6f, 0x71, 0x99, 0x1a, 0xc2, 0xfa, 0x4e, 0xba, 0xb2, 0x8a, 0x9a, 0xbd, 0x9c, 0x90, 0x9e, - 0x37, 0x82, 0x98, 0xb4, 0x36, 0x83, 0x4d, 0x1b, 0x57, 0x32, 0x8d, 0x24, 0xbb, 0xe5, 0xab, 0xb0, - 0x29, 0x0d, 0x37, 0x45, 0x19, 0xb6, 0x94, 0xc6, 0xb9, 0x85, 0x1a, 0xa5, 0xe1, 0xb8, 0xa6, 0x92, - 0xfd, 0x29, 0xca, 0x54, 0xcb, 0x67, 0x71, 0x85, 0xb5, 0xb1, 0x81, 0x9e, 0x6c, 0xc6, 0x97, 0x5d, - 0xb1, 0xbc, 0x25, 0x98, 0xbe, 0xa1, 0x2b, 0xde, 0xd7, 0x8c, 0xb5, 0xae, 0x58, 0xc6, 0xe9, 0x31, - 0xe9, 0x36, 0xee, 0x67, 0xb6, 0xb0, 0x46, 0xfd, 0xf5, 0x66, 0x3e, 0x75, 0xf0, 0xca, 0x85, 0xf0, - 0x6b, 0xac, 0x82, 0x83, 0x23, 0xb2, 0xff, 0x16, 0x66, 0xb0, 0x3e, 0xa0, 0xd7, 0x07, 0xf9, 0x21, - 0x79, 0x14, 0xa8, 0xa2, 0xbc, 0x9d, 0x74, 0x44, 0xf6, 0xa7, 0x80, 0x3a, 0xbf, 0xdd, 0xeb, 0xf5, - 0x1f, 0xff, 0xfe, 0x96, 0x66, 0xca, 0x5c, 0xfa, 0x71, 0x91, 0x8f, 0x23, 0xae, 0xe2, 0xcb, 0xb8, - 0x90, 0xe5, 0xb8, 0x9c, 0xe9, 0x3c, 0x02, 0xf9, 0x23, 0xc6, 0x97, 0x90, 0x73, 0x1c, 0x47, 0x3a, - 0x9b, 0x25, 0xe3, 0xb4, 0x18, 0xbb, 0xf3, 0x8c, 0xcd, 0x5f, 0x97, 0x68, 0xc7, 0xbe, 0xfc, 0xf2, - 0x25, 0x00, 0x00, 0xff, 0xff, 0x27, 0xed, 0x18, 0x41, 0xf2, 0x08, 0x00, 0x00, + 0x96, 0x81, 0x02, 0x7b, 0x11, 0x28, 0xf9, 0xaa, 0xa8, 0xb6, 0x28, 0x99, 0x47, 0x26, 0xc0, 0x3e, + 0xde, 0x3e, 0xd9, 0x40, 0x52, 0xb2, 0x45, 0x5b, 0xc9, 0x93, 0xac, 0xdf, 0x3f, 0x91, 0xd4, 0xdd, + 0x59, 0xa4, 0x9b, 0x17, 0x0a, 0x87, 0x05, 0x86, 0xe6, 0x1a, 0x66, 0x5c, 0xf0, 0x04, 0x42, 0xa5, + 0x85, 0x80, 0xf9, 0xa0, 0x90, 0xb9, 0xca, 0x69, 0xdb, 0x5e, 0x70, 0x60, 0x04, 0x87, 0x2f, 0xb8, + 0x4c, 0xac, 0xdc, 0x5c, 0x43, 0x1e, 0xab, 0xf4, 0x1a, 0xb2, 0x85, 0x53, 0x1e, 0xbe, 0xf4, 0xc9, + 0x1b, 0x0c, 0x67, 0xa9, 0x00, 0x4c, 0xb1, 0xe4, 0x0f, 0x37, 0x78, 0x14, 0x77, 0x70, 0x8b, 0x8a, + 0xeb, 0xf9, 0xdc, 0xbf, 0x5a, 0x42, 0x08, 0xd7, 0x20, 0x54, 0x78, 0xa5, 0xa3, 0x52, 0xf3, 0x6d, + 0x83, 0x06, 0x41, 0x5e, 0xa7, 0x31, 0x84, 0x91, 0xae, 0x92, 0xbe, 0xf1, 0x54, 0x49, 0x5c, 0x84, + 0x85, 0x8e, 0x70, 0x19, 0xc2, 0x3c, 0x7a, 0xc6, 0x3f, 0xcf, 0x78, 0xc9, 0xbc, 0xf2, 0x19, 0x1d, + 0x41, 0xb6, 0x08, 0x17, 0x1a, 0x34, 0x94, 0x82, 0x67, 0x9e, 0x20, 0x5b, 0x28, 0xd5, 0x48, 0x08, + 0xae, 0xaa, 0xb5, 0x1c, 0x6d, 0x10, 0xe1, 0x17, 0x50, 0xa8, 0x24, 0xf0, 0xec, 0x76, 0x89, 0xe3, + 0x53, 0x91, 0x94, 0x92, 0xaf, 0x7c, 0x09, 0x56, 0xef, 0xe2, 0xb9, 0x87, 0x17, 0x7a, 0x8e, 0x5c, + 0x36, 0x52, 0x92, 0x47, 0x51, 0xaa, 0x1a, 0x1f, 0xe8, 0xa8, 0xf2, 0x91, 0xd8, 0x78, 0x12, 0x12, + 0xa6, 0x29, 0xfa, 0x87, 0xd8, 0x6d, 0x10, 0x78, 0x11, 0xbd, 0x1e, 0x79, 0x7c, 0x06, 0x6a, 0x62, + 0x8b, 0xec, 0xef, 0x42, 0xa5, 0xb9, 0x40, 0xba, 0x47, 0xee, 0xa5, 0x53, 0xd6, 0xea, 0xb6, 0xfa, + 0x8f, 0xc6, 0xf7, 0xd2, 0x69, 0xef, 0xbf, 0x36, 0x39, 0x78, 0x2b, 0x81, 0x2b, 0xf0, 0x75, 0xc7, + 0xa4, 0x13, 0xe7, 0x42, 0x40, 0x6c, 0x6e, 0xc3, 0xa5, 0x65, 0x77, 0x05, 0xbe, 0x9f, 0xd2, 0x23, + 0xb2, 0xeb, 0x4a, 0x38, 0x54, 0xf9, 0x0c, 0x04, 0xbb, 0x6f, 0x35, 0x6d, 0x87, 0x4d, 0x0c, 0x44, + 0x29, 0x79, 0x20, 0x78, 0x06, 0xec, 0x81, 0xa5, 0xec, 0x6f, 0xfa, 0x94, 0x6c, 0x89, 0x5c, 0x01, + 0xb2, 0x2d, 0x0b, 0xba, 0x1b, 0xfa, 0x1d, 0xd9, 0x2f, 0x1b, 0x22, 0xe4, 0xd3, 0xa9, 0x04, 0x44, + 0xb6, 0x6d, 0xf9, 0x8e, 0x5b, 0xd9, 0xa9, 0x03, 0xe9, 0x6b, 0xf2, 0xac, 0xd2, 0xa9, 0x34, 0x83, + 0x5c, 0xab, 0x10, 0x21, 0xce, 0xc5, 0x14, 0xd9, 0xc3, 0x6e, 0xab, 0xdf, 0x19, 0x3f, 0x75, 0xfa, + 0x89, 0x23, 0x03, 0xc7, 0xd1, 0x3e, 0x79, 0x5c, 0xd9, 0x52, 0x81, 0x10, 0x6b, 0x09, 0x6c, 0xa7, + 0xdb, 0xea, 0xef, 0x8c, 0xf7, 0x9c, 0xfe, 0x7d, 0x89, 0xd2, 0x1f, 0xc9, 0x96, 0x2d, 0x49, 0x36, + 0xed, 0xb6, 0xfa, 0xed, 0x9f, 0x5e, 0x0c, 0xca, 0xc6, 0x34, 0xe7, 0x3c, 0x38, 0x37, 0xcc, 0x27, + 0x99, 0x2a, 0x38, 0x95, 0x09, 0x8e, 0x9d, 0x92, 0xfe, 0x46, 0x76, 0xaa, 0x1e, 0x65, 0x60, 0x5d, + 0x2f, 0x3d, 0xd7, 0xa9, 0x25, 0x2f, 0x46, 0x2b, 0xe3, 0x52, 0x4f, 0x5f, 0x93, 0x87, 0x65, 0x1b, + 0xb2, 0xcf, 0xd6, 0xfa, 0xb5, 0x6f, 0xfd, 0x14, 0x04, 0xa3, 0x60, 0x65, 0xdc, 0xe6, 0x37, 0x18, + 0x2c, 0x70, 0x69, 0x13, 0xc8, 0x92, 0x5b, 0x6c, 0x1f, 0xd7, 0x6d, 0x02, 0xe9, 0xc0, 0xbc, 0x0f, + 0x85, 0xec, 0xca, 0x7a, 0x0e, 0x3d, 0xcf, 0x47, 0xae, 0x70, 0xe5, 0xb0, 0x3a, 0xfa, 0x81, 0xec, + 0xf9, 0xfd, 0xc0, 0x52, 0xeb, 0x3c, 0xde, 0x70, 0x06, 0x95, 0x62, 0x15, 0xd1, 0x11, 0x75, 0x9c, + 0x7e, 0x4f, 0xee, 0x0b, 0x5c, 0xb0, 0x2f, 0x36, 0xe0, 0xb9, 0x1f, 0x10, 0xd4, 0xce, 0xc6, 0xa8, + 0xe8, 0x2f, 0x64, 0xdb, 0xf5, 0x05, 0x9b, 0x35, 0x6c, 0x6f, 0x6c, 0xa9, 0xda, 0xf6, 0x9c, 0xd6, + 0x6c, 0xcf, 0xcc, 0x04, 0x36, 0x6f, 0xd8, 0xde, 0xc5, 0x68, 0x32, 0xa9, 0x6d, 0xcf, 0xe8, 0xe8, + 0x88, 0x3c, 0xd9, 0x98, 0x61, 0x2c, 0xb3, 0xe6, 0x13, 0xff, 0x3c, 0x8d, 0x2a, 0x70, 0xa2, 0x37, + 0xba, 0x76, 0x4c, 0xfb, 0xdc, 0x67, 0xe8, 0x39, 0xd9, 0x5f, 0x1b, 0x9d, 0x4c, 0x34, 0x1c, 0x99, + 0x0d, 0xfc, 0xd3, 0x48, 0xfe, 0xd2, 0x51, 0xed, 0xc8, 0x78, 0x1d, 0xa7, 0x7f, 0x10, 0xb2, 0x9a, + 0x9e, 0x2c, 0xb7, 0x39, 0xaf, 0xbc, 0x9c, 0xb3, 0xb7, 0x97, 0x97, 0x3a, 0x0a, 0xea, 0x19, 0x8f, + 0x92, 0xb8, 0xb8, 0xb4, 0x0e, 0xfa, 0x8e, 0xec, 0xd6, 0x87, 0x28, 0x2b, 0x6c, 0xc2, 0x91, 0x5f, + 0xd2, 0x3a, 0x82, 0x8b, 0xd1, 0xc8, 0xf0, 0xab, 0x8c, 0xb6, 0xb3, 0x59, 0xd4, 0xa4, 0xd4, 0x07, + 0x10, 0x5b, 0x34, 0xa4, 0x8c, 0x8d, 0x60, 0x7d, 0x25, 0x6d, 0x59, 0xa2, 0x66, 0x2d, 0x67, 0xa4, + 0xe3, 0x4d, 0x29, 0x26, 0x6d, 0x4c, 0x6f, 0x33, 0xc6, 0x95, 0x4c, 0xed, 0x90, 0xdd, 0xe3, 0x4b, + 0xd8, 0x94, 0x86, 0x1b, 0xb4, 0x0c, 0x1b, 0x4a, 0xe3, 0xd2, 0x52, 0xb5, 0xd2, 0x70, 0x5a, 0x53, + 0xc9, 0xfe, 0xa0, 0x65, 0xaa, 0xe1, 0xb5, 0xb8, 0xc2, 0xda, 0x58, 0x40, 0x47, 0xd6, 0xf1, 0x65, + 0x57, 0x2c, 0xff, 0x48, 0x98, 0xbe, 0xa5, 0x2b, 0x3e, 0x54, 0x8a, 0xb5, 0xae, 0x58, 0xe2, 0xf4, + 0x94, 0xb4, 0x6b, 0x7f, 0xe1, 0xec, 0xda, 0x06, 0x75, 0xd7, 0x9b, 0xf9, 0xdc, 0xd1, 0xab, 0x14, + 0xc2, 0x6f, 0xb0, 0x04, 0x7b, 0x27, 0xe4, 0xe0, 0x1d, 0xcc, 0x61, 0x7d, 0x86, 0xaf, 0xcf, 0xfa, + 0x63, 0xf2, 0x24, 0x50, 0x79, 0x71, 0xb7, 0xe8, 0x84, 0x1c, 0x8c, 0x01, 0x75, 0x76, 0x77, 0xd6, + 0x9b, 0xdf, 0xff, 0xf9, 0x35, 0x49, 0x95, 0xf9, 0x2e, 0x88, 0xf3, 0x6c, 0x18, 0x71, 0x15, 0x5f, + 0xc5, 0xb9, 0x2c, 0x86, 0xc5, 0x5c, 0x67, 0x11, 0xc8, 0x1f, 0x30, 0xbe, 0x82, 0x8c, 0xe3, 0x30, + 0xd2, 0xe9, 0x7c, 0x3a, 0x4c, 0xf2, 0xa1, 0xdb, 0xcf, 0xd0, 0x7c, 0xdd, 0x44, 0xdb, 0xf6, 0xe6, + 0xe7, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xec, 0x7c, 0x0d, 0x27, 0x15, 0x09, 0x00, 0x00, } diff --git a/vendor/modules.txt b/vendor/modules.txt index 957f4baf..5dc4e5ba 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -144,7 +144,7 @@ github.com/batchcorp/natty # github.com/batchcorp/pgoutput v0.3.2 ## explicit github.com/batchcorp/pgoutput -# github.com/batchcorp/plumber-schemas v0.0.149 +# github.com/batchcorp/plumber-schemas v0.0.153 ## explicit github.com/batchcorp/plumber-schemas/build/go/protos github.com/batchcorp/plumber-schemas/build/go/protos/args