From 9332679c2c6aaef60e7cba1f4a8b9749510b9b0d Mon Sep 17 00:00:00 2001 From: Derek Wang Date: Tue, 5 Apr 2022 22:53:28 -0700 Subject: [PATCH] feat: use user/pass for JetStream authentication (#1809) Signed-off-by: Derek Wang --- api/event-bus.html | 40 +- api/event-bus.md | 45 +- api/jsonschema/schema.json | 14 +- api/openapi-spec/swagger.json | 14 +- common/leaderelection/leaderelection.go | 5 +- .../assets/jetstream/server-auth.conf | 11 +- .../eventbus/installer/installer_test.go | 3 +- controllers/eventbus/installer/jetstream.go | 25 +- controllers/eventsource/resource.go | 7 +- controllers/sensor/resource.go | 7 +- eventbus/driver.go | 2 +- eventbus/jetstream/base/jetstream.go | 3 + pkg/apis/eventbus/v1alpha1/generated.pb.go | 433 ++++++------------ pkg/apis/eventbus/v1alpha1/generated.proto | 10 +- .../eventbus/v1alpha1/jetstream_eventbus.go | 12 +- pkg/apis/eventbus/v1alpha1/nats_eventbus.go | 1 + .../eventbus/v1alpha1/openapi_generated.go | 28 +- .../v1alpha1/zz_generated.deepcopy.go | 27 +- 18 files changed, 195 insertions(+), 492 deletions(-) diff --git a/api/event-bus.html b/api/event-bus.html index 2e39ac7b9c..99aeb0e0cd 100644 --- a/api/event-bus.html +++ b/api/event-bus.html @@ -297,38 +297,6 @@

EventBusStatus -

JetStreamAuth -

-

-(Appears on: -JetStreamConfig) -

-

-

- - - - - - - - - - - - - -
FieldDescription
-token
- - -Kubernetes core/v1.SecretKeySelector - - -		 -(Optional) -

Secret for auth token

-

JetStreamBus

@@ -627,14 +595,16 @@

JetStreamConfig -auth
+accessSecret
- -JetStreamAuth + +Kubernetes core/v1.SecretKeySelector +(Optional) +

Secret for auth

diff --git a/api/event-bus.md b/api/event-bus.md index 9834382e57..5fb7358ca6 100644 --- a/api/event-bus.md +++ b/api/event-bus.md @@ -300,42 +300,6 @@ Config holds the fininalized configuration of EventBus -

-JetStreamAuth -

-

-(Appears on: -JetStreamConfig) -

-

-

- - - - - - - - - - - - - -
-Field - -Description -
-token
- -Kubernetes core/v1.SecretKeySelector -		 -(Optional) -

-Secret for auth token -

-

JetStreamBus

@@ -638,10 +602,15 @@ JetStream (Nats) URL -auth
- JetStreamAuth +accessSecret
+ +Kubernetes core/v1.SecretKeySelector +(Optional) +

+Secret for auth +

diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json index e77a189273..2d0e9cdc89 100644 --- a/api/jsonschema/schema.json +++ b/api/jsonschema/schema.json @@ -380,15 +380,6 @@ }, "type": "object" }, - "io.argoproj.eventbus.v1alpha1.JetStreamAuth": { - "properties": { - "token": { - "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector", - "description": "Secret for auth token" - } - }, - "type": "object" - }, "io.argoproj.eventbus.v1alpha1.JetStreamBus": { "description": "JetStreamBus holds the JetStream EventBus information", "properties": { @@ -484,8 +475,9 @@ }, "io.argoproj.eventbus.v1alpha1.JetStreamConfig": { "properties": { - "auth": { - "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.JetStreamAuth" + "accessSecret": { + "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector", + "description": "Secret for auth" }, "streamConfig": { "type": "string" diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 78838a85a0..d6ffb2e35e 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -372,15 +372,6 @@ } } }, - "io.argoproj.eventbus.v1alpha1.JetStreamAuth": { - "type": "object", - "properties": { - "token": { - "description": "Secret for auth token", - "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" - } - } - }, "io.argoproj.eventbus.v1alpha1.JetStreamBus": { "description": "JetStreamBus holds the JetStream EventBus information", "type": "object", @@ -477,8 +468,9 @@ "io.argoproj.eventbus.v1alpha1.JetStreamConfig": { "type": "object", "properties": { - "auth": { - "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.JetStreamAuth" + "accessSecret": { + "description": "Secret for auth", + "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" }, "streamConfig": { "type": "string" diff --git a/common/leaderelection/leaderelection.go b/common/leaderelection/leaderelection.go index 36ea109cef..a4e92d0e53 100644 --- a/common/leaderelection/leaderelection.go +++ b/common/leaderelection/leaderelection.go @@ -36,7 +36,7 @@ func NewEventBusElector(ctx context.Context, eventBusConfig eventbusv1alpha1.Bus eventBusAuth = eventBusConfig.NATS.Auth case eventBusConfig.JetStream != nil: eventBusType = apicommon.EventBusJetStream - eventBusAuth = &eventbusv1alpha1.AuthStrategyToken + eventBusAuth = &eventbusv1alpha1.AuthStrategyBasic default: return nil, errors.New("invalid event bus") } @@ -108,6 +108,9 @@ func (e *natsEventBusElector) RunOrDie(ctx context.Context, callbacks LeaderCall opts.Url = e.url if e.auth.Strategy == eventbusv1alpha1.AuthStrategyToken { opts.Token = e.auth.Crendential.Token + } else if e.auth.Strategy == eventbusv1alpha1.AuthStrategyBasic { + opts.User = e.auth.Crendential.Username + opts.Password = e.auth.Crendential.Password } rpc, err := graft.NewNatsRpc(opts) if err != nil { diff --git a/controllers/eventbus/installer/assets/jetstream/server-auth.conf b/controllers/eventbus/installer/assets/jetstream/server-auth.conf index b360722e5c..dedfa06ee9 100644 --- a/controllers/eventbus/installer/assets/jetstream/server-auth.conf +++ b/controllers/eventbus/installer/assets/jetstream/server-auth.conf @@ -1,12 +1,15 @@ system_account: sys -authorization { - token: "{{.Token}}" -} accounts: { + "js": { + "jetstream": true, + "users": [ + {"user": "{{.JetStreamUser}}", "pass": "{{.JetStreamPassword}}"} + ] + }, "sys": { "users": [ - {"user": "sys", "pass":"{{.SysPassword}}"} + {"user": "sys", "pass": "{{.SysPassword}}"} ] } } diff --git a/controllers/eventbus/installer/installer_test.go b/controllers/eventbus/installer/installer_test.go index 9a214e25fe..d7ce53f9fc 100644 --- a/controllers/eventbus/installer/installer_test.go +++ b/controllers/eventbus/installer/installer_test.go @@ -187,7 +187,6 @@ func TestInstall(t *testing.T) { assert.True(t, testObj.Status.IsReady()) assert.NotNil(t, testObj.Status.Config.JetStream) assert.NotEmpty(t, testObj.Status.Config.JetStream.URL) - assert.NotNil(t, testObj.Status.Config.JetStream.Auth) - assert.NotNil(t, testObj.Status.Config.JetStream.Auth.Token) + assert.NotNil(t, testObj.Status.Config.JetStream.AccessSecret) }) } diff --git a/controllers/eventbus/installer/jetstream.go b/controllers/eventbus/installer/jetstream.go index 6f5c4eb8ed..65e693b0f2 100644 --- a/controllers/eventbus/installer/jetstream.go +++ b/controllers/eventbus/installer/jetstream.go @@ -100,13 +100,11 @@ func (r *jetStreamInstaller) Install(ctx context.Context) (*v1alpha1.BusConfig, return &v1alpha1.BusConfig{ JetStream: &v1alpha1.JetStreamConfig{ URL: fmt.Sprintf("nats://%s.%s.svc.cluster.local:%s", generateJetStreamServiceName(r.eventBus), r.eventBus.Namespace, strconv.Itoa(int(jsClientPort))), - Auth: &v1alpha1.JetStreamAuth{ - Token: &corev1.SecretKeySelector{ - LocalObjectReference: corev1.LocalObjectReference{ - Name: generateJetStreamClientAuthSecretName(r.eventBus), - }, - Key: common.JetStreamClientAuthSecretKey, + AccessSecret: &corev1.SecretKeySelector{ + LocalObjectReference: corev1.LocalObjectReference{ + Name: generateJetStreamClientAuthSecretName(r.eventBus), }, + Key: common.JetStreamClientAuthSecretKey, }, StreamConfig: string(b), }, @@ -440,16 +438,19 @@ func (r *jetStreamInstaller) buildStatefulSetSpec(jsVersion *controllers.JetStre func (r *jetStreamInstaller) createSecrets(ctx context.Context) error { encryptionKey := common.RandomString(12) - token := common.RandomString(24) + jsUser := common.RandomString(8) + jsPass := common.RandomString(16) sysPassword := common.RandomString(24) authTpl := template.Must(template.ParseFS(jetStremAssets, "assets/jetstream/server-auth.conf")) var authTplOutput bytes.Buffer if err := authTpl.Execute(&authTplOutput, struct { - Token string - SysPassword string + JetStreamUser string + JetStreamPassword string + SysPassword string }{ - Token: token, - SysPassword: sysPassword, + JetStreamUser: jsUser, + JetStreamPassword: jsPass, + SysPassword: sysPassword, }); err != nil { return fmt.Errorf("failed to parse nats auth template, error: %w", err) } @@ -481,7 +482,7 @@ func (r *jetStreamInstaller) createSecrets(ctx context.Context) error { }, Type: corev1.SecretTypeOpaque, Data: map[string][]byte{ - common.JetStreamClientAuthSecretKey: []byte(fmt.Sprintf("token: \"%s\"", token)), + common.JetStreamClientAuthSecretKey: []byte(fmt.Sprintf("username: %s\npassword: %s", jsUser, jsPass)), }, } diff --git a/controllers/eventsource/resource.go b/controllers/eventsource/resource.go index f42572d68f..d6b6853829 100644 --- a/controllers/eventsource/resource.go +++ b/controllers/eventsource/resource.go @@ -200,17 +200,14 @@ func buildDeployment(args *AdaptorArgs, eventBus *eventbusv1alpha1.EventBus) (*a } encodedBusConfig := base64.StdEncoding.EncodeToString(busConfigBytes) envVars = append(envVars, corev1.EnvVar{Name: common.EnvVarEventBusConfig, Value: encodedBusConfig}) - var authStrategy *eventbusv1alpha1.AuthStrategy var accessSecret *corev1.SecretKeySelector switch { case eventBus.Status.Config.NATS != nil: natsConf := eventBus.Status.Config.NATS - authStrategy = natsConf.Auth accessSecret = natsConf.AccessSecret case eventBus.Status.Config.JetStream != nil: jsConf := eventBus.Status.Config.JetStream - authStrategy = &eventbusv1alpha1.AuthStrategyToken - accessSecret = jsConf.Auth.Token + accessSecret = jsConf.AccessSecret default: return nil, errors.New("unsupported event bus") } @@ -223,7 +220,7 @@ func buildDeployment(args *AdaptorArgs, eventBus *eventbusv1alpha1.EventBus) (*a }) volumeMounts = append(volumeMounts, corev1.VolumeMount{Name: emptyDirVolName, MountPath: "/tmp"}) - if authStrategy != nil && accessSecret != nil { + if accessSecret != nil { // Mount the secret as volume instead of using envFrom to gain the ability // for the sensor deployment to auto reload when the secret changes volumes = append(volumes, corev1.Volume{ diff --git a/controllers/sensor/resource.go b/controllers/sensor/resource.go index 3d11cf7152..dcc6a9f8c8 100644 --- a/controllers/sensor/resource.go +++ b/controllers/sensor/resource.go @@ -167,17 +167,14 @@ func buildDeployment(args *AdaptorArgs, eventBus *eventbusv1alpha1.EventBus) (*a encodedBusConfig := base64.StdEncoding.EncodeToString(busConfigBytes) envVars = append(envVars, corev1.EnvVar{Name: common.EnvVarEventBusConfig, Value: encodedBusConfig}) - var authStrategy *eventbusv1alpha1.AuthStrategy var accessSecret *corev1.SecretKeySelector switch { case eventBus.Status.Config.NATS != nil: natsConf := eventBus.Status.Config.NATS - authStrategy = natsConf.Auth accessSecret = natsConf.AccessSecret case eventBus.Status.Config.JetStream != nil: jsConf := eventBus.Status.Config.JetStream - authStrategy = &eventbusv1alpha1.AuthStrategyToken - accessSecret = jsConf.Auth.Token + accessSecret = jsConf.AccessSecret default: return nil, errors.New("unsupported event bus") } @@ -190,7 +187,7 @@ func buildDeployment(args *AdaptorArgs, eventBus *eventbusv1alpha1.EventBus) (*a }) volumeMounts = append(volumeMounts, corev1.VolumeMount{Name: emptyDirVolName, MountPath: "/tmp"}) - if authStrategy != nil && accessSecret != nil { + if accessSecret != nil { // Mount the secret as volume instead of using envFrom to gain the ability // for the sensor deployment to auto reload when the secret changes volumes = append(volumes, corev1.Volume{ diff --git a/eventbus/driver.go b/eventbus/driver.go index 051820f516..351c38b251 100644 --- a/eventbus/driver.go +++ b/eventbus/driver.go @@ -110,7 +110,7 @@ func GetAuth(ctx context.Context, eventBusConfig eventbusv1alpha1.BusConfig) (*e case eventBusConfig.NATS != nil: eventBusAuth = eventBusConfig.NATS.Auth case eventBusConfig.JetStream != nil: - eventBusAuth = &eventbusv1alpha1.AuthStrategyToken + eventBusAuth = &eventbusv1alpha1.AuthStrategyBasic default: return nil, errors.New("invalid event bus") } diff --git a/eventbus/jetstream/base/jetstream.go b/eventbus/jetstream/base/jetstream.go index 22795e6215..52bb1b6929 100644 --- a/eventbus/jetstream/base/jetstream.go +++ b/eventbus/jetstream/base/jetstream.go @@ -71,6 +71,9 @@ func (stream *Jetstream) MakeConnection() (*JetstreamConnection, error) { case eventbusv1alpha1.AuthStrategyToken: log.Info("NATS auth strategy: Token") opts = append(opts, nats.Token(stream.auth.Crendential.Token)) + case eventbusv1alpha1.AuthStrategyBasic: + log.Info("NATS auth strategy: Basic") + opts = append(opts, nats.UserInfo(stream.auth.Crendential.Username, stream.auth.Crendential.Password)) case eventbusv1alpha1.AuthStrategyNone: log.Info("NATS auth strategy: None") default: diff --git a/pkg/apis/eventbus/v1alpha1/generated.pb.go b/pkg/apis/eventbus/v1alpha1/generated.pb.go index 71a4123f05..4c1cf129e9 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.pb.go +++ b/pkg/apis/eventbus/v1alpha1/generated.pb.go @@ -216,38 +216,10 @@ func (m *EventBusStatus) XXX_DiscardUnknown() { var xxx_messageInfo_EventBusStatus proto.InternalMessageInfo -func (m *JetStreamAuth) Reset() { *m = JetStreamAuth{} } -func (*JetStreamAuth) ProtoMessage() {} -func (*JetStreamAuth) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{6} -} -func (m *JetStreamAuth) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *JetStreamAuth) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil -} -func (m *JetStreamAuth) XXX_Merge(src proto.Message) { - xxx_messageInfo_JetStreamAuth.Merge(m, src) -} -func (m *JetStreamAuth) XXX_Size() int { - return m.Size() -} -func (m *JetStreamAuth) XXX_DiscardUnknown() { - xxx_messageInfo_JetStreamAuth.DiscardUnknown(m) -} - -var xxx_messageInfo_JetStreamAuth proto.InternalMessageInfo - func (m *JetStreamBus) Reset() { *m = JetStreamBus{} } func (*JetStreamBus) ProtoMessage() {} func (*JetStreamBus) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{7} + return fileDescriptor_871e47633eb7aad4, []int{6} } func (m *JetStreamBus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -275,7 +247,7 @@ var xxx_messageInfo_JetStreamBus proto.InternalMessageInfo func (m *JetStreamConfig) Reset() { *m = JetStreamConfig{} } func (*JetStreamConfig) ProtoMessage() {} func (*JetStreamConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{8} + return fileDescriptor_871e47633eb7aad4, []int{7} } func (m *JetStreamConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -303,7 +275,7 @@ var xxx_messageInfo_JetStreamConfig proto.InternalMessageInfo func (m *NATSBus) Reset() { *m = NATSBus{} } func (*NATSBus) ProtoMessage() {} func (*NATSBus) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{9} + return fileDescriptor_871e47633eb7aad4, []int{8} } func (m *NATSBus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -331,7 +303,7 @@ var xxx_messageInfo_NATSBus proto.InternalMessageInfo func (m *NATSConfig) Reset() { *m = NATSConfig{} } func (*NATSConfig) ProtoMessage() {} func (*NATSConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{10} + return fileDescriptor_871e47633eb7aad4, []int{9} } func (m *NATSConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -359,7 +331,7 @@ var xxx_messageInfo_NATSConfig proto.InternalMessageInfo func (m *NativeStrategy) Reset() { *m = NativeStrategy{} } func (*NativeStrategy) ProtoMessage() {} func (*NativeStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{11} + return fileDescriptor_871e47633eb7aad4, []int{10} } func (m *NativeStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -387,7 +359,7 @@ var xxx_messageInfo_NativeStrategy proto.InternalMessageInfo func (m *PersistenceStrategy) Reset() { *m = PersistenceStrategy{} } func (*PersistenceStrategy) ProtoMessage() {} func (*PersistenceStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_871e47633eb7aad4, []int{12} + return fileDescriptor_871e47633eb7aad4, []int{11} } func (m *PersistenceStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -419,7 +391,6 @@ func init() { proto.RegisterType((*EventBusList)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.EventBusList") proto.RegisterType((*EventBusSpec)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.EventBusSpec") proto.RegisterType((*EventBusStatus)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.EventBusStatus") - proto.RegisterType((*JetStreamAuth)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.JetStreamAuth") proto.RegisterType((*JetStreamBus)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.JetStreamBus") proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.JetStreamBus.NodeSelectorEntry") proto.RegisterType((*JetStreamConfig)(nil), "github.com.argoproj.argo_events.pkg.apis.eventbus.v1alpha1.JetStreamConfig") @@ -435,122 +406,120 @@ func init() { } var fileDescriptor_871e47633eb7aad4 = []byte{ - // 1839 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdd, 0x6e, 0x1b, 0xc7, - 0x15, 0xd6, 0xea, 0x97, 0x1c, 0x52, 0x3f, 0x1c, 0x29, 0xcd, 0x5a, 0x88, 0x49, 0x83, 0x45, 0x0a, - 0x15, 0xb1, 0x97, 0x75, 0x10, 0xb4, 0x6e, 0x6e, 0x5c, 0xae, 0x22, 0xd7, 0x72, 0x44, 0x47, 0x1d, - 0x2a, 0x2e, 0x9a, 0x06, 0x75, 0x47, 0xab, 0x11, 0xb5, 0x12, 0x77, 0x87, 0xdd, 0x99, 0x25, 0xc4, - 0x5e, 0x15, 0x7d, 0x82, 0xa0, 0x28, 0x8a, 0xbe, 0x41, 0x81, 0x3e, 0x40, 0x9f, 0xc1, 0x17, 0xbd, - 0x08, 0x90, 0x8b, 0xe6, 0x8a, 0x88, 0x19, 0x14, 0x28, 0xd0, 0x37, 0xf0, 0x55, 0x31, 0xb3, 0xb3, - 0x3f, 0xdc, 0x5d, 0xc6, 0x8a, 0x49, 0xd5, 0xc8, 0x95, 0x38, 0xe7, 0x9c, 0xf9, 0xce, 0xcf, 0x9c, - 0x3d, 0xf3, 0x8d, 0xc0, 0xa3, 0x8e, 0xcd, 0xcf, 0xfc, 0x63, 0xc3, 0xa2, 0x4e, 0x03, 0x7b, 0x1d, - 0xda, 0xf3, 0xe8, 0xb9, 0xfc, 0x71, 0x87, 0xf4, 0x89, 0xcb, 0x59, 0xa3, 0x77, 0xd1, 0x69, 0xe0, - 0x9e, 0xcd, 0x1a, 0x72, 0x7d, 0xec, 0xb3, 0x46, 0xff, 0x2e, 0xee, 0xf6, 0xce, 0xf0, 0xdd, 0x46, - 0x87, 0xb8, 0xc4, 0xc3, 0x9c, 0x9c, 0x18, 0x3d, 0x8f, 0x72, 0x0a, 0xdf, 0x8f, 0xb1, 0x8c, 0x10, - 0x4b, 0xfe, 0x78, 0x1a, 0x60, 0x19, 0xbd, 0x8b, 0x8e, 0x21, 0xb0, 0x8c, 0x10, 0xcb, 0x08, 0xb1, - 0xb6, 0xef, 0x5f, 0x39, 0x0e, 0x8b, 0x3a, 0x0e, 0x75, 0xd3, 0xce, 0xb7, 0xef, 0x24, 0x00, 0x3a, - 0xb4, 0x43, 0x1b, 0x52, 0x7c, 0xec, 0x9f, 0xca, 0x95, 0x5c, 0xc8, 0x5f, 0xca, 0xbc, 0x7e, 0x71, - 0x8f, 0x19, 0x36, 0x15, 0x90, 0x0d, 0x8b, 0x7a, 0xa4, 0xd1, 0xcf, 0xe4, 0xb3, 0xfd, 0x5e, 0x6c, - 0xe3, 0x60, 0xeb, 0xcc, 0x76, 0x89, 0x37, 0x08, 0xe3, 0x68, 0x78, 0x84, 0x51, 0xdf, 0xb3, 0xc8, - 0xb7, 0xda, 0xc5, 0x1a, 0x0e, 0xe1, 0x38, 0xcf, 0x57, 0x63, 0xd2, 0x2e, 0xcf, 0x77, 0xb9, 0xed, - 0x64, 0xdd, 0xfc, 0xf8, 0x65, 0x1b, 0x98, 0x75, 0x46, 0x1c, 0x9c, 0xde, 0x57, 0xff, 0xaf, 0x06, - 0x8a, 0xa6, 0xcf, 0x76, 0xa9, 0x7b, 0x6a, 0x77, 0xe0, 0x09, 0x58, 0x74, 0x31, 0x67, 0xba, 0x76, - 0x4b, 0xdb, 0x29, 0xbd, 0xfb, 0xc0, 0x78, 0xf5, 0x13, 0x34, 0x1e, 0x37, 0x8f, 0xda, 0x01, 0xaa, - 0x59, 0x18, 0x0d, 0x6b, 0x8b, 0x62, 0x8d, 0x24, 0x3a, 0xbc, 0x04, 0xc5, 0x73, 0xc2, 0x19, 0xf7, - 0x08, 0x76, 0xf4, 0x79, 0xe9, 0xea, 0xc3, 0x69, 0x5c, 0x3d, 0x22, 0xbc, 0x2d, 0xc1, 0x94, 0xbf, - 0xd5, 0xd1, 0xb0, 0x56, 0x8c, 0x84, 0x28, 0x76, 0x56, 0xff, 0xc7, 0x3c, 0xa8, 0xec, 0x52, 0x97, - 0x63, 0x51, 0x9f, 0x23, 0xe2, 0xf4, 0xba, 0x98, 0x13, 0xf8, 0x2b, 0x50, 0x0c, 0x8f, 0x2f, 0x4c, - 0x7d, 0xc7, 0x08, 0xea, 0x29, 0x5c, 0x1a, 0xa2, 0x21, 0x8c, 0xfe, 0x5d, 0x03, 0x29, 0x23, 0x44, - 0x7e, 0xe7, 0xdb, 0x1e, 0x71, 0x44, 0x5c, 0x66, 0xe5, 0xd9, 0xb0, 0x36, 0x27, 0x1c, 0x86, 0x5a, - 0x86, 0x62, 0x34, 0x78, 0x0c, 0xd6, 0x6d, 0x07, 0x77, 0xc8, 0xa1, 0xdf, 0xed, 0x1e, 0xd2, 0xae, - 0x6d, 0x0d, 0x64, 0xc2, 0x45, 0xf3, 0x9e, 0xda, 0xb6, 0xbe, 0x3f, 0xae, 0x7e, 0x31, 0xac, 0xdd, - 0xcc, 0xf6, 0xa2, 0x11, 0x1b, 0xa0, 0x34, 0xa0, 0xf0, 0xc1, 0x88, 0xe5, 0x7b, 0x36, 0x1f, 0x88, - 0xdc, 0xc8, 0x25, 0xd7, 0x17, 0x64, 0x12, 0xdf, 0xcf, 0x4b, 0xa2, 0x3d, 0x6e, 0x6a, 0x6e, 0x8a, - 0x20, 0x52, 0x42, 0x94, 0x06, 0xac, 0xff, 0x73, 0x1e, 0x14, 0xf6, 0x44, 0xe1, 0x4d, 0x9f, 0xc1, - 0xdf, 0x82, 0x82, 0xe8, 0xdb, 0x13, 0xcc, 0xb1, 0x2a, 0xd7, 0x8f, 0x12, 0x9e, 0xa2, 0xf6, 0x8b, - 0x8f, 0x4c, 0x58, 0x0b, 0xdf, 0x1f, 0x1d, 0x9f, 0x13, 0x8b, 0xb7, 0x08, 0xc7, 0x26, 0x54, 0xf9, - 0x83, 0x58, 0x86, 0x22, 0x54, 0x78, 0x0e, 0x16, 0x59, 0x8f, 0x58, 0xaa, 0x39, 0x1e, 0x4e, 0xd3, - 0x1c, 0x61, 0xd4, 0xed, 0x1e, 0xb1, 0xcc, 0xb2, 0xf2, 0xba, 0x28, 0x56, 0x48, 0xfa, 0x80, 0x1e, - 0x58, 0x66, 0x1c, 0x73, 0x9f, 0xa9, 0xaa, 0x3d, 0x9a, 0x89, 0x37, 0x89, 0x68, 0xae, 0x29, 0x7f, - 0xcb, 0xc1, 0x1a, 0x29, 0x4f, 0xf5, 0x7f, 0x69, 0xa0, 0x1c, 0x9a, 0x1e, 0xd8, 0x8c, 0xc3, 0x4f, - 0x33, 0x25, 0x35, 0xae, 0x56, 0x52, 0xb1, 0x5b, 0x16, 0x74, 0x43, 0xb9, 0x2a, 0x84, 0x92, 0x44, - 0x39, 0x6d, 0xb0, 0x64, 0x73, 0xe2, 0x30, 0x7d, 0xfe, 0xd6, 0xc2, 0x4e, 0xe9, 0xdd, 0x0f, 0x66, - 0x91, 0xa1, 0xb9, 0xaa, 0x1c, 0x2e, 0xed, 0x0b, 0x68, 0x14, 0x78, 0xa8, 0xff, 0x27, 0x91, 0x99, - 0x28, 0x32, 0xc4, 0x63, 0x23, 0x65, 0x77, 0xda, 0x91, 0x22, 0x3c, 0xa7, 0xe7, 0x89, 0x9f, 0x9d, - 0x27, 0x0f, 0x67, 0x32, 0x4f, 0x64, 0x9a, 0x13, 0x87, 0xc9, 0x57, 0x1a, 0x58, 0x1b, 0x3f, 0x6f, - 0xf8, 0x34, 0xea, 0xa5, 0x20, 0xdd, 0x9f, 0x5c, 0x3d, 0x8c, 0xe0, 0x1e, 0x33, 0xbe, 0xb9, 0x71, - 0xa0, 0x03, 0x96, 0x2d, 0x39, 0xe4, 0x54, 0x9e, 0x7b, 0xd3, 0xe4, 0x19, 0xcd, 0xfd, 0xd8, 0x5d, - 0xb0, 0x46, 0xca, 0x49, 0xfd, 0x97, 0x60, 0x35, 0x4a, 0xbd, 0xe9, 0xf3, 0x33, 0xf8, 0x00, 0x2c, - 0x71, 0x7a, 0x41, 0x5c, 0x95, 0xdf, 0xdb, 0x13, 0x26, 0x8c, 0x47, 0xf8, 0x87, 0x64, 0xd0, 0x26, - 0x5d, 0x62, 0x71, 0xea, 0x99, 0x45, 0xd1, 0x26, 0x47, 0x62, 0x1f, 0x0a, 0xb6, 0xd7, 0xbf, 0x58, - 0x05, 0xe5, 0x64, 0x99, 0xe1, 0x0f, 0xc1, 0x4a, 0x9f, 0x78, 0xcc, 0xa6, 0x01, 0x74, 0xd1, 0x5c, - 0x57, 0x21, 0xad, 0x3c, 0x09, 0xc4, 0x28, 0xd4, 0xc3, 0x1d, 0x50, 0xf0, 0x48, 0xaf, 0x6b, 0x5b, - 0x98, 0xc9, 0x2a, 0x2c, 0x99, 0x65, 0xd1, 0xf7, 0x48, 0xc9, 0x50, 0xa4, 0x85, 0x7f, 0xd2, 0x40, - 0xc5, 0x4a, 0x8f, 0x7b, 0xf5, 0x99, 0xb7, 0xa6, 0xa9, 0x5c, 0xe6, 0x0e, 0x31, 0xdf, 0x18, 0x0d, - 0x6b, 0xd9, 0xab, 0x05, 0x65, 0xdd, 0xc3, 0xbf, 0x6b, 0xe0, 0x86, 0x47, 0xba, 0x14, 0x9f, 0x10, - 0x2f, 0xb3, 0x41, 0x5f, 0xbc, 0x8e, 0xe0, 0x6e, 0x8e, 0x86, 0xb5, 0x1b, 0x68, 0x92, 0x4f, 0x34, - 0x39, 0x1c, 0xf8, 0x37, 0x0d, 0xe8, 0x0e, 0xe1, 0x9e, 0x6d, 0xb1, 0x6c, 0xac, 0x4b, 0xd7, 0x11, - 0xeb, 0x5b, 0xa3, 0x61, 0x4d, 0x6f, 0x4d, 0x70, 0x89, 0x26, 0x06, 0x03, 0xff, 0xa8, 0x81, 0x52, - 0x4f, 0x74, 0x08, 0xe3, 0xc4, 0xb5, 0x88, 0xbe, 0x2c, 0x83, 0xfb, 0x68, 0x9a, 0xe0, 0x0e, 0x63, - 0xb8, 0x36, 0x17, 0xa4, 0xa9, 0x33, 0x30, 0xd7, 0x47, 0xc3, 0x5a, 0x29, 0xa1, 0x40, 0x49, 0xa7, - 0xd0, 0x4a, 0x8c, 0xf1, 0x15, 0x19, 0xc0, 0x4f, 0xbf, 0xf5, 0x04, 0x68, 0x29, 0x80, 0xa0, 0xab, - 0xc3, 0x55, 0x62, 0x9a, 0xff, 0x59, 0x03, 0x65, 0x97, 0x9e, 0x90, 0xf0, 0xf3, 0xd2, 0x0b, 0x72, - 0xaa, 0x7f, 0x32, 0xab, 0x91, 0x67, 0x3c, 0x4e, 0x80, 0xef, 0xb9, 0xdc, 0x1b, 0x98, 0x5b, 0xea, - 0x63, 0x2c, 0x27, 0x55, 0x68, 0x2c, 0x0a, 0xf8, 0x31, 0x28, 0x71, 0xda, 0x15, 0xe4, 0xd2, 0xa6, - 0x2e, 0xd3, 0x8b, 0x32, 0xa8, 0x6a, 0xde, 0x80, 0x38, 0x8a, 0xcc, 0xcc, 0x4d, 0x05, 0x5c, 0x8a, - 0x65, 0x0c, 0x25, 0x71, 0x20, 0xc9, 0xb2, 0x1b, 0x20, 0x2b, 0xfb, 0x83, 0x3c, 0xe8, 0x43, 0x7a, - 0xf2, 0x4a, 0x04, 0x07, 0xba, 0x60, 0x23, 0xe2, 0x55, 0xc1, 0x00, 0x63, 0x7a, 0x49, 0xa6, 0x90, - 0x4b, 0x05, 0x0f, 0xa8, 0x85, 0xbb, 0x01, 0x75, 0x41, 0xe4, 0x94, 0x78, 0xe2, 0xf4, 0x4d, 0x5d, - 0x25, 0xb3, 0xb1, 0x9f, 0x42, 0x42, 0x19, 0x6c, 0xf8, 0x73, 0x50, 0xe9, 0x79, 0x36, 0x95, 0x21, - 0x74, 0x31, 0x63, 0x8f, 0xb1, 0x43, 0xf4, 0xb2, 0x9c, 0x7c, 0x37, 0x14, 0x4c, 0xe5, 0x30, 0x6d, - 0x80, 0xb2, 0x7b, 0xc4, 0x34, 0x0c, 0x85, 0xfa, 0x6a, 0x3c, 0x0d, 0xc3, 0xbd, 0x28, 0xd2, 0xc2, - 0x07, 0xa0, 0x80, 0x4f, 0x4f, 0x6d, 0x57, 0x58, 0xae, 0xc9, 0x12, 0xbe, 0x95, 0x97, 0x5a, 0x53, - 0xd9, 0x04, 0x38, 0xe1, 0x0a, 0x45, 0x7b, 0xe1, 0x23, 0x00, 0x19, 0xf1, 0xfa, 0xb6, 0x45, 0x9a, - 0x96, 0x45, 0x7d, 0x97, 0xcb, 0xd8, 0xd7, 0x65, 0xec, 0xdb, 0x2a, 0x76, 0xd8, 0xce, 0x58, 0xa0, - 0x9c, 0x5d, 0x22, 0x7a, 0x46, 0x38, 0xb7, 0xdd, 0x0e, 0xd3, 0x37, 0x24, 0x82, 0xf4, 0xda, 0x56, - 0x32, 0x14, 0x69, 0xe1, 0x3b, 0xa0, 0xc8, 0x38, 0xf6, 0x78, 0xd3, 0xeb, 0x30, 0xbd, 0x72, 0x6b, - 0x61, 0xa7, 0x18, 0x5c, 0xcd, 0xed, 0x50, 0x88, 0x62, 0x3d, 0x7c, 0x0f, 0x94, 0x59, 0xe2, 0x45, - 0xa0, 0x43, 0x09, 0xbd, 0x21, 0x3a, 0x38, 0xf9, 0x52, 0x40, 0x63, 0x56, 0xdb, 0xf7, 0x41, 0x25, - 0xd3, 0xfa, 0x70, 0x03, 0x2c, 0x5c, 0x90, 0x41, 0x70, 0x29, 0x21, 0xf1, 0x13, 0x6e, 0x81, 0xa5, - 0x3e, 0xee, 0xfa, 0x24, 0x60, 0xf2, 0x28, 0x58, 0xbc, 0x3f, 0x7f, 0x4f, 0xab, 0x7f, 0xa1, 0x81, - 0xf5, 0xd4, 0x63, 0x04, 0xde, 0x04, 0x0b, 0xbe, 0xd7, 0x55, 0x97, 0x5a, 0x49, 0x95, 0x67, 0xe1, - 0x63, 0x74, 0x80, 0x84, 0x1c, 0x76, 0xc0, 0x22, 0xf6, 0xf9, 0x99, 0xba, 0xce, 0xf7, 0x67, 0xf2, - 0x0d, 0x8b, 0x9b, 0x3a, 0x20, 0x49, 0xe2, 0x17, 0x92, 0x0e, 0xe0, 0xbd, 0x54, 0x49, 0x16, 0x64, - 0x40, 0xd1, 0x87, 0x3d, 0xb9, 0x2c, 0xf5, 0x7f, 0x6b, 0x60, 0x45, 0x51, 0x2f, 0xe8, 0x82, 0x65, - 0x17, 0x73, 0xbb, 0x4f, 0x14, 0x01, 0x98, 0x8a, 0x2c, 0x3f, 0x96, 0x48, 0xd1, 0x68, 0x05, 0x82, - 0x80, 0x04, 0x32, 0xa4, 0xbc, 0xc0, 0x73, 0xb0, 0x4c, 0x2e, 0x29, 0xb7, 0xc3, 0xa7, 0xc0, 0xac, - 0x9e, 0xa4, 0xd2, 0xd7, 0x9e, 0x44, 0x46, 0xca, 0x43, 0xfd, 0x6b, 0x0d, 0x80, 0xd8, 0xe4, 0x65, - 0x07, 0xf7, 0x0e, 0x28, 0x5a, 0x5d, 0x9f, 0x71, 0xe2, 0xed, 0x7f, 0xa0, 0xde, 0x74, 0xb2, 0x1f, - 0x77, 0x43, 0x21, 0x8a, 0xf5, 0xf0, 0xb6, 0x3a, 0xe5, 0xa0, 0xe8, 0x7a, 0x78, 0x34, 0x2f, 0x86, - 0xb5, 0xb2, 0xf8, 0x1b, 0x96, 0x40, 0x1d, 0xd5, 0xaf, 0x41, 0x19, 0x5b, 0x16, 0x61, 0x2c, 0x18, - 0x16, 0x8a, 0x13, 0x5c, 0x91, 0x6b, 0xc9, 0x26, 0x6f, 0x26, 0xb6, 0xa3, 0x31, 0xb0, 0xfa, 0x67, - 0xeb, 0x60, 0x6d, 0xbc, 0xf0, 0xf0, 0x76, 0x82, 0x50, 0x69, 0x72, 0x84, 0x44, 0x8f, 0x89, 0x1c, - 0x52, 0x75, 0x3b, 0xd1, 0xb1, 0x2f, 0xcf, 0x25, 0x7d, 0x2d, 0x2f, 0xbc, 0x8e, 0x6b, 0x39, 0x9f, - 0x07, 0x2e, 0xbe, 0x5e, 0x1e, 0xf8, 0xdd, 0xa1, 0x56, 0x7f, 0x49, 0x13, 0x8e, 0x65, 0x79, 0x31, - 0x7e, 0x3a, 0xbb, 0x6f, 0x7f, 0x36, 0x94, 0x63, 0x65, 0x46, 0x94, 0x23, 0xc9, 0xe2, 0x0a, 0xd7, - 0xc5, 0xe2, 0x72, 0x78, 0x4d, 0xf1, 0x1a, 0x78, 0x4d, 0x1d, 0x2c, 0x3b, 0xf8, 0xb2, 0xd9, 0x21, - 0x92, 0x35, 0x15, 0x83, 0xc1, 0xd7, 0x92, 0x12, 0xa4, 0x34, 0xff, 0x77, 0xee, 0x93, 0x4f, 0x20, - 0xca, 0xaf, 0x44, 0x20, 0x72, 0x79, 0xd4, 0xea, 0x94, 0x3c, 0x6a, 0xed, 0xca, 0x3c, 0x6a, 0x7d, - 0x0a, 0x1e, 0xf5, 0x36, 0x58, 0x71, 0xf0, 0x65, 0x8b, 0x29, 0xea, 0xb3, 0x68, 0x96, 0xc4, 0x73, - 0xb7, 0x15, 0x88, 0x50, 0xa8, 0x13, 0x81, 0x39, 0xf8, 0xd2, 0x1c, 0x70, 0x22, 0x78, 0x4f, 0x44, - 0x91, 0x5a, 0x4a, 0x86, 0x22, 0xad, 0x02, 0x6c, 0xfb, 0xc7, 0x4c, 0x12, 0x9e, 0x18, 0x50, 0x88, - 0x50, 0xa8, 0x83, 0x06, 0x00, 0x0e, 0xbe, 0x3c, 0xc4, 0x03, 0xf1, 0xe8, 0xd3, 0x37, 0x25, 0xe4, - 0xda, 0x68, 0x58, 0x03, 0xad, 0x48, 0x8a, 0x12, 0x16, 0xf0, 0x00, 0x6c, 0x79, 0xf8, 0x94, 0x3f, - 0x24, 0xd8, 0xe3, 0xc7, 0x04, 0xf3, 0x23, 0xdb, 0x21, 0xd4, 0xe7, 0xfa, 0x56, 0x74, 0x01, 0x6c, - 0xa1, 0x1c, 0x3d, 0xca, 0xdd, 0x05, 0xf7, 0xc1, 0xa6, 0x90, 0xef, 0x89, 0x4f, 0xd8, 0xa6, 0x6e, - 0x08, 0xf6, 0x86, 0x04, 0x7b, 0x73, 0x34, 0xac, 0x6d, 0xa2, 0xac, 0x1a, 0xe5, 0xed, 0x81, 0x3f, - 0x03, 0x1b, 0x42, 0x7c, 0x40, 0x30, 0x23, 0x21, 0xce, 0xf7, 0x02, 0x5a, 0x23, 0x3a, 0x11, 0xa5, - 0x74, 0x28, 0x63, 0x0d, 0x77, 0x41, 0x45, 0xc8, 0x76, 0xa9, 0xe3, 0xd8, 0x51, 0x5e, 0x6f, 0x4a, - 0x08, 0x39, 0xc8, 0x51, 0x5a, 0x89, 0xb2, 0xf6, 0xd3, 0xd3, 0xc6, 0xbf, 0xce, 0x83, 0xcd, 0x9c, - 0x4b, 0x4d, 0xe4, 0xc7, 0x38, 0xf5, 0x70, 0x87, 0xc4, 0xad, 0xad, 0xc5, 0xf9, 0xb5, 0x53, 0x3a, - 0x94, 0xb1, 0x86, 0x4f, 0x01, 0x08, 0x2e, 0xff, 0x16, 0x3d, 0x51, 0x8e, 0xcd, 0xfb, 0xe2, 0xa8, - 0x9b, 0x91, 0xf4, 0xc5, 0xb0, 0x76, 0x27, 0xef, 0x1f, 0xce, 0x61, 0x3c, 0xfc, 0x09, 0xed, 0xfa, - 0x0e, 0x89, 0x37, 0xa0, 0x04, 0x24, 0xfc, 0x0d, 0x00, 0x7d, 0xa9, 0x6f, 0xdb, 0xbf, 0x0f, 0x2f, - 0xf7, 0x6f, 0xfc, 0xcf, 0xa5, 0x11, 0xfe, 0x6f, 0xdc, 0xf8, 0x85, 0x8f, 0x5d, 0x2e, 0xbe, 0x0f, - 0xd9, 0x7b, 0x4f, 0x22, 0x14, 0x94, 0x40, 0x34, 0x8d, 0x67, 0xcf, 0xab, 0x73, 0x9f, 0x3f, 0xaf, - 0xce, 0x7d, 0xf9, 0xbc, 0x3a, 0xf7, 0x87, 0x51, 0x55, 0x7b, 0x36, 0xaa, 0x6a, 0x9f, 0x8f, 0xaa, - 0xda, 0x97, 0xa3, 0xaa, 0xf6, 0xd5, 0xa8, 0xaa, 0x7d, 0xf6, 0x75, 0x75, 0xee, 0x93, 0x42, 0x78, - 0xad, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x69, 0x55, 0x5f, 0xc0, 0x1a, 0x00, 0x00, + // 1800 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdb, 0x6e, 0x1b, 0xc7, + 0x19, 0xd6, 0x4a, 0x94, 0x44, 0x0e, 0xa9, 0xd3, 0x48, 0x69, 0xd6, 0x42, 0x4c, 0x1a, 0x2c, 0x52, + 0xa8, 0x48, 0xbc, 0xac, 0x83, 0xa0, 0x75, 0x73, 0xe3, 0x6a, 0x15, 0xa5, 0x96, 0x23, 0x3a, 0xea, + 0xd0, 0x31, 0xd0, 0x34, 0xa8, 0x3b, 0x5a, 0x8d, 0xa8, 0x95, 0xb9, 0x3b, 0xec, 0xcc, 0x2c, 0x21, + 0xf6, 0xaa, 0xe8, 0x13, 0x04, 0x45, 0x51, 0xf4, 0x0d, 0x0a, 0xf4, 0x01, 0xfa, 0x0a, 0xf5, 0x45, + 0x2f, 0x02, 0xf4, 0xa2, 0xb9, 0x22, 0x62, 0x06, 0x05, 0x0a, 0xf4, 0x0d, 0x7c, 0x55, 0xcc, 0xec, + 0xec, 0x41, 0xbb, 0xcb, 0x44, 0x31, 0xa9, 0x1a, 0xbd, 0xe3, 0xfc, 0x87, 0xef, 0x3f, 0xec, 0xbf, + 0xff, 0x7c, 0x4b, 0xf0, 0xa0, 0xeb, 0x8a, 0xb3, 0xe0, 0xd8, 0x72, 0xa8, 0xd7, 0xc2, 0xac, 0x4b, + 0xfb, 0x8c, 0x9e, 0xab, 0x1f, 0xb7, 0xc9, 0x80, 0xf8, 0x82, 0xb7, 0xfa, 0x4f, 0xbb, 0x2d, 0xdc, + 0x77, 0x79, 0x4b, 0x9d, 0x8f, 0x03, 0xde, 0x1a, 0xdc, 0xc1, 0xbd, 0xfe, 0x19, 0xbe, 0xd3, 0xea, + 0x12, 0x9f, 0x30, 0x2c, 0xc8, 0x89, 0xd5, 0x67, 0x54, 0x50, 0xf8, 0x5e, 0x82, 0x65, 0x45, 0x58, + 0xea, 0xc7, 0x93, 0x10, 0xcb, 0xea, 0x3f, 0xed, 0x5a, 0x12, 0xcb, 0x8a, 0xb0, 0xac, 0x08, 0x6b, + 0xfb, 0xde, 0x95, 0xf3, 0x70, 0xa8, 0xe7, 0x51, 0x3f, 0x1b, 0x7c, 0xfb, 0x76, 0x0a, 0xa0, 0x4b, + 0xbb, 0xb4, 0xa5, 0xc4, 0xc7, 0xc1, 0xa9, 0x3a, 0xa9, 0x83, 0xfa, 0xa5, 0xcd, 0x9b, 0x4f, 0xef, + 0x72, 0xcb, 0xa5, 0x12, 0xb2, 0xe5, 0x50, 0x46, 0x5a, 0x83, 0x5c, 0x3d, 0xdb, 0xef, 0x26, 0x36, + 0x1e, 0x76, 0xce, 0x5c, 0x9f, 0xb0, 0x61, 0x94, 0x47, 0x8b, 0x11, 0x4e, 0x03, 0xe6, 0x90, 0x6f, + 0xe5, 0xc5, 0x5b, 0x1e, 0x11, 0xb8, 0x28, 0x56, 0x6b, 0x92, 0x17, 0x0b, 0x7c, 0xe1, 0x7a, 0xf9, + 0x30, 0x3f, 0xfc, 0x26, 0x07, 0xee, 0x9c, 0x11, 0x0f, 0x67, 0xfd, 0x9a, 0xff, 0x31, 0x40, 0xc5, + 0x0e, 0xf8, 0x1e, 0xf5, 0x4f, 0xdd, 0x2e, 0x3c, 0x01, 0x25, 0x1f, 0x0b, 0x6e, 0x1a, 0xb7, 0x8c, + 0x9d, 0xea, 0x3b, 0x1f, 0x58, 0x2f, 0xff, 0x04, 0xad, 0x87, 0xbb, 0x8f, 0x3a, 0x21, 0xaa, 0x5d, + 0x1e, 0x8f, 0x1a, 0x25, 0x79, 0x46, 0x0a, 0x1d, 0x5e, 0x80, 0xca, 0x39, 0x11, 0x5c, 0x30, 0x82, + 0x3d, 0x73, 0x5e, 0x85, 0xfa, 0x70, 0x9a, 0x50, 0x0f, 0x88, 0xe8, 0x28, 0x30, 0x1d, 0x6f, 0x65, + 0x3c, 0x6a, 0x54, 0x62, 0x21, 0x4a, 0x82, 0x35, 0xff, 0x3a, 0x0f, 0x36, 0xf6, 0xa8, 0x2f, 0xb0, + 0xec, 0xcf, 0x23, 0xe2, 0xf5, 0x7b, 0x58, 0x10, 0xf8, 0x73, 0x50, 0x89, 0x1e, 0x5f, 0x54, 0xfa, + 0x8e, 0x15, 0xf6, 0x53, 0x86, 0xb4, 0xe4, 0x40, 0x58, 0x83, 0x3b, 0x16, 0xd2, 0x46, 0x88, 0xfc, + 0x3a, 0x70, 0x19, 0xf1, 0x64, 0x5e, 0xf6, 0xc6, 0xb3, 0x51, 0x63, 0x4e, 0x06, 0x8c, 0xb4, 0x1c, + 0x25, 0x68, 0xf0, 0x18, 0xac, 0xb9, 0x1e, 0xee, 0x92, 0xa3, 0xa0, 0xd7, 0x3b, 0xa2, 0x3d, 0xd7, + 0x19, 0xaa, 0x82, 0x2b, 0xf6, 0x5d, 0xed, 0xb6, 0x76, 0x70, 0x59, 0xfd, 0x62, 0xd4, 0xb8, 0x99, + 0x9f, 0x45, 0x2b, 0x31, 0x40, 0x59, 0x40, 0x19, 0x83, 0x13, 0x27, 0x60, 0xae, 0x18, 0xca, 0xda, + 0xc8, 0x85, 0x30, 0x17, 0x54, 0x11, 0xdf, 0x2d, 0x2a, 0xa2, 0x73, 0xd9, 0xd4, 0xde, 0x94, 0x49, + 0x64, 0x84, 0x28, 0x0b, 0xd8, 0xfc, 0xfb, 0x3c, 0x28, 0xef, 0xcb, 0xc6, 0xdb, 0x01, 0x87, 0xbf, + 0x02, 0x65, 0x39, 0xb7, 0x27, 0x58, 0x60, 0xdd, 0xae, 0x1f, 0xa4, 0x22, 0xc5, 0xe3, 0x97, 0x3c, + 0x32, 0x69, 0x2d, 0x63, 0x7f, 0x74, 0x7c, 0x4e, 0x1c, 0xd1, 0x26, 0x02, 0xdb, 0x50, 0xd7, 0x0f, + 0x12, 0x19, 0x8a, 0x51, 0xe1, 0x39, 0x28, 0xf1, 0x3e, 0x71, 0xf4, 0x70, 0xdc, 0x9f, 0x66, 0x38, + 0xa2, 0xac, 0x3b, 0x7d, 0xe2, 0xd8, 0x35, 0x1d, 0xb5, 0x24, 0x4f, 0x48, 0xc5, 0x80, 0x0c, 0x2c, + 0x71, 0x81, 0x45, 0xc0, 0x75, 0xd7, 0x1e, 0xcc, 0x24, 0x9a, 0x42, 0xb4, 0x57, 0x75, 0xbc, 0xa5, + 0xf0, 0x8c, 0x74, 0xa4, 0xe6, 0x3f, 0x0d, 0x50, 0x8b, 0x4c, 0x0f, 0x5d, 0x2e, 0xe0, 0xa7, 0xb9, + 0x96, 0x5a, 0x57, 0x6b, 0xa9, 0xf4, 0x56, 0x0d, 0x5d, 0xd7, 0xa1, 0xca, 0x91, 0x24, 0xd5, 0x4e, + 0x17, 0x2c, 0xba, 0x82, 0x78, 0xdc, 0x9c, 0xbf, 0xb5, 0xb0, 0x53, 0x7d, 0xe7, 0xfd, 0x59, 0x54, + 0x68, 0xaf, 0xe8, 0x80, 0x8b, 0x07, 0x12, 0x1a, 0x85, 0x11, 0x9a, 0xff, 0x4e, 0x55, 0x26, 0x9b, + 0x0c, 0xf1, 0xa5, 0x95, 0xb2, 0x37, 0xed, 0x4a, 0x91, 0x91, 0xb3, 0xfb, 0x24, 0xc8, 0xef, 0x93, + 0xfb, 0x33, 0xd9, 0x27, 0xaa, 0xcc, 0x89, 0xcb, 0xe4, 0x4b, 0x03, 0xac, 0x5e, 0x7e, 0xde, 0xf0, + 0x49, 0x3c, 0x4b, 0x61, 0xb9, 0x3f, 0xba, 0x7a, 0x1a, 0xe1, 0x3d, 0x66, 0x7d, 0xfd, 0xe0, 0x40, + 0x0f, 0x2c, 0x39, 0x6a, 0xc9, 0xe9, 0x3a, 0xf7, 0xa7, 0xa9, 0x33, 0xde, 0xfb, 0x49, 0xb8, 0xf0, + 0x8c, 0x74, 0x90, 0xe6, 0x3f, 0x56, 0x40, 0x2d, 0xdd, 0x0d, 0xf8, 0x7d, 0xb0, 0x3c, 0x20, 0x8c, + 0xbb, 0xd4, 0x57, 0x15, 0x56, 0xec, 0x35, 0xed, 0xb9, 0xfc, 0x38, 0x14, 0xa3, 0x48, 0x0f, 0x77, + 0x40, 0x99, 0x91, 0x7e, 0xcf, 0x75, 0x30, 0x57, 0xc9, 0x2e, 0xda, 0x35, 0x39, 0x9e, 0x48, 0xcb, + 0x50, 0xac, 0x85, 0xbf, 0x37, 0xc0, 0x86, 0x93, 0xdd, 0xca, 0xfa, 0x6d, 0x6c, 0x4f, 0x53, 0x60, + 0x6e, 0xd5, 0xdb, 0xaf, 0x8d, 0x47, 0x8d, 0xfc, 0x0d, 0x80, 0xf2, 0xe1, 0xe1, 0x5f, 0x0c, 0x70, + 0x83, 0x91, 0x1e, 0xc5, 0x27, 0x84, 0xe5, 0x1c, 0xcc, 0xd2, 0x75, 0x24, 0x77, 0x73, 0x3c, 0x6a, + 0xdc, 0x40, 0x93, 0x62, 0xa2, 0xc9, 0xe9, 0xc0, 0x3f, 0x1b, 0xc0, 0xf4, 0x88, 0x60, 0xae, 0xc3, + 0xf3, 0xb9, 0x2e, 0x5e, 0x47, 0xae, 0x6f, 0x8c, 0x47, 0x0d, 0xb3, 0x3d, 0x21, 0x24, 0x9a, 0x98, + 0x0c, 0xfc, 0x9d, 0x01, 0xaa, 0x7d, 0x39, 0x21, 0x5c, 0x10, 0xdf, 0x21, 0xe6, 0x92, 0x4a, 0xee, + 0xa3, 0x69, 0x92, 0x3b, 0x4a, 0xe0, 0x3a, 0x42, 0x72, 0x9b, 0xee, 0xd0, 0x5e, 0x1b, 0x8f, 0x1a, + 0xd5, 0x94, 0x02, 0xa5, 0x83, 0x42, 0x27, 0xb5, 0x6d, 0x97, 0x55, 0x02, 0x3f, 0xfe, 0xd6, 0x2f, + 0x6a, 0x5b, 0x03, 0x84, 0x53, 0x1d, 0x9d, 0x52, 0x4b, 0xf7, 0x0f, 0x06, 0xa8, 0xf9, 0xf4, 0x84, + 0x74, 0x48, 0x8f, 0x38, 0x82, 0x32, 0xb3, 0xac, 0x96, 0xef, 0x27, 0xb3, 0xda, 0x4c, 0xd6, 0xc3, + 0x14, 0xf8, 0xbe, 0x2f, 0xd8, 0xd0, 0xde, 0xd2, 0x2f, 0x63, 0x2d, 0xad, 0x42, 0x97, 0xb2, 0x80, + 0x1f, 0x83, 0xaa, 0xa0, 0x3d, 0xc9, 0x01, 0x5d, 0xea, 0x73, 0xb3, 0xa2, 0x92, 0xaa, 0x17, 0x31, + 0x85, 0x47, 0xb1, 0x99, 0xbd, 0xa9, 0x81, 0xab, 0x89, 0x8c, 0xa3, 0x34, 0x0e, 0x24, 0x79, 0x12, + 0x02, 0x54, 0x67, 0xbf, 0x57, 0x04, 0x7d, 0x44, 0x4f, 0x5e, 0x8a, 0x87, 0x40, 0x1f, 0xac, 0xc7, + 0xf4, 0xa7, 0x43, 0x1c, 0x46, 0x04, 0x37, 0xab, 0xaa, 0x84, 0x42, 0xc6, 0x76, 0x48, 0x1d, 0xdc, + 0x0b, 0x19, 0x06, 0x22, 0xa7, 0x84, 0xc9, 0xa7, 0x6f, 0x9b, 0xba, 0x98, 0xf5, 0x83, 0x0c, 0x12, + 0xca, 0x61, 0xc3, 0x9f, 0x82, 0x8d, 0x3e, 0x73, 0xa9, 0x4a, 0xa1, 0x87, 0x39, 0x7f, 0x88, 0x3d, + 0x62, 0xd6, 0xd4, 0xe6, 0xbb, 0xa1, 0x61, 0x36, 0x8e, 0xb2, 0x06, 0x28, 0xef, 0x23, 0xb7, 0x61, + 0x24, 0x34, 0x57, 0x92, 0x6d, 0x18, 0xf9, 0xa2, 0x58, 0x0b, 0x3f, 0x00, 0x65, 0x7c, 0x7a, 0xea, + 0xfa, 0xd2, 0x72, 0x55, 0xb5, 0xf0, 0x8d, 0xa2, 0xd2, 0x76, 0xb5, 0x4d, 0x88, 0x13, 0x9d, 0x50, + 0xec, 0x0b, 0x1f, 0x00, 0xc8, 0x09, 0x1b, 0xb8, 0x0e, 0xd9, 0x75, 0x1c, 0x1a, 0xf8, 0x42, 0xe5, + 0xbe, 0xa6, 0x72, 0xdf, 0xd6, 0xb9, 0xc3, 0x4e, 0xce, 0x02, 0x15, 0x78, 0xc9, 0xec, 0x39, 0x11, + 0xc2, 0xf5, 0xbb, 0xdc, 0x5c, 0x57, 0x08, 0x2a, 0x6a, 0x47, 0xcb, 0x50, 0xac, 0x85, 0x6f, 0x81, + 0x0a, 0x17, 0x98, 0x89, 0x5d, 0xd6, 0xe5, 0xe6, 0xc6, 0xad, 0x85, 0x9d, 0x4a, 0x78, 0x83, 0x76, + 0x22, 0x21, 0x4a, 0xf4, 0xf0, 0x5d, 0x50, 0xe3, 0x29, 0xe2, 0x6e, 0x42, 0x05, 0xbd, 0x2e, 0x27, + 0x38, 0x4d, 0xe8, 0xd1, 0x25, 0xab, 0xed, 0x7b, 0x60, 0x23, 0x37, 0xfa, 0x70, 0x1d, 0x2c, 0x3c, + 0x25, 0xc3, 0xf0, 0x52, 0x42, 0xf2, 0x27, 0xdc, 0x02, 0x8b, 0x03, 0xdc, 0x0b, 0x48, 0x48, 0xb8, + 0x51, 0x78, 0x78, 0x6f, 0xfe, 0xae, 0xd1, 0xfc, 0x9b, 0x01, 0xd6, 0x32, 0xdf, 0x0c, 0xf0, 0x26, + 0x58, 0x08, 0x58, 0x4f, 0x5f, 0x6a, 0x55, 0xdd, 0x9e, 0x85, 0x8f, 0xd1, 0x21, 0x92, 0x72, 0xf8, + 0x0b, 0x50, 0xc3, 0x8e, 0x43, 0x38, 0x0f, 0x07, 0x43, 0xdf, 0xbe, 0x6f, 0x4e, 0x20, 0xd8, 0x8c, + 0x88, 0x0f, 0xc9, 0x30, 0x4a, 0x30, 0x2c, 0x68, 0x37, 0xe5, 0x8e, 0x2e, 0x81, 0xc1, 0xbb, 0x99, + 0x36, 0x2c, 0xa8, 0x24, 0xe2, 0x97, 0x79, 0x72, 0x2b, 0x9a, 0xff, 0x32, 0xc0, 0xb2, 0x66, 0x45, + 0xd0, 0x07, 0x4b, 0x3e, 0x16, 0xee, 0x80, 0x68, 0xee, 0x31, 0x15, 0x8f, 0x7d, 0xa8, 0x90, 0xe2, + 0x75, 0x0a, 0x24, 0x37, 0x08, 0x65, 0x48, 0x47, 0x81, 0xe7, 0x60, 0x89, 0x5c, 0x50, 0xe1, 0x46, + 0x2c, 0x7d, 0x56, 0x5f, 0x8b, 0x2a, 0xd6, 0xbe, 0x42, 0x46, 0x3a, 0x42, 0xf3, 0x2b, 0x03, 0x80, + 0xc4, 0xe4, 0x9b, 0x1e, 0xd6, 0x5b, 0xa0, 0xe2, 0xf4, 0x02, 0x2e, 0x08, 0x3b, 0x78, 0x5f, 0x7f, + 0x6e, 0xa9, 0x19, 0xdc, 0x8b, 0x84, 0x28, 0xd1, 0xc3, 0xb7, 0x41, 0x09, 0x07, 0xe2, 0x4c, 0x37, + 0xdd, 0x94, 0xd4, 0x72, 0x37, 0x10, 0x67, 0x2f, 0xe4, 0x23, 0x0b, 0xc4, 0x59, 0xd4, 0x02, 0xa4, + 0xac, 0x72, 0x73, 0x50, 0x9a, 0xe1, 0x1c, 0x34, 0x3f, 0x5b, 0x03, 0xab, 0x97, 0x1b, 0x0f, 0xdf, + 0x4e, 0x91, 0x28, 0x43, 0xad, 0x8d, 0x98, 0xe7, 0x17, 0x10, 0xa9, 0xa8, 0x96, 0xf9, 0x2b, 0xd5, + 0x92, 0xbd, 0x8a, 0x17, 0x5e, 0xc5, 0x55, 0x5c, 0xcc, 0xfd, 0x4a, 0xaf, 0x96, 0xfb, 0xfd, 0xff, + 0xd0, 0xa9, 0x3f, 0x66, 0x49, 0xc6, 0x92, 0xba, 0x0c, 0x3f, 0x9d, 0xdd, 0xbb, 0x3f, 0x1b, 0x9a, + 0xb1, 0x3c, 0x23, 0x9a, 0x91, 0x66, 0x6e, 0xe5, 0xeb, 0x62, 0x6e, 0x05, 0x5c, 0xa6, 0x72, 0x0d, + 0x5c, 0xa6, 0x09, 0x96, 0x3c, 0x7c, 0xb1, 0xdb, 0x25, 0x8a, 0x29, 0x55, 0xc2, 0xc5, 0xd7, 0x56, + 0x12, 0xa4, 0x35, 0xff, 0x73, 0xbe, 0x53, 0x4c, 0x1a, 0x6a, 0x2f, 0x45, 0x1a, 0x0a, 0xb9, 0xd3, + 0xca, 0x94, 0xdc, 0x69, 0xf5, 0xca, 0xdc, 0x69, 0x6d, 0x0a, 0xee, 0xf4, 0x26, 0x58, 0xf6, 0xf0, + 0x45, 0x9b, 0x6b, 0xba, 0x53, 0xb2, 0xab, 0xf2, 0x13, 0xb7, 0x1d, 0x8a, 0x50, 0xa4, 0x93, 0x89, + 0x79, 0xf8, 0xc2, 0x1e, 0x0a, 0x22, 0xb9, 0x4e, 0x4c, 0x8b, 0xda, 0x5a, 0x86, 0x62, 0xad, 0x06, + 0xec, 0x04, 0xc7, 0x5c, 0x91, 0x9c, 0x04, 0x50, 0x8a, 0x50, 0xa4, 0x83, 0x16, 0x00, 0x1e, 0xbe, + 0x38, 0xc2, 0x43, 0xf9, 0xa1, 0x67, 0x6e, 0x2a, 0xc8, 0xd5, 0xf1, 0xa8, 0x01, 0xda, 0xb1, 0x14, + 0xa5, 0x2c, 0xe0, 0x21, 0xd8, 0x62, 0xf8, 0x54, 0xdc, 0x27, 0x98, 0x89, 0x63, 0x82, 0xc5, 0x23, + 0xd7, 0x23, 0x34, 0x10, 0xe6, 0x56, 0x7c, 0x01, 0x6c, 0xa1, 0x02, 0x3d, 0x2a, 0xf4, 0x82, 0x07, + 0x60, 0x53, 0xca, 0xf7, 0xe5, 0x2b, 0xec, 0x52, 0x3f, 0x02, 0x7b, 0x4d, 0x81, 0xbd, 0x3e, 0x1e, + 0x35, 0x36, 0x51, 0x5e, 0x8d, 0x8a, 0x7c, 0xe0, 0x4f, 0xc0, 0xba, 0x14, 0x1f, 0x12, 0xcc, 0x49, + 0x84, 0xf3, 0x9d, 0x90, 0xd6, 0xc8, 0x49, 0x44, 0x19, 0x1d, 0xca, 0x59, 0xc3, 0x3d, 0xb0, 0x21, + 0x65, 0x7b, 0xd4, 0xf3, 0xdc, 0xb8, 0xae, 0xd7, 0x15, 0x84, 0x5a, 0xe4, 0x28, 0xab, 0x44, 0x79, + 0xfb, 0xe9, 0xa9, 0xe2, 0x9f, 0xe6, 0xc1, 0x66, 0xc1, 0xa5, 0x26, 0xeb, 0xe3, 0x82, 0x32, 0xdc, + 0x25, 0xc9, 0x68, 0x1b, 0x49, 0x7d, 0x9d, 0x8c, 0x0e, 0xe5, 0xac, 0xe1, 0x13, 0x00, 0xc2, 0xcb, + 0xbf, 0x4d, 0x4f, 0x74, 0x60, 0xfb, 0x9e, 0x7c, 0xd4, 0xbb, 0xb1, 0xf4, 0xc5, 0xa8, 0x71, 0xbb, + 0xe8, 0xbf, 0xe0, 0x28, 0x1f, 0xf1, 0x98, 0xf6, 0x02, 0x8f, 0x24, 0x0e, 0x28, 0x05, 0x09, 0x7f, + 0x09, 0xc0, 0x40, 0xe9, 0x3b, 0xee, 0x6f, 0xa2, 0xcb, 0xfd, 0x6b, 0xff, 0x54, 0xb4, 0xa2, 0xbf, + 0xad, 0xad, 0x9f, 0x05, 0xd8, 0x17, 0xf2, 0xfd, 0x50, 0xb3, 0xf7, 0x38, 0x46, 0x41, 0x29, 0x44, + 0xdb, 0x7a, 0xf6, 0xbc, 0x3e, 0xf7, 0xf9, 0xf3, 0xfa, 0xdc, 0x17, 0xcf, 0xeb, 0x73, 0xbf, 0x1d, + 0xd7, 0x8d, 0x67, 0xe3, 0xba, 0xf1, 0xf9, 0xb8, 0x6e, 0x7c, 0x31, 0xae, 0x1b, 0x5f, 0x8e, 0xeb, + 0xc6, 0x67, 0x5f, 0xd5, 0xe7, 0x3e, 0x29, 0x47, 0xd7, 0xca, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x51, 0xbc, 0x0d, 0x68, 0x5b, 0x1a, 0x00, 0x00, } func (m *BusConfig) Marshal() (dAtA []byte, err error) { @@ -840,41 +809,6 @@ func (m *EventBusStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *JetStreamAuth) 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 *JetStreamAuth) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *JetStreamAuth) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *JetStreamBus) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1113,9 +1047,9 @@ func (m *JetStreamConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(len(m.StreamConfig))) i-- dAtA[i] = 0x1a - if m.Auth != nil { + if m.AccessSecret != nil { { - size, err := m.Auth.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.AccessSecret.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1637,19 +1571,6 @@ func (m *EventBusStatus) Size() (n int) { return n } -func (m *JetStreamAuth) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovGenerated(uint64(l)) - } - return n -} - func (m *JetStreamBus) Size() (n int) { if m == nil { return 0 @@ -1741,8 +1662,8 @@ func (m *JetStreamConfig) Size() (n int) { _ = l l = len(m.URL) n += 1 + l + sovGenerated(uint64(l)) - if m.Auth != nil { - l = m.Auth.Size() + if m.AccessSecret != nil { + l = m.AccessSecret.Size() n += 1 + l + sovGenerated(uint64(l)) } l = len(m.StreamConfig) @@ -1989,16 +1910,6 @@ func (this *EventBusStatus) String() string { }, "") return s } -func (this *JetStreamAuth) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&JetStreamAuth{`, - `Token:` + strings.Replace(fmt.Sprintf("%v", this.Token), "SecretKeySelector", "v1.SecretKeySelector", 1) + `,`, - `}`, - }, "") - return s -} func (this *JetStreamBus) String() string { if this == nil { return "nil" @@ -2052,7 +1963,7 @@ func (this *JetStreamConfig) String() string { } s := strings.Join([]string{`&JetStreamConfig{`, `URL:` + fmt.Sprintf("%v", this.URL) + `,`, - `Auth:` + strings.Replace(this.Auth.String(), "JetStreamAuth", "JetStreamAuth", 1) + `,`, + `AccessSecret:` + strings.Replace(fmt.Sprintf("%v", this.AccessSecret), "SecretKeySelector", "v1.SecretKeySelector", 1) + `,`, `StreamConfig:` + fmt.Sprintf("%v", this.StreamConfig) + `,`, `}`, }, "") @@ -2931,92 +2842,6 @@ func (m *EventBusStatus) Unmarshal(dAtA []byte) error { } return nil } -func (m *JetStreamAuth) 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 ErrIntOverflowGenerated - } - 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: JetStreamAuth: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: JetStreamAuth: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenerated - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Token == nil { - m.Token = &v1.SecretKeySelector{} - } - if err := m.Token.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *JetStreamBus) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3811,7 +3636,7 @@ func (m *JetStreamConfig) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Auth", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AccessSecret", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3838,10 +3663,10 @@ func (m *JetStreamConfig) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Auth == nil { - m.Auth = &JetStreamAuth{} + if m.AccessSecret == nil { + m.AccessSecret = &v1.SecretKeySelector{} } - if err := m.Auth.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.AccessSecret.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto index 6dbf07aae1..d1ba710df9 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.proto +++ b/pkg/apis/eventbus/v1alpha1/generated.proto @@ -89,12 +89,6 @@ message EventBusStatus { optional BusConfig config = 2; } -message JetStreamAuth { - // Secret for auth token - // +optional - optional k8s.io.api.core.v1.SecretKeySelector token = 1; -} - // JetStreamBus holds the JetStream EventBus information message JetStreamBus { // JetStream version, such as "2.7.3" @@ -195,7 +189,9 @@ message JetStreamConfig { // JetStream (Nats) URL optional string url = 1; - optional JetStreamAuth auth = 2; + // Secret for auth + // +optional + optional k8s.io.api.core.v1.SecretKeySelector accessSecret = 2; // +optional optional string streamConfig = 3; diff --git a/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go b/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go index 8b7d3122e1..81f69a883e 100644 --- a/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go +++ b/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go @@ -96,14 +96,10 @@ func (j JetStreamBus) GetReplicas() int { type JetStreamConfig struct { // JetStream (Nats) URL - URL string `json:"url,omitempty" protobuf:"bytes,1,opt,name=url"` - Auth *JetStreamAuth `json:"auth,omitempty" protobuf:"bytes,2,opt,name=auth"` + URL string `json:"url,omitempty" protobuf:"bytes,1,opt,name=url"` + // Secret for auth // +optional - StreamConfig string `json:"streamConfig,omitempty" protobuf:"bytes,3,opt,name=streamConfig"` -} - -type JetStreamAuth struct { - // Secret for auth token + AccessSecret *corev1.SecretKeySelector `json:"accessSecret,omitempty" protobuf:"bytes,2,opt,name=accessSecret"` // +optional - Token *corev1.SecretKeySelector `json:"token,omitempty" protobuf:"bytes,1,opt,name=token"` + StreamConfig string `json:"streamConfig,omitempty" protobuf:"bytes,3,opt,name=streamConfig"` } diff --git a/pkg/apis/eventbus/v1alpha1/nats_eventbus.go b/pkg/apis/eventbus/v1alpha1/nats_eventbus.go index df0fa70e61..dd557b8dca 100644 --- a/pkg/apis/eventbus/v1alpha1/nats_eventbus.go +++ b/pkg/apis/eventbus/v1alpha1/nats_eventbus.go @@ -20,6 +20,7 @@ type AuthStrategy string var ( AuthStrategyNone AuthStrategy = "none" AuthStrategyToken AuthStrategy = "token" + AuthStrategyBasic AuthStrategy = "basic" ) // NativeStrategy indicates to install a native NATS service diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go index 45aeb984a4..b5712d128b 100644 --- a/pkg/apis/eventbus/v1alpha1/openapi_generated.go +++ b/pkg/apis/eventbus/v1alpha1/openapi_generated.go @@ -36,7 +36,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.EventBusList": schema_pkg_apis_eventbus_v1alpha1_EventBusList(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.EventBusSpec": schema_pkg_apis_eventbus_v1alpha1_EventBusSpec(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.EventBusStatus": schema_pkg_apis_eventbus_v1alpha1_EventBusStatus(ref), - "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamAuth": schema_pkg_apis_eventbus_v1alpha1_JetStreamAuth(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamBus": schema_pkg_apis_eventbus_v1alpha1_JetStreamBus(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamConfig": schema_pkg_apis_eventbus_v1alpha1_JetStreamConfig(ref), "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.NATSBus": schema_pkg_apis_eventbus_v1alpha1_NATSBus(ref), @@ -268,26 +267,6 @@ func schema_pkg_apis_eventbus_v1alpha1_EventBusStatus(ref common.ReferenceCallba } } -func schema_pkg_apis_eventbus_v1alpha1_JetStreamAuth(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "token": { - SchemaProps: spec.SchemaProps{ - Description: "Secret for auth token", - Ref: ref("k8s.io/api/core/v1.SecretKeySelector"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "k8s.io/api/core/v1.SecretKeySelector"}, - } -} - func schema_pkg_apis_eventbus_v1alpha1_JetStreamBus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -471,9 +450,10 @@ func schema_pkg_apis_eventbus_v1alpha1_JetStreamConfig(ref common.ReferenceCallb Format: "", }, }, - "auth": { + "accessSecret": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamAuth"), + Description: "Secret for auth", + Ref: ref("k8s.io/api/core/v1.SecretKeySelector"), }, }, "streamConfig": { @@ -486,7 +466,7 @@ func schema_pkg_apis_eventbus_v1alpha1_JetStreamConfig(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamAuth"}, + "k8s.io/api/core/v1.SecretKeySelector"}, } } diff --git a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go index cc286bfa11..02aa747ccb 100644 --- a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go @@ -180,27 +180,6 @@ func (in *EventBusStatus) DeepCopy() *EventBusStatus { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *JetStreamAuth) DeepCopyInto(out *JetStreamAuth) { - *out = *in - if in.Token != nil { - in, out := &in.Token, &out.Token - *out = new(v1.SecretKeySelector) - (*in).DeepCopyInto(*out) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JetStreamAuth. -func (in *JetStreamAuth) DeepCopy() *JetStreamAuth { - if in == nil { - return nil - } - out := new(JetStreamAuth) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *JetStreamBus) DeepCopyInto(out *JetStreamBus) { *out = *in @@ -299,9 +278,9 @@ func (in *JetStreamBus) DeepCopy() *JetStreamBus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *JetStreamConfig) DeepCopyInto(out *JetStreamConfig) { *out = *in - if in.Auth != nil { - in, out := &in.Auth, &out.Auth - *out = new(JetStreamAuth) + if in.AccessSecret != nil { + in, out := &in.AccessSecret, &out.AccessSecret + *out = new(v1.SecretKeySelector) (*in).DeepCopyInto(*out) } return