diff --git a/dynamic/dynamic.go b/dynamic/dynamic.go index 38bf4449..31f9911f 100644 --- a/dynamic/dynamic.go +++ b/dynamic/dynamic.go @@ -261,6 +261,7 @@ func (d *Client) connect(ctx context.Context, bus string) (services.DProxy_Conne MessageBus: bus, PlumberClusterId: d.PlumberClusterID, Name: d.Options.Name, + DynamicId: d.Options.XDynamicId, }, }, } diff --git a/go.mod b/go.mod index b9ae5b2a..d7599c4f 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/Azure/azure-service-bus-go v0.11.5 github.com/apache/pulsar-client-go v0.7.0 github.com/aws/aws-sdk-go v1.34.28 - github.com/batchcorp/collector-schemas v0.0.13 + github.com/batchcorp/collector-schemas v0.0.14 github.com/batchcorp/kong v0.2.17-batch-fix github.com/batchcorp/natty v0.0.16 github.com/batchcorp/pgoutput v0.3.2 diff --git a/go.sum b/go.sum index 6b040ec7..734079e0 100644 --- a/go.sum +++ b/go.sum @@ -119,6 +119,8 @@ github.com/batchcorp/collector-schemas v0.0.12 h1:IfSPmdQBy5oi++wZt0DOi7+8U1f4lz github.com/batchcorp/collector-schemas v0.0.12/go.mod h1:qSVA1UcrApoLX2mS4cj+aH+IvNwcSfm50vWa0UAN/WU= github.com/batchcorp/collector-schemas v0.0.13 h1:zgQ969GJd0qmMz5jYW00b4NWlrnnSYmPskohBooXV6Q= github.com/batchcorp/collector-schemas v0.0.13/go.mod h1:qSVA1UcrApoLX2mS4cj+aH+IvNwcSfm50vWa0UAN/WU= +github.com/batchcorp/collector-schemas v0.0.14 h1:gZILTtA/BzKC03O0obZ0IKnGpTc30cqoY/qr3RDlcGM= +github.com/batchcorp/collector-schemas v0.0.14/go.mod h1:qSVA1UcrApoLX2mS4cj+aH+IvNwcSfm50vWa0UAN/WU= github.com/batchcorp/kong v0.2.17-batch-fix h1:H6sOfst2NcL2T/EZVNLukG7YRimJDHg9DhbRq7gE+KQ= github.com/batchcorp/kong v0.2.17-batch-fix/go.mod h1:ut4pbR4KLPWzKHbpEHZspWpRqjFr4UiPY3D2xf2tzf8= github.com/batchcorp/natty v0.0.15 h1:+Bz8jYUYaCJBK8WsiITJhWUNNlAi3CyKsGfW1Q6A2io= diff --git a/vendor/github.com/batchcorp/collector-schemas/build/go/protos/events/dynamic_replay.pb.go b/vendor/github.com/batchcorp/collector-schemas/build/go/protos/events/dynamic_replay.pb.go index 878bb98c..9bcefce5 100644 --- a/vendor/github.com/batchcorp/collector-schemas/build/go/protos/events/dynamic_replay.pb.go +++ b/vendor/github.com/batchcorp/collector-schemas/build/go/protos/events/dynamic_replay.pb.go @@ -241,8 +241,8 @@ type AuthRequest struct { // Dynamic replays without this value specified will be created as ephemeral tunnels. // Ephemeral tunnels will be deleted after 3 hours of inactivity. PlumberClusterId string `protobuf:"bytes,4,opt,name=plumber_cluster_id,json=plumberClusterId,proto3" json:"plumber_cluster_id,omitempty"` - // Connection ID for the plumber server - ConnectionId string `protobuf:"bytes,5,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + // Dynamic tunnel ID + DynamicId string `protobuf:"bytes,5,opt,name=dynamic_id,json=dynamicId,proto3" json:"dynamic_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -301,9 +301,9 @@ func (m *AuthRequest) GetPlumberClusterId() string { return "" } -func (m *AuthRequest) GetConnectionId() string { +func (m *AuthRequest) GetDynamicId() string { if m != nil { - return m.ConnectionId + return m.DynamicId } return "" } @@ -416,42 +416,42 @@ func init() { func init() { proto.RegisterFile("dynamic_replay.proto", fileDescriptor_04d74edecdc1efa3) } var fileDescriptor_04d74edecdc1efa3 = []byte{ - // 592 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcf, 0x6e, 0xd3, 0x30, - 0x18, 0x6f, 0xb6, 0x76, 0x5b, 0xbf, 0xb6, 0x23, 0x33, 0x3d, 0x44, 0x43, 0x82, 0xa9, 0x5c, 0x76, - 0x18, 0xa9, 0x34, 0x2e, 0x48, 0xb0, 0x43, 0xba, 0x19, 0x52, 0x89, 0xb5, 0xc5, 0x49, 0x90, 0xe0, - 0x40, 0x94, 0x3f, 0xa6, 0x8d, 0x48, 0xe3, 0x10, 0x3b, 0x93, 0xca, 0x2b, 0xf1, 0x08, 0xbc, 0x00, - 0x8f, 0x85, 0x62, 0x27, 0x5b, 0x2b, 0x38, 0x70, 0xcb, 0xef, 0x5f, 0xe2, 0xef, 0xfb, 0x39, 0x30, - 0x8c, 0x37, 0x59, 0xb0, 0x4e, 0x22, 0xbf, 0xa0, 0x79, 0x1a, 0x6c, 0xcc, 0xbc, 0x60, 0x82, 0xa1, - 0x03, 0x7a, 0x47, 0x33, 0xc1, 0x4f, 0x8f, 0x59, 0x29, 0x42, 0x56, 0x66, 0xb1, 0xe2, 0x47, 0xbf, - 0xf6, 0x61, 0x70, 0xa3, 0x02, 0x44, 0xfa, 0x91, 0x09, 0x6d, 0xb1, 0xc9, 0xa9, 0xa1, 0x9d, 0x69, - 0xe7, 0xc7, 0x97, 0xa7, 0xa6, 0x0a, 0x9a, 0x3b, 0x26, 0xd3, 0xdd, 0xe4, 0x94, 0x48, 0x1f, 0x7a, - 0x02, 0x5d, 0xf5, 0x25, 0x3f, 0x89, 0x8d, 0xbd, 0x33, 0xed, 0xbc, 0x4b, 0x8e, 0x14, 0x31, 0x8d, - 0xd1, 0x2b, 0xe8, 0x07, 0xa5, 0x58, 0xf9, 0x05, 0xfd, 0x5e, 0x52, 0x2e, 0x8c, 0xf8, 0x4c, 0x3b, - 0xef, 0x5d, 0x3e, 0x6e, 0x5e, 0x6a, 0x95, 0x62, 0x45, 0x94, 0x64, 0xb7, 0x48, 0x2f, 0x78, 0x80, - 0xe8, 0x35, 0x0c, 0xea, 0x24, 0xcf, 0x59, 0xc6, 0xa9, 0x41, 0x65, 0x74, 0xb8, 0x1b, 0x55, 0x9a, - 0xdd, 0x22, 0xfd, 0x60, 0x0b, 0xa3, 0x2b, 0xd0, 0x9b, 0x39, 0xfd, 0x35, 0xe5, 0x3c, 0x58, 0x52, - 0xe3, 0xab, 0xcc, 0xeb, 0x4d, 0x7e, 0x5e, 0xeb, 0x76, 0x8b, 0x3c, 0x6a, 0xbc, 0xb7, 0xca, 0x8a, - 0xde, 0xc0, 0x71, 0x3d, 0x52, 0x13, 0x5e, 0xee, 0x9e, 0x5b, 0x6d, 0x01, 0x57, 0xc0, 0x6e, 0x91, - 0x81, 0x32, 0xd7, 0xe9, 0xd1, 0x17, 0x68, 0x57, 0xeb, 0x41, 0x5d, 0xe8, 0x78, 0x33, 0x07, 0xbb, - 0x7a, 0x0b, 0xe9, 0xd0, 0xb7, 0x3c, 0xd7, 0xf6, 0x09, 0xfe, 0xe0, 0x61, 0xc7, 0xd5, 0x35, 0x74, - 0x02, 0x83, 0x9a, 0x71, 0x16, 0xf3, 0x99, 0x83, 0xf5, 0x3d, 0x34, 0x04, 0x7d, 0xee, 0xb9, 0x93, - 0xb9, 0x37, 0xbb, 0xf1, 0x6f, 0xb1, 0xe3, 0x58, 0xef, 0xb0, 0xbe, 0x5f, 0x45, 0x09, 0x5e, 0xbc, - 0xb7, 0x3e, 0xf9, 0xf8, 0x23, 0x9e, 0xb9, 0x7a, 0x7b, 0xd2, 0x85, 0xc3, 0x3c, 0xd8, 0xa4, 0x2c, - 0x88, 0x47, 0x3f, 0x35, 0xe8, 0x6d, 0xed, 0x10, 0x0d, 0xa1, 0x23, 0xd8, 0x37, 0x9a, 0xc9, 0xf2, - 0xba, 0x44, 0x01, 0xf4, 0x0c, 0x7a, 0xf5, 0x1c, 0x7e, 0x58, 0xf2, 0xba, 0x23, 0xa8, 0xa9, 0x49, - 0xc9, 0x11, 0x82, 0x76, 0x16, 0xac, 0xa9, 0xb1, 0x2f, 0x15, 0xf9, 0x8c, 0x2e, 0x00, 0xe5, 0x69, - 0xb9, 0x0e, 0x69, 0xe1, 0x47, 0x69, 0xc9, 0x05, 0x2d, 0xaa, 0x7e, 0xdb, 0xd2, 0xa1, 0xd7, 0xca, - 0xb5, 0x12, 0xa6, 0x31, 0x7a, 0x0e, 0x83, 0x88, 0x65, 0x19, 0x8d, 0x44, 0xc2, 0xb2, 0xca, 0xd8, - 0x91, 0xc6, 0xfe, 0x03, 0x39, 0x8d, 0x47, 0x36, 0xf4, 0xb7, 0x5b, 0x43, 0x4f, 0x01, 0xaa, 0xd6, - 0x58, 0x91, 0xfc, 0xa0, 0xb1, 0x3c, 0xf2, 0x11, 0xd9, 0x62, 0x90, 0x01, 0x87, 0xcd, 0xfe, 0xd5, - 0x99, 0x1b, 0x38, 0xfa, 0xad, 0x41, 0x6f, 0xab, 0x03, 0x74, 0xb1, 0x73, 0x67, 0x8d, 0x7f, 0xd4, - 0xf4, 0xbf, 0x37, 0x76, 0x94, 0xfd, 0xdd, 0xde, 0x09, 0x0c, 0xae, 0x09, 0xb6, 0x5c, 0xec, 0xab, - 0x26, 0x74, 0xad, 0x6a, 0x65, 0x61, 0x79, 0xce, 0x3d, 0xb3, 0x57, 0x99, 0x08, 0x76, 0xbc, 0xdb, - 0x7b, 0x4a, 0x56, 0x67, 0x4d, 0xe6, 0xc4, 0x6d, 0x98, 0x76, 0x65, 0x7a, 0x3b, 0x9d, 0x4d, 0x1d, - 0xbb, 0xa1, 0x3a, 0x13, 0x17, 0x4e, 0xf8, 0xca, 0x0c, 0x03, 0x11, 0xad, 0x4c, 0x4e, 0x8b, 0xbb, - 0x24, 0xa2, 0x7c, 0xa1, 0x7d, 0xbe, 0x5a, 0x26, 0x62, 0x55, 0x86, 0x66, 0xc4, 0xd6, 0x63, 0x29, - 0x46, 0xac, 0xc8, 0xc7, 0x11, 0x4b, 0x53, 0x1a, 0x09, 0x56, 0xbc, 0xe0, 0xd1, 0x8a, 0xae, 0x03, - 0x3e, 0x0e, 0xcb, 0x24, 0x8d, 0xc7, 0x4b, 0x36, 0x96, 0xbf, 0x33, 0x1f, 0xab, 0xc9, 0xc3, 0x03, - 0x09, 0x5f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x94, 0xf0, 0x60, 0xa4, 0x0d, 0x04, 0x00, 0x00, + // 588 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0x8e, 0xdb, 0xa4, 0x6d, 0x4e, 0x92, 0xfe, 0xee, 0xfc, 0x59, 0x58, 0x45, 0x40, 0x95, 0x55, + 0x17, 0xc5, 0x91, 0xca, 0x06, 0x09, 0xba, 0x70, 0xda, 0x01, 0x47, 0x22, 0x17, 0xc6, 0x36, 0x12, + 0x2c, 0xb0, 0x7c, 0x19, 0x12, 0x0b, 0xc7, 0x63, 0x3c, 0xe3, 0x4a, 0xe1, 0x7d, 0x78, 0x0a, 0x5e, + 0x80, 0xc7, 0x42, 0x9e, 0xb1, 0x4b, 0x22, 0x58, 0xb0, 0xf3, 0x77, 0xb3, 0xe7, 0x9c, 0x6f, 0x0c, + 0xc3, 0x78, 0x9b, 0x05, 0x9b, 0x24, 0xf2, 0x0b, 0x9a, 0xa7, 0xc1, 0xd6, 0xcc, 0x0b, 0x26, 0x18, + 0x3a, 0xa2, 0xf7, 0x34, 0x13, 0xfc, 0xfc, 0x94, 0x95, 0x22, 0x64, 0x65, 0x16, 0x2b, 0x7e, 0xf4, + 0xe3, 0x10, 0x06, 0x77, 0x2a, 0x40, 0xa4, 0x1f, 0x99, 0xd0, 0x16, 0xdb, 0x9c, 0x1a, 0xda, 0x85, + 0x76, 0x79, 0x7a, 0x7d, 0x6e, 0xaa, 0xa0, 0xb9, 0x67, 0x32, 0xdd, 0x6d, 0x4e, 0x89, 0xf4, 0xa1, + 0x47, 0xd0, 0x55, 0x5f, 0xf2, 0x93, 0xd8, 0x38, 0xb8, 0xd0, 0x2e, 0xbb, 0xe4, 0x44, 0x11, 0xd3, + 0x18, 0xbd, 0x80, 0x7e, 0x50, 0x8a, 0xb5, 0x5f, 0xd0, 0xaf, 0x25, 0xe5, 0xc2, 0x88, 0x2f, 0xb4, + 0xcb, 0xde, 0xf5, 0xff, 0xcd, 0x4b, 0xad, 0x52, 0xac, 0x89, 0x92, 0xec, 0x16, 0xe9, 0x05, 0xbf, + 0x21, 0x7a, 0x09, 0x83, 0x3a, 0xc9, 0x73, 0x96, 0x71, 0x6a, 0x50, 0x19, 0x1d, 0xee, 0x47, 0x95, + 0x66, 0xb7, 0x48, 0x3f, 0xd8, 0xc1, 0xe8, 0x06, 0xf4, 0x66, 0x4e, 0x7f, 0x43, 0x39, 0x0f, 0x56, + 0xd4, 0xf8, 0x2c, 0xf3, 0x7a, 0x93, 0x5f, 0xd4, 0xba, 0xdd, 0x22, 0xff, 0x35, 0xde, 0x99, 0xb2, + 0xa2, 0x57, 0x70, 0x5a, 0x8f, 0xd4, 0x84, 0x57, 0xfb, 0xe7, 0x56, 0x5b, 0xc0, 0x15, 0xb0, 0x5b, + 0x64, 0xa0, 0xcc, 0x75, 0x7a, 0xf4, 0x09, 0xda, 0xd5, 0x7a, 0x50, 0x17, 0x3a, 0xde, 0xdc, 0xc1, + 0xae, 0xde, 0x42, 0x3a, 0xf4, 0x2d, 0xcf, 0xb5, 0x7d, 0x82, 0xdf, 0x79, 0xd8, 0x71, 0x75, 0x0d, + 0x9d, 0xc1, 0xa0, 0x66, 0x9c, 0xe5, 0x62, 0xee, 0x60, 0xfd, 0x00, 0x0d, 0x41, 0x5f, 0x78, 0xee, + 0x64, 0xe1, 0xcd, 0xef, 0xfc, 0x19, 0x76, 0x1c, 0xeb, 0x0d, 0xd6, 0x0f, 0xab, 0x28, 0xc1, 0xcb, + 0xb7, 0xd6, 0x07, 0x1f, 0xbf, 0xc7, 0x73, 0x57, 0x6f, 0x4f, 0xba, 0x70, 0x9c, 0x07, 0xdb, 0x94, + 0x05, 0xf1, 0xe8, 0xbb, 0x06, 0xbd, 0x9d, 0x1d, 0xa2, 0x21, 0x74, 0x04, 0xfb, 0x42, 0x33, 0x59, + 0x5e, 0x97, 0x28, 0x80, 0x9e, 0x42, 0xaf, 0x9e, 0xc3, 0x0f, 0x4b, 0x5e, 0x77, 0x04, 0x35, 0x35, + 0x29, 0x39, 0x42, 0xd0, 0xce, 0x82, 0x0d, 0x35, 0x0e, 0xa5, 0x22, 0x9f, 0xd1, 0x15, 0xa0, 0x3c, + 0x2d, 0x37, 0x21, 0x2d, 0xfc, 0x28, 0x2d, 0xb9, 0xa0, 0x45, 0xd5, 0x6f, 0x5b, 0x3a, 0xf4, 0x5a, + 0xb9, 0x55, 0xc2, 0x34, 0x46, 0x8f, 0x01, 0x9a, 0x6b, 0x97, 0xc4, 0x46, 0x47, 0xba, 0xba, 0x35, + 0x33, 0x8d, 0x47, 0x36, 0xf4, 0x77, 0xfb, 0x42, 0x4f, 0x00, 0xaa, 0xbe, 0x58, 0x91, 0x7c, 0xa3, + 0xb1, 0x3c, 0xec, 0x09, 0xd9, 0x61, 0x90, 0x01, 0xc7, 0xcd, 0xe6, 0xd5, 0x69, 0x1b, 0x38, 0xfa, + 0xa9, 0x41, 0x6f, 0x67, 0xfb, 0xe8, 0x6a, 0xef, 0xb6, 0x1a, 0x7f, 0x29, 0xe8, 0x5f, 0xef, 0xea, + 0x28, 0xfb, 0xb3, 0xb7, 0x33, 0x18, 0xdc, 0x12, 0x6c, 0xb9, 0xd8, 0x57, 0x1d, 0xe8, 0x5a, 0xd5, + 0xc7, 0xd2, 0xf2, 0x9c, 0x07, 0xe6, 0xa0, 0x32, 0x11, 0xec, 0x78, 0xb3, 0x07, 0x4a, 0x96, 0x66, + 0x4d, 0x16, 0xc4, 0x6d, 0x98, 0x76, 0x65, 0x7a, 0x3d, 0x9d, 0x4f, 0x1d, 0xbb, 0xa1, 0x3a, 0x13, + 0x17, 0xce, 0xf8, 0xda, 0x0c, 0x03, 0x11, 0xad, 0x4d, 0x4e, 0x8b, 0xfb, 0x24, 0xa2, 0x7c, 0xa9, + 0x7d, 0xbc, 0x59, 0x25, 0x62, 0x5d, 0x86, 0x66, 0xc4, 0x36, 0x63, 0x29, 0x46, 0xac, 0xc8, 0xc7, + 0x11, 0x4b, 0x53, 0x1a, 0x09, 0x56, 0x3c, 0xe3, 0xd1, 0x9a, 0x6e, 0x02, 0x3e, 0x0e, 0xcb, 0x24, + 0x8d, 0xc7, 0x2b, 0x36, 0x96, 0x3f, 0x32, 0x1f, 0xab, 0xc9, 0xc3, 0x23, 0x09, 0x9f, 0xff, 0x0a, + 0x00, 0x00, 0xff, 0xff, 0xaf, 0x6b, 0x07, 0x96, 0x07, 0x04, 0x00, 0x00, } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2670fe20..07144e3d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -129,7 +129,7 @@ github.com/aws/aws-sdk-go/service/sqs github.com/aws/aws-sdk-go/service/sqs/sqsiface github.com/aws/aws-sdk-go/service/sts github.com/aws/aws-sdk-go/service/sts/stsiface -# github.com/batchcorp/collector-schemas v0.0.13 +# github.com/batchcorp/collector-schemas v0.0.14 ## explicit github.com/batchcorp/collector-schemas/build/go/protos/common github.com/batchcorp/collector-schemas/build/go/protos/events