From 4f9f4416298fd899dfe66dd7028af67d42b12073 Mon Sep 17 00:00:00 2001 From: Matt Magaldi Date: Tue, 5 Jun 2018 17:46:35 -0400 Subject: [PATCH] removing ARN from S3Artifact and cleaning up artifact-guide --- docs/artifact-guide.md | 22 +- examples/s3-sensor.yaml | 8 +- pkg/apis/sensor/v1alpha1/generated.pb.go | 766 +++++------------- pkg/apis/sensor/v1alpha1/generated.proto | 18 +- pkg/apis/sensor/v1alpha1/openapi_generated.go | 52 +- pkg/apis/sensor/v1alpha1/types.go | 13 +- .../sensor/v1alpha1/zz_generated.deepcopy.go | 25 - 7 files changed, 230 insertions(+), 674 deletions(-) diff --git a/docs/artifact-guide.md b/docs/artifact-guide.md index 88f34abcce96..d3c7540d747c 100644 --- a/docs/artifact-guide.md +++ b/docs/artifact-guide.md @@ -1,22 +1,8 @@ # Artifact Guide -`Sensors` supports S3 artifact repositories. To take advantage of these artifact signals, you can use this guide to get started with installing artifact services. - -### Prerequisites -Up & Running kubernetes instance +`Sensors` support S3 artifact notifications. To take advantage of these artifact signals, you can use this guide to get started with installing artifact services. ## Minio -[Minio](https://www.minio.io/) is an distributed object storage server. - -### Install -``` -$ brew install kubernetes-helm # mac -$ helm init -$ helm repo add stable https://kubernetes-charts.storage.googleapis.com -$ helm repo update -$ helm install stable/minio --name artifacts --set service.type=LoadBalancer -$ helm upgrade -f docs/minio-config.yaml stable/minio -``` +[Minio](https://www.minio.io/) is an distributed object storage server. Follow the Minio [Bucket Notification Guide](https://docs.minio.io/docs/minio-bucket-notification-guide) for help with configuring your minio server to listen and monitor for bucket event notifications. Note that you will need an `Axis` supported message queue up and running as a prerequisite for configuring your notification targets (i.e. NATS, WebHooks, Kafka, etc.). -Note: When minio is installed via Helm, it uses the following hard-wired default credentials and creates a kubernetes secret with a hash of these keys. Signal specifications rely on kubernetes secrets instead of the raw keys. -- AccessKey: AKIAIOSFODNN7EXAMPLE -- SecretKey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY +### Enabling bucket notifications +Once the Minio server is configured with a notification target and you have restarted the server to put the changes into effect, you now need to explicitely enable event notifications for a specified bucket. Enabling these notifications are out of scope of `Axis` since bucket notifications are a construct within Minio that exists at the `bucket` level. This means that if `Axis` was responsible for the lifecycle of the bucket notifications, multiple sensors on the same S3 bucket would conflict with eachother. Thus, creating, updating, and deleting the Minio bucket notifications should be delegated to a separate process with knowledge of all notification targets including those outside of the `Axis` project. diff --git a/examples/s3-sensor.yaml b/examples/s3-sensor.yaml index 161e148f5bdb..9c9432b5631a 100644 --- a/examples/s3-sensor.yaml +++ b/examples/s3-sensor.yaml @@ -10,6 +10,7 @@ spec: artifact: s3: bucket: hello + event: s3:ObjectCreated:Put endpoint: artifacts-minio.default:9000 insecure: true accessKey: @@ -18,13 +19,6 @@ spec: secretKey: key: secretkey name: artifacts-minio - event: s3:ObjectCreated:Put - arn: - partition: minio - service: sqs - region: us-east-1 - accountID: "1" - resource: nats stream: nats: url: nats://example-nats-cluster:4222 diff --git a/pkg/apis/sensor/v1alpha1/generated.pb.go b/pkg/apis/sensor/v1alpha1/generated.pb.go index 93cb8019c8f2..ac45b6e7392a 100644 --- a/pkg/apis/sensor/v1alpha1/generated.pb.go +++ b/pkg/apis/sensor/v1alpha1/generated.pb.go @@ -23,7 +23,6 @@ limitations under the License. It has these top-level messages: AMQP - ARN ArtifactLocation ArtifactSignal CalendarSignal @@ -81,117 +80,112 @@ func (m *AMQP) Reset() { *m = AMQP{} } func (*AMQP) ProtoMessage() {} func (*AMQP) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} } -func (m *ARN) Reset() { *m = ARN{} } -func (*ARN) ProtoMessage() {} -func (*ARN) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{1} } - func (m *ArtifactLocation) Reset() { *m = ArtifactLocation{} } func (*ArtifactLocation) ProtoMessage() {} -func (*ArtifactLocation) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} } +func (*ArtifactLocation) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{1} } func (m *ArtifactSignal) Reset() { *m = ArtifactSignal{} } func (*ArtifactSignal) ProtoMessage() {} -func (*ArtifactSignal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{3} } +func (*ArtifactSignal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} } func (m *CalendarSignal) Reset() { *m = CalendarSignal{} } func (*CalendarSignal) ProtoMessage() {} -func (*CalendarSignal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{4} } +func (*CalendarSignal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{3} } func (m *EscalationPolicy) Reset() { *m = EscalationPolicy{} } func (*EscalationPolicy) ProtoMessage() {} -func (*EscalationPolicy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{5} } +func (*EscalationPolicy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{4} } func (m *GroupVersionKind) Reset() { *m = GroupVersionKind{} } func (*GroupVersionKind) ProtoMessage() {} -func (*GroupVersionKind) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{6} } +func (*GroupVersionKind) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{5} } func (m *Kafka) Reset() { *m = Kafka{} } func (*Kafka) ProtoMessage() {} -func (*Kafka) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{7} } +func (*Kafka) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{6} } func (m *MQTT) Reset() { *m = MQTT{} } func (*MQTT) ProtoMessage() {} -func (*MQTT) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{8} } +func (*MQTT) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{7} } func (m *Message) Reset() { *m = Message{} } func (*Message) ProtoMessage() {} -func (*Message) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{9} } +func (*Message) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{8} } func (m *NATS) Reset() { *m = NATS{} } func (*NATS) ProtoMessage() {} -func (*NATS) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{10} } +func (*NATS) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{9} } func (m *NodeStatus) Reset() { *m = NodeStatus{} } func (*NodeStatus) ProtoMessage() {} -func (*NodeStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{11} } +func (*NodeStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{10} } func (m *ResourceFilter) Reset() { *m = ResourceFilter{} } func (*ResourceFilter) ProtoMessage() {} -func (*ResourceFilter) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{12} } +func (*ResourceFilter) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{11} } func (m *ResourceObject) Reset() { *m = ResourceObject{} } func (*ResourceObject) ProtoMessage() {} -func (*ResourceObject) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{13} } +func (*ResourceObject) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{12} } func (m *ResourceSignal) Reset() { *m = ResourceSignal{} } func (*ResourceSignal) ProtoMessage() {} -func (*ResourceSignal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{14} } +func (*ResourceSignal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{13} } func (m *RetryStrategy) Reset() { *m = RetryStrategy{} } func (*RetryStrategy) ProtoMessage() {} -func (*RetryStrategy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{15} } +func (*RetryStrategy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{14} } func (m *S3Artifact) Reset() { *m = S3Artifact{} } func (*S3Artifact) ProtoMessage() {} -func (*S3Artifact) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{16} } +func (*S3Artifact) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{15} } func (m *S3Bucket) Reset() { *m = S3Bucket{} } func (*S3Bucket) ProtoMessage() {} -func (*S3Bucket) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{17} } +func (*S3Bucket) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{16} } func (m *S3Filter) Reset() { *m = S3Filter{} } func (*S3Filter) ProtoMessage() {} -func (*S3Filter) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{18} } +func (*S3Filter) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{17} } func (m *Sensor) Reset() { *m = Sensor{} } func (*Sensor) ProtoMessage() {} -func (*Sensor) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{19} } +func (*Sensor) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{18} } func (m *SensorList) Reset() { *m = SensorList{} } func (*SensorList) ProtoMessage() {} -func (*SensorList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{20} } +func (*SensorList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{19} } func (m *SensorSpec) Reset() { *m = SensorSpec{} } func (*SensorSpec) ProtoMessage() {} -func (*SensorSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{21} } +func (*SensorSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{20} } func (m *SensorStatus) Reset() { *m = SensorStatus{} } func (*SensorStatus) ProtoMessage() {} -func (*SensorStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{22} } +func (*SensorStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{21} } func (m *Signal) Reset() { *m = Signal{} } func (*Signal) ProtoMessage() {} -func (*Signal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{23} } +func (*Signal) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{22} } func (m *SignalConstraints) Reset() { *m = SignalConstraints{} } func (*SignalConstraints) ProtoMessage() {} -func (*SignalConstraints) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{24} } +func (*SignalConstraints) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{23} } func (m *Stream) Reset() { *m = Stream{} } func (*Stream) ProtoMessage() {} -func (*Stream) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{25} } +func (*Stream) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{24} } func (m *TimeConstraints) Reset() { *m = TimeConstraints{} } func (*TimeConstraints) ProtoMessage() {} -func (*TimeConstraints) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{26} } +func (*TimeConstraints) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{25} } func (m *Trigger) Reset() { *m = Trigger{} } func (*Trigger) ProtoMessage() {} -func (*Trigger) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{27} } +func (*Trigger) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{26} } func init() { proto.RegisterType((*AMQP)(nil), "github.com.blackrock.axis.pkg.apis.sensor.v1alpha1.AMQP") - proto.RegisterType((*ARN)(nil), "github.com.blackrock.axis.pkg.apis.sensor.v1alpha1.ARN") proto.RegisterType((*ArtifactLocation)(nil), "github.com.blackrock.axis.pkg.apis.sensor.v1alpha1.ArtifactLocation") proto.RegisterType((*ArtifactSignal)(nil), "github.com.blackrock.axis.pkg.apis.sensor.v1alpha1.ArtifactSignal") proto.RegisterType((*CalendarSignal)(nil), "github.com.blackrock.axis.pkg.apis.sensor.v1alpha1.CalendarSignal") @@ -253,44 +247,6 @@ func (m *AMQP) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *ARN) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ARN) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintGenerated(dAtA, i, uint64(len(m.Partition))) - i += copy(dAtA[i:], m.Partition) - dAtA[i] = 0x12 - i++ - i = encodeVarintGenerated(dAtA, i, uint64(len(m.Service))) - i += copy(dAtA[i:], m.Service) - dAtA[i] = 0x1a - i++ - i = encodeVarintGenerated(dAtA, i, uint64(len(m.Region))) - i += copy(dAtA[i:], m.Region) - dAtA[i] = 0x22 - i++ - i = encodeVarintGenerated(dAtA, i, uint64(len(m.AccountID))) - i += copy(dAtA[i:], m.AccountID) - dAtA[i] = 0x2a - i++ - i = encodeVarintGenerated(dAtA, i, uint64(len(m.Resource))) - i += copy(dAtA[i:], m.Resource) - return i, nil -} - func (m *ArtifactLocation) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -840,34 +796,24 @@ func (m *S3Artifact) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintGenerated(dAtA, i, uint64(len(m.Event))) i += copy(dAtA[i:], m.Event) - if m.ARN != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintGenerated(dAtA, i, uint64(m.ARN.Size())) - n13, err := m.ARN.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n13 - } if m.Filter != nil { - dAtA[i] = 0x22 + dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Filter.Size())) - n14, err := m.Filter.MarshalTo(dAtA[i:]) + n13, err := m.Filter.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n14 + i += n13 } dAtA[i] = 0x2a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.S3Bucket.Size())) - n15, err := m.S3Bucket.MarshalTo(dAtA[i:]) + n14, err := m.S3Bucket.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n15 + i += n14 return i, nil } @@ -909,19 +855,19 @@ func (m *S3Bucket) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x2a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.AccessKey.Size())) - n16, err := m.AccessKey.MarshalTo(dAtA[i:]) + n15, err := m.AccessKey.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n16 + i += n15 dAtA[i] = 0x32 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.SecretKey.Size())) - n17, err := m.SecretKey.MarshalTo(dAtA[i:]) + n16, err := m.SecretKey.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n17 + i += n16 return i, nil } @@ -969,27 +915,27 @@ func (m *Sensor) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintGenerated(dAtA, i, uint64(m.ObjectMeta.Size())) - n18, err := m.ObjectMeta.MarshalTo(dAtA[i:]) + n17, err := m.ObjectMeta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n18 + i += n17 dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Spec.Size())) - n19, err := m.Spec.MarshalTo(dAtA[i:]) + n18, err := m.Spec.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n19 + i += n18 dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Status.Size())) - n20, err := m.Status.MarshalTo(dAtA[i:]) + n19, err := m.Status.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n20 + i += n19 return i, nil } @@ -1011,11 +957,11 @@ func (m *SensorList) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintGenerated(dAtA, i, uint64(m.ListMeta.Size())) - n21, err := m.ListMeta.MarshalTo(dAtA[i:]) + n20, err := m.ListMeta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n21 + i += n20 if len(m.Items) > 0 { for _, msg := range m.Items { dAtA[i] = 0x12 @@ -1073,11 +1019,11 @@ func (m *SensorSpec) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Escalation.Size())) - n22, err := m.Escalation.MarshalTo(dAtA[i:]) + n21, err := m.Escalation.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n22 + i += n21 dAtA[i] = 0x20 i++ if m.Repeat { @@ -1111,19 +1057,19 @@ func (m *SensorStatus) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.StartedAt.Size())) - n23, err := m.StartedAt.MarshalTo(dAtA[i:]) + n22, err := m.StartedAt.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n23 + i += n22 dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.ResolvedAt.Size())) - n24, err := m.ResolvedAt.MarshalTo(dAtA[i:]) + n23, err := m.ResolvedAt.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n24 + i += n23 dAtA[i] = 0x22 i++ i = encodeVarintGenerated(dAtA, i, uint64(len(m.Message))) @@ -1152,11 +1098,11 @@ func (m *SensorStatus) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64((&v).Size())) - n25, err := (&v).MarshalTo(dAtA[i:]) + n24, err := (&v).MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n25 + i += n24 } } dAtA[i] = 0x30 @@ -1196,80 +1142,80 @@ func (m *Signal) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.NATS.Size())) - n26, err := m.NATS.MarshalTo(dAtA[i:]) + n25, err := m.NATS.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n26 + i += n25 } if m.MQTT != nil { dAtA[i] = 0x22 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.MQTT.Size())) - n27, err := m.MQTT.MarshalTo(dAtA[i:]) + n26, err := m.MQTT.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n27 + i += n26 } if m.AMQP != nil { dAtA[i] = 0x2a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.AMQP.Size())) - n28, err := m.AMQP.MarshalTo(dAtA[i:]) + n27, err := m.AMQP.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n28 + i += n27 } if m.Kafka != nil { dAtA[i] = 0x32 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Kafka.Size())) - n29, err := m.Kafka.MarshalTo(dAtA[i:]) + n28, err := m.Kafka.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n29 + i += n28 } if m.Artifact != nil { dAtA[i] = 0x3a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Artifact.Size())) - n30, err := m.Artifact.MarshalTo(dAtA[i:]) + n29, err := m.Artifact.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n30 + i += n29 } if m.Calendar != nil { dAtA[i] = 0x42 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Calendar.Size())) - n31, err := m.Calendar.MarshalTo(dAtA[i:]) + n30, err := m.Calendar.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n31 + i += n30 } if m.Resource != nil { dAtA[i] = 0x4a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Resource.Size())) - n32, err := m.Resource.MarshalTo(dAtA[i:]) + n31, err := m.Resource.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n32 + i += n31 } dAtA[i] = 0x52 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Constraints.Size())) - n33, err := m.Constraints.MarshalTo(dAtA[i:]) + n32, err := m.Constraints.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n33 + i += n32 return i, nil } @@ -1291,11 +1237,11 @@ func (m *SignalConstraints) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Time.Size())) - n34, err := m.Time.MarshalTo(dAtA[i:]) + n33, err := m.Time.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n34 + i += n33 return i, nil } @@ -1318,41 +1264,41 @@ func (m *Stream) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintGenerated(dAtA, i, uint64(m.NATS.Size())) - n35, err := m.NATS.MarshalTo(dAtA[i:]) + n34, err := m.NATS.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n35 + i += n34 } if m.MQTT != nil { dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.MQTT.Size())) - n36, err := m.MQTT.MarshalTo(dAtA[i:]) + n35, err := m.MQTT.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n36 + i += n35 } if m.AMQP != nil { dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.AMQP.Size())) - n37, err := m.AMQP.MarshalTo(dAtA[i:]) + n36, err := m.AMQP.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n37 + i += n36 } if m.Kafka != nil { dAtA[i] = 0x22 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Kafka.Size())) - n38, err := m.Kafka.MarshalTo(dAtA[i:]) + n37, err := m.Kafka.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n38 + i += n37 } return i, nil } @@ -1375,19 +1321,19 @@ func (m *TimeConstraints) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Start.Size())) - n39, err := m.Start.MarshalTo(dAtA[i:]) + n38, err := m.Start.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n39 + i += n38 dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Stop.Size())) - n40, err := m.Stop.MarshalTo(dAtA[i:]) + n39, err := m.Stop.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n40 + i += n39 return i, nil } @@ -1414,31 +1360,31 @@ func (m *Trigger) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Resource.Size())) - n41, err := m.Resource.MarshalTo(dAtA[i:]) + n40, err := m.Resource.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n41 + i += n40 } if m.Message != nil { dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Message.Size())) - n42, err := m.Message.MarshalTo(dAtA[i:]) + n41, err := m.Message.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n42 + i += n41 } if m.RetryStrategy != nil { dAtA[i] = 0x22 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.RetryStrategy.Size())) - n43, err := m.RetryStrategy.MarshalTo(dAtA[i:]) + n42, err := m.RetryStrategy.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n43 + i += n42 } return i, nil } @@ -1466,22 +1412,6 @@ func (m *AMQP) Size() (n int) { return n } -func (m *ARN) Size() (n int) { - var l int - _ = l - l = len(m.Partition) - n += 1 + l + sovGenerated(uint64(l)) - l = len(m.Service) - n += 1 + l + sovGenerated(uint64(l)) - l = len(m.Region) - n += 1 + l + sovGenerated(uint64(l)) - l = len(m.AccountID) - n += 1 + l + sovGenerated(uint64(l)) - l = len(m.Resource) - n += 1 + l + sovGenerated(uint64(l)) - return n -} - func (m *ArtifactLocation) Size() (n int) { var l int _ = l @@ -1678,10 +1608,6 @@ func (m *S3Artifact) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.Event) n += 1 + l + sovGenerated(uint64(l)) - if m.ARN != nil { - l = m.ARN.Size() - n += 1 + l + sovGenerated(uint64(l)) - } if m.Filter != nil { l = m.Filter.Size() n += 1 + l + sovGenerated(uint64(l)) @@ -1914,20 +1840,6 @@ func (this *AMQP) String() string { }, "") return s } -func (this *ARN) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ARN{`, - `Partition:` + fmt.Sprintf("%v", this.Partition) + `,`, - `Service:` + fmt.Sprintf("%v", this.Service) + `,`, - `Region:` + fmt.Sprintf("%v", this.Region) + `,`, - `AccountID:` + fmt.Sprintf("%v", this.AccountID) + `,`, - `Resource:` + fmt.Sprintf("%v", this.Resource) + `,`, - `}`, - }, "") - return s -} func (this *ArtifactLocation) String() string { if this == nil { return "nil" @@ -2130,7 +2042,6 @@ func (this *S3Artifact) String() string { s := strings.Join([]string{`&S3Artifact{`, `Key:` + fmt.Sprintf("%v", this.Key) + `,`, `Event:` + fmt.Sprintf("%v", this.Event) + `,`, - `ARN:` + strings.Replace(fmt.Sprintf("%v", this.ARN), "ARN", "ARN", 1) + `,`, `Filter:` + strings.Replace(fmt.Sprintf("%v", this.Filter), "S3Filter", "S3Filter", 1) + `,`, `S3Bucket:` + strings.Replace(strings.Replace(this.S3Bucket.String(), "S3Bucket", "S3Bucket", 1), `&`, ``, 1) + `,`, `}`, @@ -2464,201 +2375,6 @@ func (m *AMQP) Unmarshal(dAtA []byte) error { } return nil } -func (m *ARN) 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: ARN: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ARN: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Partition", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Partition = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Service", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Service = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Region", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Region = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AccountID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AccountID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Resource", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Resource = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ArtifactLocation) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4856,39 +4572,6 @@ func (m *S3Artifact) Unmarshal(dAtA []byte) error { m.Event = github_com_minio_minio_go.NotificationEventType(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ARN", 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 > l { - return io.ErrUnexpectedEOF - } - if m.ARN == nil { - m.ARN = &ARN{} - } - if err := m.ARN.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Filter", wireType) } @@ -7040,144 +6723,139 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2213 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xf7, 0xf2, 0x4b, 0xd4, 0xa3, 0x3f, 0xe4, 0xa9, 0x0f, 0x84, 0x80, 0x4a, 0xc6, 0x06, 0x0d, - 0xd2, 0xc2, 0x59, 0xc6, 0x52, 0x3f, 0x1c, 0xb7, 0x08, 0x42, 0xda, 0x6a, 0xe1, 0x5a, 0x52, 0xe4, - 0x21, 0xab, 0x83, 0x5b, 0xb4, 0x1e, 0x2d, 0x87, 0xd4, 0x98, 0xcb, 0xdd, 0xcd, 0xce, 0x90, 0x10, - 0x83, 0x1c, 0x72, 0x08, 0x7a, 0x08, 0x50, 0xb4, 0x97, 0xde, 0x0a, 0xf4, 0xd4, 0x7b, 0x4f, 0xfd, - 0x0f, 0x0a, 0xb8, 0x28, 0x0a, 0xe4, 0x98, 0x93, 0x50, 0xab, 0x40, 0xd1, 0x43, 0xff, 0x81, 0xfa, - 0x54, 0xcc, 0xc7, 0x7e, 0x90, 0xb4, 0x6c, 0x69, 0x69, 0x21, 0x17, 0x81, 0xfb, 0xde, 0x9b, 0xdf, - 0x9b, 0x79, 0xf3, 0x3e, 0x47, 0xd0, 0xea, 0x33, 0x71, 0x38, 0x3a, 0x70, 0xdc, 0x60, 0xd8, 0x38, - 0xf0, 0x88, 0x3b, 0x88, 0x02, 0x77, 0xd0, 0x20, 0x47, 0x8c, 0x37, 0xc2, 0x41, 0xbf, 0x41, 0x42, - 0xc6, 0x1b, 0x9c, 0xfa, 0x3c, 0x88, 0x1a, 0xe3, 0xdb, 0xc4, 0x0b, 0x0f, 0xc9, 0xed, 0x46, 0x9f, - 0xfa, 0x34, 0x22, 0x82, 0x76, 0x9d, 0x30, 0x0a, 0x44, 0x80, 0x36, 0x52, 0x0c, 0x27, 0xc1, 0x70, - 0x24, 0x86, 0x13, 0x0e, 0xfa, 0x8e, 0xc4, 0x70, 0x34, 0x86, 0x13, 0x63, 0xac, 0xbe, 0x9b, 0xd1, - 0xdb, 0x0f, 0xfa, 0x41, 0x43, 0x41, 0x1d, 0x8c, 0x7a, 0xea, 0x4b, 0x7d, 0xa8, 0x5f, 0x5a, 0xc5, - 0xaa, 0x3d, 0xb8, 0xc3, 0x1d, 0x16, 0xc8, 0xfd, 0x34, 0xdc, 0x20, 0xa2, 0x8d, 0xf1, 0xdc, 0x36, - 0x56, 0xbf, 0x9b, 0xca, 0x0c, 0x89, 0x7b, 0xc8, 0x7c, 0x1a, 0x4d, 0xd2, 0x43, 0x0c, 0xa9, 0x20, - 0x2f, 0x5b, 0xd5, 0x38, 0x6d, 0x55, 0x34, 0xf2, 0x05, 0x1b, 0xd2, 0xb9, 0x05, 0xdf, 0x7f, 0xdd, - 0x02, 0xee, 0x1e, 0xd2, 0x21, 0x99, 0x5b, 0xb7, 0x79, 0xda, 0xba, 0x91, 0x60, 0x5e, 0x83, 0xf9, - 0x82, 0x8b, 0x68, 0x76, 0x91, 0xfd, 0x0f, 0x0b, 0x4a, 0xcd, 0x9d, 0x47, 0x7b, 0xe8, 0x9b, 0x50, - 0x1c, 0x45, 0x5e, 0xdd, 0xba, 0x69, 0xbd, 0xb3, 0xdc, 0xaa, 0x3d, 0x3b, 0x5e, 0xbf, 0x74, 0x72, - 0xbc, 0x5e, 0xfc, 0x19, 0xde, 0xc6, 0x92, 0x8e, 0xee, 0xc0, 0x65, 0x7a, 0xe4, 0x1e, 0x12, 0xbf, - 0x4f, 0x77, 0xc9, 0x90, 0xd6, 0x0b, 0x4a, 0xee, 0x86, 0x91, 0xbb, 0xbc, 0x95, 0xe1, 0xe1, 0x29, - 0xc9, 0xec, 0xca, 0xce, 0x24, 0xa4, 0xf5, 0xe2, 0xcb, 0x57, 0x4a, 0x1e, 0x9e, 0x92, 0x44, 0x1b, - 0x00, 0x51, 0x30, 0x12, 0xcc, 0xef, 0x3f, 0xa4, 0x93, 0x7a, 0x49, 0xad, 0x43, 0x66, 0x1d, 0xe0, - 0x84, 0x83, 0x33, 0x52, 0xf6, 0x7f, 0x2c, 0x28, 0x36, 0xf1, 0x2e, 0x6a, 0xc0, 0x72, 0x48, 0x22, - 0xc1, 0x04, 0x0b, 0x7c, 0x73, 0xa8, 0xeb, 0x66, 0xe9, 0xf2, 0x5e, 0xcc, 0xc0, 0xa9, 0x0c, 0xfa, - 0x36, 0x2c, 0x71, 0x1a, 0x8d, 0x99, 0x1b, 0x9f, 0xed, 0x9a, 0x11, 0x5f, 0x6a, 0x6b, 0x32, 0x8e, - 0xf9, 0xe8, 0x6d, 0xa8, 0x44, 0xb4, 0x2f, 0x81, 0xf5, 0x59, 0xae, 0x1a, 0xc9, 0x0a, 0x56, 0x54, - 0x6c, 0xb8, 0x72, 0x0f, 0xc4, 0x75, 0x83, 0x91, 0x2f, 0x1e, 0xdc, 0x37, 0xdb, 0x4f, 0xf6, 0xd0, - 0x8c, 0x19, 0x38, 0x95, 0x41, 0xb7, 0xa0, 0x1a, 0x51, 0x1e, 0x8c, 0x22, 0x97, 0xd6, 0xcb, 0x4a, - 0x7e, 0xc5, 0xc8, 0x57, 0xb1, 0xa1, 0xe3, 0x44, 0xc2, 0x7e, 0x0a, 0x2b, 0xcd, 0x48, 0xb0, 0x1e, - 0x71, 0xc5, 0x76, 0xe0, 0x12, 0x75, 0x8a, 0x7d, 0x28, 0xf0, 0x4d, 0x75, 0xde, 0xda, 0xc6, 0x07, - 0xce, 0xf9, 0xc3, 0xc6, 0x69, 0x6f, 0xc6, 0x98, 0xad, 0xca, 0xc9, 0xf1, 0x7a, 0xa1, 0xbd, 0x89, - 0x0b, 0x7c, 0xd3, 0xfe, 0x4d, 0x01, 0xae, 0xc6, 0x8c, 0x36, 0xeb, 0xfb, 0xc4, 0x43, 0x3e, 0x54, - 0xb8, 0x88, 0x28, 0x19, 0x1a, 0x75, 0x77, 0x73, 0xa9, 0x53, 0x08, 0xad, 0x55, 0x73, 0x4c, 0xb4, - 0x1b, 0x08, 0xd6, 0x63, 0xfa, 0x30, 0x9a, 0x87, 0x8d, 0x16, 0xf4, 0x85, 0x05, 0x2b, 0x64, 0xe6, - 0xbc, 0xea, 0xaa, 0x6a, 0x1b, 0xf7, 0xf3, 0xa8, 0x9e, 0xb5, 0x5d, 0xab, 0x6e, 0x36, 0x31, 0x67, - 0x55, 0x3c, 0xa7, 0xd7, 0xfe, 0x83, 0x05, 0x57, 0xef, 0x11, 0x8f, 0xfa, 0x5d, 0x12, 0x19, 0x7b, - 0xdc, 0x82, 0xaa, 0x0c, 0xcc, 0xee, 0xc8, 0xa3, 0xc6, 0xe1, 0x92, 0xcb, 0x6b, 0x1b, 0x3a, 0x4e, - 0x24, 0xa4, 0x34, 0xf3, 0x05, 0x8d, 0xc6, 0xc4, 0x33, 0xfe, 0x96, 0x48, 0x3f, 0x30, 0x74, 0x9c, - 0x48, 0x20, 0x07, 0x20, 0xa2, 0xee, 0x28, 0x8a, 0xa8, 0xef, 0xca, 0x08, 0x2a, 0x4a, 0xaf, 0x53, - 0x51, 0x90, 0x50, 0x71, 0x46, 0xc2, 0xfe, 0xa3, 0x05, 0x2b, 0x5b, 0xdc, 0x25, 0x9e, 0xda, 0xed, - 0x5e, 0xe0, 0x31, 0x77, 0x82, 0xde, 0x82, 0xb2, 0x47, 0xc7, 0x34, 0x8e, 0xf1, 0x2b, 0x46, 0x5f, - 0x79, 0x5b, 0x12, 0xb1, 0xe6, 0xa1, 0x1e, 0x2c, 0x0d, 0x29, 0xe7, 0xa4, 0x4f, 0x8d, 0x6d, 0x7f, - 0x98, 0xc7, 0xb6, 0x3b, 0x1a, 0x22, 0x8d, 0x21, 0x43, 0xc0, 0x31, 0xb8, 0xfd, 0xb9, 0x05, 0x2b, - 0x3f, 0x89, 0x82, 0x51, 0xb8, 0x4f, 0x23, 0xce, 0x02, 0xff, 0x21, 0xf3, 0xbb, 0x72, 0x87, 0x7d, - 0x49, 0x9b, 0xdd, 0xa1, 0x12, 0xc4, 0x9a, 0x27, 0x03, 0x75, 0xac, 0xd7, 0xcc, 0x06, 0xaa, 0x81, - 0xc2, 0x31, 0x1f, 0xdd, 0x84, 0xd2, 0x80, 0xf9, 0x5d, 0x13, 0xa6, 0x97, 0x8d, 0x5c, 0x49, 0xea, - 0xc2, 0x8a, 0x63, 0x7f, 0x0a, 0xe5, 0x87, 0xa4, 0x37, 0x20, 0xaf, 0x4b, 0x7f, 0x6f, 0x41, 0x59, - 0x04, 0x21, 0x73, 0x8d, 0xca, 0x64, 0x67, 0x1d, 0x49, 0xc4, 0x9a, 0x37, 0x9d, 0x73, 0xa4, 0xce, - 0xf2, 0xab, 0x73, 0x8e, 0xfd, 0x53, 0x28, 0xed, 0x3c, 0xea, 0x74, 0xde, 0x84, 0x72, 0xfb, 0xb7, - 0x16, 0xc4, 0x56, 0x96, 0xe7, 0x3e, 0x08, 0xba, 0x13, 0x03, 0x98, 0x9c, 0xbb, 0x15, 0x74, 0x27, - 0x58, 0x71, 0xd0, 0x41, 0x12, 0xbc, 0x85, 0x85, 0x83, 0x37, 0x49, 0x7f, 0xd3, 0x01, 0x6b, 0xef, - 0x41, 0x69, 0xb7, 0xd9, 0x69, 0xbf, 0xee, 0x74, 0x32, 0xf1, 0x8e, 0x0e, 0x9e, 0x52, 0x57, 0xcc, - 0x25, 0x5e, 0x4d, 0xc6, 0x31, 0xdf, 0xfe, 0x5b, 0x11, 0x60, 0x37, 0xe8, 0xd2, 0xb6, 0x20, 0x62, - 0xc4, 0xd1, 0x2a, 0x14, 0x58, 0xd7, 0xe0, 0x82, 0x59, 0x54, 0x78, 0x70, 0x1f, 0x17, 0x58, 0x57, - 0x9a, 0xc0, 0x4f, 0xeb, 0x54, 0x62, 0x02, 0x55, 0x9f, 0x14, 0x07, 0x7d, 0x0f, 0x6a, 0x5d, 0xc6, - 0x43, 0x8f, 0x4c, 0x54, 0x41, 0xd3, 0x3e, 0xf2, 0x0d, 0x23, 0x58, 0xbb, 0x9f, 0xb2, 0x70, 0x56, - 0x0e, 0xdd, 0x82, 0x92, 0x90, 0x65, 0x4c, 0xe7, 0xf3, 0x38, 0x67, 0x94, 0x64, 0xc1, 0x7a, 0x71, - 0xbc, 0x5e, 0x95, 0xdb, 0x53, 0xa5, 0x4c, 0x49, 0xa1, 0xf7, 0xa0, 0x1c, 0x1e, 0x12, 0x1e, 0xa7, - 0xf3, 0x38, 0xcf, 0x95, 0xf7, 0x24, 0xf1, 0xc5, 0xf1, 0xfa, 0xb2, 0x94, 0x57, 0x1f, 0x58, 0x0b, - 0xa2, 0x9f, 0xc3, 0x32, 0x17, 0x24, 0x12, 0xb4, 0xdb, 0x14, 0xf5, 0x8a, 0xba, 0x9c, 0xef, 0x38, - 0xba, 0xb2, 0x3b, 0xd9, 0xca, 0x9e, 0x5e, 0x8b, 0x6c, 0x3c, 0x9c, 0xf1, 0x6d, 0xa7, 0xc3, 0x86, - 0x34, 0x75, 0xb8, 0x76, 0x0c, 0x82, 0x53, 0x3c, 0xf4, 0x4b, 0x99, 0x47, 0x78, 0xe0, 0x8d, 0x15, - 0xfa, 0xd2, 0xb9, 0xd1, 0xd3, 0xea, 0x9b, 0xa0, 0xe0, 0x0c, 0xa2, 0xbc, 0xcb, 0x38, 0x7b, 0x54, - 0xa7, 0xef, 0x72, 0x2e, 0x01, 0xfc, 0xbe, 0x04, 0x57, 0xe3, 0xa2, 0xf6, 0x63, 0xe6, 0x09, 0x1a, - 0xc9, 0xba, 0x1a, 0x46, 0xb4, 0xc7, 0x8e, 0xcc, 0x9d, 0x26, 0x8e, 0xb5, 0xa7, 0xa8, 0xd8, 0x70, - 0xd1, 0x18, 0x2a, 0x1e, 0x39, 0xa0, 0x1e, 0xaf, 0x17, 0x6e, 0x16, 0xdf, 0xa9, 0x6d, 0xec, 0xe6, - 0x71, 0xde, 0x69, 0xdd, 0xce, 0xb6, 0x02, 0xdc, 0xf2, 0x45, 0x34, 0x49, 0xf5, 0x6a, 0x22, 0x36, - 0xda, 0x64, 0x05, 0xaa, 0x11, 0xdf, 0x0f, 0x84, 0xca, 0xaa, 0x5c, 0xe5, 0xe1, 0xda, 0x46, 0xfb, - 0x0d, 0x68, 0x6f, 0xa6, 0xa8, 0x7a, 0x0b, 0x89, 0x1f, 0x66, 0x38, 0x38, 0xab, 0x5c, 0xfa, 0x89, - 0x1b, 0x51, 0xd9, 0xc9, 0xb5, 0x74, 0x6f, 0x94, 0xd3, 0x4f, 0xee, 0xc5, 0x20, 0x38, 0xc5, 0x5b, - 0x7d, 0x1f, 0x6a, 0x19, 0x83, 0xa0, 0x15, 0x28, 0x0e, 0xa8, 0x49, 0x27, 0x58, 0xfe, 0x44, 0x37, - 0xa0, 0x3c, 0x26, 0xde, 0xc8, 0xc4, 0x17, 0xd6, 0x1f, 0x77, 0x0b, 0x77, 0xac, 0xd5, 0x0f, 0x60, - 0x65, 0xf6, 0x34, 0xe7, 0x59, 0x6f, 0x7f, 0x91, 0xf1, 0x8b, 0x8f, 0x54, 0xd8, 0xcb, 0xbc, 0x2a, - 0x23, 0x96, 0x87, 0xc4, 0xa5, 0xb3, 0xbd, 0xdc, 0x6e, 0xcc, 0xc0, 0xa9, 0x0c, 0xfa, 0xf5, 0x45, - 0xb7, 0x0a, 0x37, 0xce, 0xd6, 0x26, 0x64, 0x3c, 0xb5, 0xb8, 0xb8, 0xa7, 0x6a, 0x6b, 0x9c, 0xd5, - 0x53, 0x57, 0xfa, 0x33, 0xd5, 0xd5, 0x38, 0x49, 0x2e, 0x03, 0xcc, 0x56, 0xea, 0xb4, 0x57, 0x9a, - 0xe5, 0xe0, 0x39, 0xbd, 0x0b, 0x38, 0x93, 0xfd, 0x97, 0x42, 0xea, 0x0c, 0xa6, 0xcd, 0x3a, 0xb7, - 0x33, 0xf4, 0xa0, 0xd2, 0x53, 0x51, 0x66, 0x3c, 0xa0, 0xb5, 0x78, 0xbc, 0xb6, 0x40, 0xda, 0x5c, - 0xff, 0xc6, 0x06, 0xfd, 0xe5, 0x36, 0x2f, 0x7e, 0x3d, 0x36, 0xb7, 0xaf, 0xc1, 0x15, 0x4c, 0x45, - 0x34, 0x69, 0x0b, 0x39, 0xec, 0xf5, 0x27, 0xf6, 0x9f, 0x8a, 0x00, 0x69, 0x6f, 0x2f, 0x6b, 0x72, - 0x72, 0x09, 0x69, 0x4d, 0x96, 0xc3, 0x94, 0xba, 0x91, 0x7d, 0x28, 0xd3, 0x31, 0xf5, 0xe3, 0x8a, - 0xfc, 0x61, 0x5c, 0xb6, 0xb6, 0x24, 0xf1, 0xc5, 0xf1, 0x7a, 0x23, 0x33, 0x5c, 0x0f, 0x99, 0xcf, - 0x02, 0xfd, 0xf7, 0xdd, 0x7e, 0xe0, 0x64, 0x3b, 0x78, 0x25, 0xae, 0xaa, 0xa1, 0x86, 0x43, 0x18, - 0x8a, 0x24, 0xf2, 0x8d, 0x55, 0x7e, 0x90, 0x2b, 0x14, 0xf1, 0x6e, 0x6b, 0x49, 0xee, 0xb5, 0x89, - 0x77, 0xb1, 0x04, 0x43, 0x4f, 0x92, 0xfb, 0xd5, 0x0e, 0xfe, 0xa3, 0x7c, 0x63, 0xcf, 0x2b, 0x6e, - 0xf6, 0x29, 0x54, 0xf9, 0x66, 0x6b, 0xe4, 0x0e, 0xa8, 0x50, 0x75, 0x3c, 0xb7, 0x0e, 0x8d, 0x91, - 0x99, 0x0b, 0x0c, 0x05, 0x27, 0xf8, 0xf6, 0xbf, 0x0b, 0x90, 0x90, 0xe5, 0x90, 0x40, 0xfd, 0x6e, - 0x18, 0x30, 0x5f, 0xcc, 0x8e, 0x14, 0x5b, 0x86, 0x8e, 0x13, 0x09, 0x59, 0x3e, 0x0f, 0xf4, 0x26, - 0x0b, 0xd3, 0xe5, 0xd3, 0x28, 0x31, 0xdc, 0x33, 0x8f, 0xaf, 0x6a, 0x44, 0xe1, 0x72, 0xa8, 0xd0, - 0xdd, 0x4e, 0x35, 0x3b, 0xa2, 0x68, 0x3a, 0x4e, 0x24, 0xd0, 0xbe, 0x1a, 0x76, 0x29, 0xe7, 0x72, - 0x56, 0xd7, 0x56, 0xfa, 0x56, 0xa6, 0x1e, 0x39, 0x6e, 0x10, 0x51, 0x59, 0x7d, 0xda, 0xd4, 0x8d, - 0xa8, 0x78, 0x48, 0x27, 0x6d, 0xea, 0x51, 0x57, 0x04, 0xd1, 0xd4, 0x4c, 0xac, 0xd7, 0xe3, 0x14, - 0x4a, 0xe2, 0xf2, 0x78, 0x89, 0xe9, 0x87, 0xce, 0x8b, 0x9b, 0xb0, 0x70, 0x0a, 0x65, 0x3f, 0x96, - 0x76, 0x3e, 0x67, 0xe3, 0xf1, 0x36, 0x54, 0xf8, 0xa8, 0x27, 0xe5, 0x66, 0x2c, 0xdc, 0x56, 0x54, - 0x6c, 0xb8, 0x32, 0x6d, 0x55, 0xda, 0xea, 0xf6, 0xd1, 0x13, 0xa8, 0xca, 0xba, 0xdb, 0x25, 0x82, - 0x98, 0x39, 0xf9, 0xbd, 0xb3, 0x55, 0x69, 0x9d, 0xed, 0x77, 0xa8, 0x20, 0x69, 0xd7, 0x95, 0xd2, - 0x70, 0x82, 0x8a, 0x9e, 0x40, 0x89, 0x87, 0xd4, 0x35, 0xd9, 0x2d, 0xdf, 0xd0, 0xaf, 0xbe, 0xdb, - 0x21, 0x75, 0xd3, 0x4e, 0x59, 0x7e, 0x61, 0x85, 0x8c, 0x0e, 0xe5, 0xb0, 0x20, 0x3b, 0x6e, 0x13, - 0xb8, 0x1f, 0x2e, 0xa0, 0x43, 0xe1, 0x64, 0x47, 0x06, 0xf9, 0x8d, 0x0d, 0xbe, 0xfd, 0x77, 0x0b, - 0x40, 0x0b, 0x6e, 0x33, 0x2e, 0xd0, 0x2f, 0xe6, 0x8c, 0xe7, 0x9c, 0xcd, 0x78, 0x72, 0xb5, 0x32, - 0x5d, 0xe2, 0xb1, 0x31, 0x25, 0x63, 0xb8, 0x5f, 0x41, 0x99, 0x09, 0x3a, 0x8c, 0xbb, 0xc8, 0xbb, - 0xf9, 0x4f, 0x95, 0x8e, 0x64, 0x0f, 0x24, 0x20, 0xd6, 0xb8, 0xf6, 0x67, 0xc5, 0xf8, 0x34, 0xd2, - 0x98, 0x88, 0xc2, 0x12, 0x57, 0x35, 0x8c, 0xd7, 0xad, 0x05, 0x34, 0x2a, 0x88, 0xcc, 0x90, 0xa4, - 0x21, 0x71, 0x8c, 0x8d, 0x18, 0x54, 0x45, 0xc4, 0xfa, 0x7d, 0x1a, 0xc5, 0x27, 0xcb, 0x35, 0xc2, - 0x77, 0x34, 0x46, 0x6a, 0x41, 0x43, 0xe0, 0x38, 0x81, 0x47, 0x47, 0x00, 0x34, 0x79, 0x65, 0x58, - 0xa4, 0xd6, 0xcd, 0xbe, 0x55, 0xa4, 0x2e, 0x9f, 0x72, 0x70, 0x46, 0x97, 0xce, 0x61, 0x21, 0x25, - 0xc2, 0x64, 0xa6, 0x4c, 0x0e, 0x93, 0x54, 0x6c, 0xb8, 0xf6, 0x5f, 0x4b, 0x70, 0x39, 0xeb, 0x79, - 0xe9, 0x40, 0x66, 0xe5, 0x1a, 0xc8, 0x0a, 0x17, 0x3a, 0x90, 0x15, 0x2f, 0x72, 0x20, 0x2b, 0xbd, - 0x7a, 0x20, 0x43, 0x21, 0x94, 0xfd, 0xa0, 0x4b, 0x79, 0xbd, 0xac, 0x9c, 0xe6, 0xe1, 0xa2, 0x41, - 0xee, 0x48, 0x4b, 0x9a, 0x3e, 0x35, 0x89, 0x0f, 0x45, 0xc3, 0x5a, 0x91, 0x6c, 0xe5, 0xcc, 0x95, - 0xd2, 0xae, 0x4a, 0xed, 0xd5, 0xd4, 0x5a, 0x5b, 0x31, 0x03, 0xa7, 0x32, 0xab, 0x47, 0x7a, 0xfc, - 0x3f, 0xb5, 0x91, 0xec, 0x64, 0x1b, 0xc9, 0x9c, 0xb9, 0x30, 0x7d, 0x5f, 0xc8, 0x36, 0xa2, 0x9f, - 0x2f, 0x41, 0xc5, 0x34, 0xa0, 0xf1, 0xcb, 0x82, 0x75, 0xea, 0xcb, 0xc2, 0x2d, 0xa8, 0x76, 0x29, - 0xe9, 0x7a, 0xcc, 0xd7, 0x3b, 0x29, 0xa6, 0x41, 0x74, 0xdf, 0xd0, 0x71, 0x22, 0x81, 0xf6, 0x25, - 0x9e, 0x88, 0x73, 0xeb, 0x9d, 0x5c, 0x7b, 0x6e, 0x76, 0xda, 0xad, 0xaa, 0xda, 0x45, 0xb3, 0xd3, - 0xc6, 0x0a, 0x4f, 0xe2, 0x0e, 0x3f, 0x16, 0xc2, 0x74, 0x45, 0xb9, 0x70, 0x77, 0x1e, 0x75, 0x3a, - 0x1a, 0x57, 0xfe, 0xc2, 0x0a, 0x4f, 0xe2, 0x92, 0xe1, 0xc7, 0xa1, 0xa9, 0xf1, 0xb9, 0x70, 0x9b, - 0x3b, 0x8f, 0xf6, 0x34, 0xae, 0xfc, 0x85, 0x15, 0x1e, 0x7a, 0x0c, 0xe5, 0x01, 0xe9, 0x0d, 0x88, - 0x29, 0xf2, 0xef, 0xe7, 0x01, 0x56, 0x6f, 0x79, 0xad, 0x65, 0xe9, 0x69, 0xea, 0x27, 0xd6, 0x90, - 0xc8, 0x83, 0x6a, 0x3c, 0x9b, 0x99, 0x57, 0x8f, 0xd6, 0x22, 0x73, 0xa0, 0xc9, 0xc1, 0x97, 0xe5, - 0x8d, 0xc6, 0x34, 0x9c, 0x68, 0x90, 0xda, 0x5c, 0xf3, 0x36, 0xac, 0x9e, 0x41, 0x72, 0x6a, 0x9b, - 0x7e, 0x5f, 0xd6, 0xda, 0x62, 0x1a, 0x4e, 0x34, 0x48, 0x6d, 0xc9, 0x3f, 0x0d, 0x96, 0x17, 0x9f, - 0x70, 0xb2, 0xda, 0xe6, 0xff, 0xe9, 0x80, 0x3e, 0x85, 0x9a, 0x1b, 0xf8, 0x5c, 0x44, 0x84, 0xf9, - 0x82, 0xd7, 0x41, 0x29, 0xdc, 0xca, 0x5f, 0xc8, 0xee, 0xa5, 0x60, 0xe9, 0xa3, 0x47, 0x86, 0x88, - 0xb3, 0xea, 0xec, 0x4f, 0xe0, 0xfa, 0xdc, 0x32, 0x44, 0xa1, 0x24, 0x98, 0x09, 0xc8, 0xda, 0xc6, - 0xbd, 0x5c, 0xc5, 0x8e, 0x0d, 0x69, 0x76, 0x27, 0x49, 0x54, 0x4b, 0x06, 0x56, 0xf0, 0xf6, 0x7f, - 0x65, 0x53, 0xa7, 0xff, 0x15, 0x11, 0x87, 0xac, 0x75, 0x41, 0x21, 0x5b, 0xb8, 0xa0, 0x90, 0x2d, - 0x5e, 0x54, 0xc8, 0x96, 0xde, 0x78, 0xc8, 0xda, 0x7f, 0xb6, 0xe0, 0xda, 0xcc, 0xb5, 0xa0, 0x8f, - 0xa0, 0xac, 0x4a, 0xa7, 0x31, 0xfc, 0x79, 0x0a, 0x65, 0x52, 0x81, 0x54, 0x19, 0xc6, 0x1a, 0x07, - 0x6d, 0x43, 0x89, 0x8b, 0x20, 0xcc, 0x51, 0xd6, 0xd3, 0x3e, 0x59, 0x04, 0x21, 0x56, 0x28, 0xf6, - 0xff, 0x0a, 0xb0, 0x64, 0xba, 0xa4, 0x33, 0x54, 0x89, 0x6c, 0xdc, 0xbe, 0x81, 0x97, 0x09, 0x3d, - 0x1b, 0x9c, 0x1a, 0xb7, 0x07, 0x69, 0x23, 0x50, 0x5c, 0xfc, 0xff, 0x3a, 0xb5, 0x97, 0x76, 0x10, - 0x9f, 0xc0, 0x95, 0x88, 0x86, 0x5e, 0xf2, 0xe8, 0x60, 0xdc, 0xa2, 0x99, 0xef, 0x58, 0x99, 0xd7, - 0x8b, 0xd6, 0xf5, 0x93, 0xe3, 0xf5, 0xe9, 0x07, 0x0d, 0x3c, 0xad, 0xaa, 0xe5, 0x3c, 0x7b, 0xbe, - 0x76, 0xe9, 0xcb, 0xe7, 0x6b, 0x97, 0xbe, 0x7a, 0xbe, 0x76, 0xe9, 0xb3, 0x93, 0x35, 0xeb, 0xd9, - 0xc9, 0x9a, 0xf5, 0xe5, 0xc9, 0x9a, 0xf5, 0xd5, 0xc9, 0x9a, 0xf5, 0xcf, 0x93, 0x35, 0xeb, 0x77, - 0xff, 0x5a, 0xbb, 0xf4, 0xb8, 0x1a, 0xe3, 0xff, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x5a, 0x0d, - 0xa7, 0x97, 0x20, 0x00, 0x00, + // 2135 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0x1c, 0x49, + 0x15, 0x77, 0xcf, 0x97, 0xc7, 0x6f, 0x1c, 0xc7, 0x29, 0x72, 0x18, 0x59, 0xc2, 0x8e, 0x7a, 0xc5, + 0x2a, 0x8b, 0xb2, 0x3d, 0x1b, 0x1b, 0x50, 0x36, 0xa0, 0xd5, 0xce, 0x24, 0x06, 0x05, 0x7f, 0xac, + 0x53, 0x33, 0xf8, 0x10, 0x10, 0xa4, 0xdc, 0x53, 0x33, 0xee, 0x4c, 0x4f, 0x77, 0x6f, 0x57, 0xcd, + 0xc8, 0xb3, 0xda, 0xc3, 0x1e, 0x56, 0x1c, 0x56, 0x42, 0x70, 0xe1, 0x86, 0xc4, 0xbf, 0xc0, 0x89, + 0xff, 0x00, 0x29, 0x08, 0x21, 0x2d, 0xb7, 0x3d, 0x59, 0xc4, 0x48, 0x9c, 0xf8, 0x07, 0xc8, 0x09, + 0xd5, 0x47, 0x77, 0xb5, 0xc7, 0x71, 0x62, 0xf7, 0xc4, 0xe2, 0x62, 0x4d, 0xbf, 0xf7, 0xea, 0xf7, + 0xaa, 0x5e, 0xbd, 0xcf, 0x32, 0xb4, 0xfa, 0x1e, 0x3f, 0x1c, 0x1d, 0x38, 0x6e, 0x38, 0x6c, 0x1c, + 0xf8, 0xc4, 0x1d, 0xc4, 0xa1, 0x3b, 0x68, 0x90, 0x23, 0x8f, 0x35, 0xa2, 0x41, 0xbf, 0x41, 0x22, + 0x8f, 0x35, 0x18, 0x0d, 0x58, 0x18, 0x37, 0xc6, 0x77, 0x89, 0x1f, 0x1d, 0x92, 0xbb, 0x8d, 0x3e, + 0x0d, 0x68, 0x4c, 0x38, 0xed, 0x3a, 0x51, 0x1c, 0xf2, 0x10, 0xad, 0x1b, 0x0c, 0x27, 0xc5, 0x70, + 0x04, 0x86, 0x13, 0x0d, 0xfa, 0x8e, 0xc0, 0x70, 0x14, 0x86, 0x93, 0x60, 0xac, 0xbc, 0x9f, 0xd1, + 0xdb, 0x0f, 0xfb, 0x61, 0x43, 0x42, 0x1d, 0x8c, 0x7a, 0xf2, 0x4b, 0x7e, 0xc8, 0x5f, 0x4a, 0xc5, + 0x8a, 0x3d, 0xb8, 0xc7, 0x1c, 0x2f, 0x14, 0xfb, 0x69, 0xb8, 0x61, 0x4c, 0x1b, 0xe3, 0x33, 0xdb, + 0x58, 0xf9, 0x9e, 0x91, 0x19, 0x12, 0xf7, 0xd0, 0x0b, 0x68, 0x3c, 0x31, 0x87, 0x18, 0x52, 0x4e, + 0x5e, 0xb5, 0xaa, 0x71, 0xde, 0xaa, 0x78, 0x14, 0x70, 0x6f, 0x48, 0xcf, 0x2c, 0xf8, 0xc1, 0x9b, + 0x16, 0x30, 0xf7, 0x90, 0x0e, 0xc9, 0x99, 0x75, 0x1b, 0xe7, 0xad, 0x1b, 0x71, 0xcf, 0x6f, 0x78, + 0x01, 0x67, 0x3c, 0x9e, 0x5e, 0x64, 0xff, 0xdd, 0x82, 0x52, 0x73, 0xe7, 0xf1, 0x1e, 0xfa, 0x36, + 0x14, 0x47, 0xb1, 0x5f, 0xb7, 0x6e, 0x59, 0xb7, 0x17, 0x5a, 0xb5, 0xe7, 0xc7, 0x6b, 0x73, 0x27, + 0xc7, 0x6b, 0xc5, 0x9f, 0xe1, 0x6d, 0x2c, 0xe8, 0xe8, 0x1e, 0x2c, 0xd2, 0x23, 0xf7, 0x90, 0x04, + 0x7d, 0xba, 0x4b, 0x86, 0xb4, 0x5e, 0x90, 0x72, 0x37, 0xb5, 0xdc, 0xe2, 0x66, 0x86, 0x87, 0x4f, + 0x49, 0x66, 0x57, 0x76, 0x26, 0x11, 0xad, 0x17, 0x5f, 0xbd, 0x52, 0xf0, 0xf0, 0x29, 0x49, 0xb4, + 0x0e, 0x10, 0x87, 0x23, 0xee, 0x05, 0xfd, 0x2d, 0x3a, 0xa9, 0x97, 0xe4, 0x3a, 0xa4, 0xd7, 0x01, + 0x4e, 0x39, 0x38, 0x23, 0x65, 0x3f, 0x83, 0xe5, 0x66, 0xcc, 0xbd, 0x1e, 0x71, 0xf9, 0x76, 0xe8, + 0x12, 0xee, 0x85, 0x01, 0xda, 0x87, 0x02, 0xdb, 0x90, 0x27, 0xab, 0xad, 0x7f, 0xe4, 0x5c, 0xde, + 0x97, 0x9c, 0xf6, 0x46, 0x82, 0xd9, 0xaa, 0x9c, 0x1c, 0xaf, 0x15, 0xda, 0x1b, 0xb8, 0xc0, 0x36, + 0xec, 0xdf, 0x14, 0x60, 0x29, 0x61, 0xb4, 0xbd, 0x7e, 0x40, 0x7c, 0x14, 0x40, 0x85, 0xf1, 0x98, + 0x92, 0xa1, 0x56, 0x77, 0x3f, 0x97, 0x3a, 0x89, 0xd0, 0x5a, 0xd1, 0x47, 0x45, 0xbb, 0x21, 0xf7, + 0x7a, 0x9e, 0x3a, 0x8c, 0xe2, 0x61, 0xad, 0x05, 0x7d, 0x65, 0xc1, 0x32, 0x99, 0x3a, 0xaf, 0xbc, + 0x9b, 0xda, 0xfa, 0xc3, 0x3c, 0xaa, 0xa7, 0x6d, 0xd7, 0xaa, 0xeb, 0x4d, 0x9c, 0xb1, 0x2a, 0x3e, + 0xa3, 0xd7, 0xfe, 0x83, 0x05, 0x4b, 0x0f, 0x88, 0x4f, 0x83, 0x2e, 0x89, 0xb5, 0x3d, 0xee, 0x40, + 0x55, 0x78, 0x6b, 0x77, 0xe4, 0x53, 0xed, 0x5a, 0xcb, 0x1a, 0xb0, 0xda, 0xd6, 0x74, 0x9c, 0x4a, + 0x08, 0x69, 0x2f, 0xe0, 0x34, 0x1e, 0x13, 0x5f, 0x3b, 0x58, 0x2a, 0xfd, 0x48, 0xd3, 0x71, 0x2a, + 0x81, 0x1c, 0x80, 0x98, 0xba, 0xa3, 0x38, 0xa6, 0x81, 0x2b, 0xdc, 0xaa, 0x78, 0x7b, 0xa1, 0xb5, + 0x24, 0x5d, 0x23, 0xa5, 0xe2, 0x8c, 0x84, 0xfd, 0x47, 0x0b, 0x96, 0x37, 0x99, 0x4b, 0x7c, 0xb9, + 0xdb, 0xbd, 0xd0, 0xf7, 0xdc, 0x09, 0x7a, 0x07, 0xca, 0x3e, 0x1d, 0xd3, 0xc4, 0xf1, 0xaf, 0x69, + 0x7d, 0xe5, 0x6d, 0x41, 0xc4, 0x8a, 0x87, 0x7a, 0x30, 0x3f, 0xa4, 0x8c, 0x91, 0x3e, 0xd5, 0xb6, + 0xfd, 0x61, 0x1e, 0xdb, 0xee, 0x28, 0x88, 0xd6, 0x75, 0xad, 0x63, 0x5e, 0x13, 0x70, 0x02, 0x6e, + 0x7f, 0x69, 0xc1, 0xf2, 0x4f, 0xe2, 0x70, 0x14, 0xed, 0xd3, 0x98, 0x79, 0x61, 0xb0, 0xe5, 0x05, + 0x5d, 0xb1, 0xc3, 0xbe, 0xa0, 0x4d, 0xef, 0x50, 0x0a, 0x62, 0xc5, 0x43, 0xef, 0xc1, 0xfc, 0x58, + 0xad, 0xd1, 0x86, 0x4b, 0x95, 0x68, 0x28, 0x9c, 0xf0, 0xd1, 0x2d, 0x28, 0x0d, 0xbc, 0xa0, 0xab, + 0xe3, 0x70, 0x51, 0xcb, 0x95, 0x84, 0x2e, 0x2c, 0x39, 0xf6, 0xe7, 0x50, 0xde, 0x22, 0xbd, 0x01, + 0x79, 0x53, 0x4e, 0x78, 0x07, 0xca, 0x3c, 0x8c, 0x3c, 0x57, 0xab, 0x4c, 0x77, 0xd6, 0x11, 0x44, + 0xac, 0x78, 0xa8, 0x01, 0x0b, 0x91, 0xf0, 0x14, 0xe9, 0x99, 0x42, 0x67, 0xb9, 0x75, 0x43, 0x0b, + 0x2e, 0xec, 0x25, 0x0c, 0x6c, 0x64, 0xec, 0x9f, 0x42, 0x69, 0xe7, 0x71, 0xa7, 0xf3, 0x36, 0x94, + 0xdb, 0xbf, 0xb5, 0x20, 0xb1, 0xb2, 0x38, 0xf7, 0x41, 0xd8, 0x9d, 0x68, 0xc0, 0xf4, 0xdc, 0xad, + 0xb0, 0x3b, 0xc1, 0x92, 0x83, 0x0e, 0xd2, 0xe0, 0x2d, 0xcc, 0x1c, 0xbc, 0x4b, 0x1a, 0xbf, 0x72, + 0x3a, 0x60, 0xed, 0x3d, 0x28, 0xed, 0x36, 0x3b, 0xed, 0x37, 0x9d, 0xee, 0x3d, 0x98, 0x67, 0xa3, + 0x83, 0x67, 0xd4, 0xe5, 0xd3, 0xf7, 0xd9, 0x56, 0x64, 0x9c, 0xf0, 0xed, 0xbf, 0x16, 0x01, 0x76, + 0xc3, 0x2e, 0x6d, 0x73, 0xc2, 0x47, 0x0c, 0xad, 0x40, 0xc1, 0xeb, 0x6a, 0x5c, 0xd0, 0x8b, 0x0a, + 0x8f, 0x1e, 0xe2, 0x82, 0xd7, 0x15, 0x26, 0x08, 0x4c, 0xf2, 0x4e, 0x4d, 0x20, 0x93, 0xb6, 0xe4, + 0xa0, 0xef, 0x43, 0xad, 0xeb, 0xb1, 0xc8, 0x27, 0x13, 0x99, 0xe5, 0x95, 0x8f, 0x7c, 0x4b, 0x0b, + 0xd6, 0x1e, 0x1a, 0x16, 0xce, 0xca, 0xa1, 0x3b, 0x50, 0xe2, 0x22, 0xb7, 0xab, 0x1c, 0x9d, 0xe4, + 0x8c, 0x92, 0xc8, 0xe2, 0x2f, 0x8f, 0xd7, 0xaa, 0x62, 0x7b, 0x32, 0xbf, 0x4b, 0x29, 0xf4, 0x01, + 0x94, 0xa3, 0x43, 0xc2, 0x68, 0xbd, 0x2c, 0xc5, 0x93, 0x3c, 0x57, 0xde, 0x13, 0xc4, 0x97, 0xc7, + 0x6b, 0x0b, 0x42, 0x5e, 0x7e, 0x60, 0x25, 0x88, 0x7e, 0x0e, 0x0b, 0x8c, 0x93, 0x98, 0xd3, 0x6e, + 0x93, 0xd7, 0x2b, 0xf2, 0x72, 0xbe, 0xeb, 0xa8, 0x72, 0xe7, 0x64, 0xcb, 0x9d, 0xb9, 0x16, 0x51, + 0x8d, 0x9d, 0xf1, 0x5d, 0xa7, 0xe3, 0x0d, 0xa9, 0x71, 0xb8, 0x76, 0x02, 0x82, 0x0d, 0x1e, 0xfa, + 0xa5, 0xc8, 0x23, 0x2c, 0xf4, 0xc7, 0x12, 0x7d, 0xfe, 0xd2, 0xe8, 0xa6, 0x24, 0xa5, 0x28, 0x38, + 0x83, 0x28, 0xee, 0x32, 0xc9, 0x1e, 0xd5, 0xd3, 0x77, 0x79, 0x26, 0x01, 0xfc, 0xbe, 0x04, 0x4b, + 0x02, 0x65, 0x14, 0xbb, 0xf4, 0xc7, 0x9e, 0xcf, 0x69, 0x8c, 0xde, 0x85, 0x4a, 0x14, 0xd3, 0x9e, + 0x77, 0xa4, 0xef, 0x34, 0x75, 0xac, 0x3d, 0x49, 0xc5, 0x9a, 0x8b, 0xc6, 0x50, 0xf1, 0xc9, 0x01, + 0xf5, 0x59, 0xbd, 0x70, 0xab, 0x78, 0xbb, 0xb6, 0xbe, 0x9b, 0xc7, 0x79, 0x4f, 0xeb, 0x76, 0xb6, + 0x25, 0xe0, 0x66, 0xc0, 0xe3, 0x89, 0xd1, 0xab, 0x88, 0x58, 0x6b, 0x13, 0x15, 0xa8, 0x46, 0x82, + 0x20, 0xe4, 0x32, 0xab, 0x32, 0x99, 0x87, 0x6b, 0xeb, 0xed, 0xb7, 0xa0, 0xbd, 0x69, 0x50, 0xd5, + 0x16, 0x52, 0x3f, 0xcc, 0x70, 0x70, 0x56, 0xb9, 0xf0, 0x13, 0x37, 0xa6, 0xa2, 0xbd, 0x69, 0xa9, + 0x86, 0x21, 0xa7, 0x9f, 0x3c, 0x48, 0x40, 0xb0, 0xc1, 0x5b, 0xf9, 0x10, 0x6a, 0x19, 0x83, 0xa0, + 0x65, 0x28, 0x0e, 0xa8, 0x4e, 0x27, 0x58, 0xfc, 0x44, 0x37, 0xa1, 0x3c, 0x26, 0xfe, 0x48, 0xc7, + 0x17, 0x56, 0x1f, 0xf7, 0x0b, 0xf7, 0xac, 0x95, 0x8f, 0x60, 0x79, 0xfa, 0x34, 0x97, 0x59, 0x6f, + 0x7f, 0x95, 0xf1, 0x8b, 0x4f, 0x64, 0xd8, 0x8b, 0xbc, 0x2a, 0x22, 0x96, 0x45, 0xc4, 0x4d, 0x4a, + 0x6b, 0xba, 0xfd, 0xdd, 0x84, 0x81, 0x8d, 0x0c, 0xfa, 0xf5, 0x55, 0xb7, 0x0a, 0x37, 0x2f, 0xd6, + 0x26, 0x64, 0x3c, 0xb5, 0x38, 0xbb, 0xa7, 0x2a, 0x6b, 0x5c, 0xd4, 0x53, 0x97, 0xfb, 0x53, 0xd5, + 0x55, 0x3b, 0x49, 0x2e, 0x03, 0x4c, 0x57, 0x6a, 0xd3, 0x2b, 0x4d, 0x73, 0xf0, 0x19, 0xbd, 0x33, + 0x38, 0x93, 0xfd, 0xe7, 0x82, 0x71, 0x06, 0xdd, 0x66, 0x5d, 0xda, 0x19, 0x7a, 0x50, 0xe9, 0xc9, + 0x28, 0xd3, 0x1e, 0xd0, 0x9a, 0x3d, 0x5e, 0x5b, 0x20, 0x6c, 0xae, 0x7e, 0x63, 0x8d, 0xfe, 0x6a, + 0x9b, 0x17, 0xff, 0x3f, 0x36, 0xb7, 0xaf, 0xc3, 0x35, 0x4c, 0x79, 0x3c, 0x69, 0x73, 0x31, 0x01, + 0xf5, 0x27, 0xf6, 0x3f, 0x0a, 0x00, 0xa6, 0xb7, 0x17, 0x35, 0x39, 0xbd, 0x04, 0x53, 0x93, 0xc5, + 0x84, 0x21, 0x6f, 0x64, 0x1f, 0xca, 0x74, 0x4c, 0x83, 0xa4, 0x22, 0x7f, 0x9c, 0x94, 0xad, 0x4d, + 0x41, 0x7c, 0x79, 0xbc, 0xd6, 0xc8, 0x4c, 0x9c, 0x43, 0x2f, 0xf0, 0x42, 0xf5, 0xf7, 0xfd, 0x7e, + 0xe8, 0x64, 0x3b, 0x78, 0x29, 0x2e, 0xab, 0xa1, 0x82, 0x43, 0x4f, 0xd3, 0xbb, 0x50, 0x86, 0xf9, + 0x51, 0xbe, 0x11, 0xe5, 0x35, 0xb7, 0xf0, 0x0c, 0xaa, 0x6c, 0xa3, 0x35, 0x72, 0x07, 0x94, 0xcb, + 0x9a, 0x9b, 0x5b, 0x87, 0xc2, 0xc8, 0xf4, 0xf0, 0x9a, 0x82, 0x53, 0x7c, 0xfb, 0xdf, 0x05, 0x48, + 0xc9, 0xa2, 0xa1, 0xa7, 0x41, 0x37, 0x0a, 0xbd, 0x80, 0x4f, 0xb7, 0xff, 0x9b, 0x9a, 0x8e, 0x53, + 0x09, 0x51, 0xea, 0x0e, 0xd4, 0x26, 0x0b, 0xa7, 0x4b, 0x9d, 0x56, 0xa2, 0xb9, 0x42, 0x2e, 0xa6, + 0xfd, 0xa4, 0x9f, 0xcc, 0xc8, 0x61, 0x49, 0xc5, 0x9a, 0xab, 0xc6, 0x09, 0x26, 0x06, 0x00, 0xd5, + 0x99, 0x54, 0xb3, 0xe3, 0x84, 0xa2, 0xe3, 0x54, 0x02, 0xed, 0xc3, 0x02, 0x71, 0x5d, 0xca, 0x98, + 0x18, 0x36, 0x95, 0x95, 0xbe, 0x93, 0xa9, 0x1d, 0x8e, 0x1b, 0xc6, 0x54, 0x54, 0x8a, 0x36, 0x75, + 0x63, 0xca, 0xb7, 0xe8, 0xa4, 0x4d, 0x7d, 0xea, 0xf2, 0x30, 0x36, 0xa1, 0xd6, 0x4c, 0xd6, 0x63, + 0x03, 0x25, 0x70, 0x59, 0xb2, 0x44, 0xf7, 0x2e, 0x97, 0xc5, 0x4d, 0x59, 0xd8, 0x40, 0xd9, 0x4f, + 0x84, 0x9d, 0x2f, 0xd9, 0x24, 0xbc, 0x0b, 0x15, 0x36, 0xea, 0x09, 0xb9, 0x29, 0x0b, 0xb7, 0x25, + 0x15, 0x6b, 0xae, 0x48, 0x31, 0x95, 0xb6, 0xbc, 0x7d, 0xf4, 0x14, 0xaa, 0xa2, 0x46, 0x76, 0x09, + 0x27, 0x7a, 0xa6, 0xfd, 0xe0, 0x62, 0x15, 0x55, 0x65, 0xe6, 0x1d, 0xca, 0x89, 0xe9, 0x90, 0x0c, + 0x0d, 0xa7, 0xa8, 0xe8, 0x29, 0x94, 0x58, 0x44, 0x5d, 0x9d, 0x89, 0xf2, 0x0d, 0xe8, 0xf2, 0xbb, + 0x1d, 0x51, 0xd7, 0x74, 0xb5, 0xe2, 0x0b, 0x4b, 0x64, 0x74, 0x28, 0x1a, 0x7b, 0xd1, 0x1d, 0xeb, + 0x08, 0xfb, 0x78, 0x06, 0x1d, 0x12, 0x27, 0xdb, 0xde, 0x8b, 0x6f, 0xac, 0xf1, 0xed, 0xbf, 0x59, + 0x00, 0x4a, 0x70, 0xdb, 0x63, 0x1c, 0xfd, 0xe2, 0x8c, 0xf1, 0x9c, 0x8b, 0x19, 0x4f, 0xac, 0x96, + 0xa6, 0x4b, 0x3d, 0x36, 0xa1, 0x64, 0x0c, 0xf7, 0x2b, 0x28, 0x7b, 0x9c, 0x0e, 0x93, 0x8e, 0xef, + 0x7e, 0xfe, 0x53, 0x99, 0xf1, 0xe9, 0x91, 0x00, 0xc4, 0x0a, 0xd7, 0xfe, 0xa2, 0x98, 0x9c, 0x46, + 0x18, 0x13, 0x51, 0x98, 0x67, 0xb2, 0xde, 0xb0, 0xba, 0x35, 0x83, 0x46, 0x09, 0x91, 0x19, 0x68, + 0x14, 0x24, 0x4e, 0xb0, 0x91, 0x07, 0x55, 0x1e, 0x7b, 0xfd, 0x3e, 0x8d, 0x93, 0x93, 0xe5, 0x1a, + 0xb7, 0x3b, 0x0a, 0xc3, 0x58, 0x50, 0x13, 0x18, 0x4e, 0xe1, 0xd1, 0x11, 0x00, 0x4d, 0x5f, 0x04, + 0x66, 0xa9, 0x4b, 0xd3, 0xef, 0x0a, 0xc6, 0xe5, 0x0d, 0x07, 0x67, 0x74, 0xa9, 0x1c, 0x16, 0x51, + 0xc2, 0x75, 0x66, 0xca, 0xe4, 0x30, 0x41, 0xc5, 0x9a, 0x6b, 0xff, 0xa5, 0x04, 0x8b, 0x59, 0xcf, + 0x33, 0xc3, 0x93, 0x95, 0x6b, 0x78, 0x2a, 0x5c, 0xe9, 0xf0, 0x54, 0xbc, 0xca, 0xe1, 0xa9, 0xf4, + 0xfa, 0xe1, 0x09, 0x45, 0x50, 0x0e, 0xc2, 0x2e, 0x65, 0xf5, 0xb2, 0x74, 0x9a, 0xad, 0x59, 0x83, + 0xdc, 0x11, 0x96, 0xd4, 0x3d, 0x65, 0x1a, 0x1f, 0x92, 0x86, 0x95, 0x22, 0xd1, 0x76, 0xe9, 0x2b, + 0xa5, 0x5d, 0x99, 0xda, 0xab, 0xc6, 0x5a, 0x9b, 0x09, 0x03, 0x1b, 0x99, 0x95, 0x23, 0x35, 0xaa, + 0x9f, 0xdb, 0xf4, 0x75, 0xb2, 0x4d, 0x5f, 0xce, 0x5c, 0x68, 0xde, 0x02, 0xb2, 0x4d, 0xe3, 0x97, + 0xf3, 0x50, 0xd1, 0xcd, 0x62, 0xf2, 0x0a, 0x60, 0x9d, 0xfb, 0x0a, 0x70, 0x07, 0xaa, 0x5d, 0x4a, + 0xba, 0xbe, 0x17, 0xa8, 0x9d, 0x14, 0x4d, 0x10, 0x3d, 0xd4, 0x74, 0x9c, 0x4a, 0xa0, 0x7d, 0x81, + 0xc7, 0x93, 0xdc, 0x7a, 0x2f, 0xd7, 0x9e, 0x9b, 0x9d, 0x76, 0xab, 0x2a, 0x77, 0xd1, 0xec, 0xb4, + 0xb1, 0xc4, 0x13, 0xb8, 0xc3, 0x4f, 0x39, 0xd7, 0x2d, 0x7a, 0x2e, 0xdc, 0x9d, 0xc7, 0x9d, 0x8e, + 0xc2, 0x15, 0xbf, 0xb0, 0xc4, 0x13, 0xb8, 0x64, 0xf8, 0x69, 0xa4, 0x6b, 0x7c, 0x2e, 0xdc, 0xe6, + 0xce, 0xe3, 0x3d, 0x85, 0x2b, 0x7e, 0x61, 0x89, 0x87, 0x9e, 0x40, 0x79, 0x40, 0x7a, 0x03, 0xa2, + 0x8b, 0xfc, 0x87, 0x79, 0x80, 0xe5, 0xbb, 0x5b, 0x6b, 0x41, 0x78, 0x9a, 0xfc, 0x89, 0x15, 0x24, + 0xf2, 0xa1, 0x9a, 0xcc, 0x51, 0xfa, 0x85, 0xa2, 0x35, 0xcb, 0xcc, 0xa6, 0x73, 0xf0, 0xa2, 0xb8, + 0xd1, 0x84, 0x86, 0x53, 0x0d, 0x42, 0x9b, 0xab, 0xdf, 0x71, 0xe5, 0x93, 0x45, 0x4e, 0x6d, 0xa7, + 0xdf, 0x82, 0x95, 0xb6, 0x84, 0x86, 0x53, 0x0d, 0x42, 0x5b, 0xac, 0x27, 0x89, 0xfa, 0xc2, 0xec, + 0xd3, 0x48, 0x56, 0x5b, 0x42, 0xc3, 0xa9, 0x06, 0xf4, 0x39, 0xd4, 0xdc, 0x30, 0x60, 0x3c, 0x26, + 0x5e, 0xc0, 0x59, 0x1d, 0xa4, 0xc2, 0xcd, 0xfc, 0x85, 0xec, 0x81, 0x01, 0x33, 0x0f, 0x14, 0x19, + 0x22, 0xce, 0xaa, 0xb3, 0x3f, 0x83, 0x1b, 0x67, 0x96, 0x21, 0x0a, 0x25, 0xee, 0xe9, 0x80, 0xac, + 0xad, 0x3f, 0xc8, 0x55, 0xec, 0xbc, 0x21, 0xcd, 0xee, 0x24, 0x8d, 0x6a, 0xc1, 0xc0, 0x12, 0xde, + 0xfe, 0x8f, 0x68, 0xea, 0xd4, 0xbf, 0x0d, 0x92, 0x90, 0xb5, 0xae, 0x28, 0x64, 0x0b, 0x57, 0x14, + 0xb2, 0xc5, 0xab, 0x0a, 0xd9, 0xd2, 0x5b, 0x0f, 0x59, 0xfb, 0x4f, 0x16, 0x5c, 0x9f, 0xba, 0x16, + 0xf4, 0x09, 0x94, 0x65, 0xe9, 0xd4, 0x86, 0xbf, 0x4c, 0xa1, 0x4c, 0x2b, 0x90, 0x2c, 0xc3, 0x58, + 0xe1, 0xa0, 0x6d, 0x28, 0x31, 0x1e, 0x46, 0x39, 0xca, 0xba, 0xe9, 0x93, 0x79, 0x18, 0x61, 0x89, + 0x62, 0xff, 0xb7, 0x00, 0xf3, 0xba, 0x4b, 0xba, 0x40, 0x95, 0xc8, 0xc6, 0xed, 0x5b, 0x78, 0x45, + 0x50, 0xb3, 0xc1, 0xb9, 0x71, 0x7b, 0x60, 0x1a, 0x81, 0xe2, 0xec, 0xff, 0x83, 0xa9, 0xbd, 0xb2, + 0x83, 0xf8, 0x0c, 0xae, 0xc5, 0x34, 0xf2, 0xd3, 0x07, 0x02, 0xed, 0x16, 0xcd, 0x7c, 0xc7, 0xca, + 0xbc, 0x34, 0xb4, 0x6e, 0x9c, 0x1c, 0xaf, 0x9d, 0x7e, 0x7c, 0xc0, 0xa7, 0x55, 0xb5, 0x9c, 0xe7, + 0x2f, 0x56, 0xe7, 0xbe, 0x7e, 0xb1, 0x3a, 0xf7, 0xcd, 0x8b, 0xd5, 0xb9, 0x2f, 0x4e, 0x56, 0xad, + 0xe7, 0x27, 0xab, 0xd6, 0xd7, 0x27, 0xab, 0xd6, 0x37, 0x27, 0xab, 0xd6, 0x3f, 0x4f, 0x56, 0xad, + 0xdf, 0xfd, 0x6b, 0x75, 0xee, 0x49, 0x35, 0xc1, 0xff, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x37, + 0x18, 0x86, 0xaf, 0x58, 0x1f, 0x00, 0x00, } diff --git a/pkg/apis/sensor/v1alpha1/generated.proto b/pkg/apis/sensor/v1alpha1/generated.proto index 3ec4e8f74675..6678ee6df1d3 100644 --- a/pkg/apis/sensor/v1alpha1/generated.proto +++ b/pkg/apis/sensor/v1alpha1/generated.proto @@ -40,20 +40,6 @@ message AMQP { optional string routingKey = 4; } -// ARN - holds ARN information that will be sent to the web service -// ARN desciption can be found in http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html -message ARN { - optional string partition = 1; - - optional string service = 2; - - optional string region = 3; - - optional string accountID = 4; - - optional string resource = 5; -} - // ArtifactLocation describes the location for an external artifact message ArtifactLocation { optional S3Artifact s3 = 1; @@ -219,9 +205,7 @@ message S3Artifact { optional string event = 2; - optional ARN arn = 3; - - optional S3Filter filter = 4; + optional S3Filter filter = 3; } // S3Bucket contains information for an S3 Bucket diff --git a/pkg/apis/sensor/v1alpha1/openapi_generated.go b/pkg/apis/sensor/v1alpha1/openapi_generated.go index ef4428892d20..db6ab7c95af1 100644 --- a/pkg/apis/sensor/v1alpha1/openapi_generated.go +++ b/pkg/apis/sensor/v1alpha1/openapi_generated.go @@ -29,7 +29,6 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.AMQP": schema_pkg_apis_sensor_v1alpha1_AMQP(ref), - "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.ARN": schema_pkg_apis_sensor_v1alpha1_ARN(ref), "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.ArtifactLocation": schema_pkg_apis_sensor_v1alpha1_ArtifactLocation(ref), "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.ArtifactSignal": schema_pkg_apis_sensor_v1alpha1_ArtifactSignal(ref), "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.CalendarSignal": schema_pkg_apis_sensor_v1alpha1_CalendarSignal(ref), @@ -97,50 +96,6 @@ func schema_pkg_apis_sensor_v1alpha1_AMQP(ref common.ReferenceCallback) common.O } } -func schema_pkg_apis_sensor_v1alpha1_ARN(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ARN - holds ARN information that will be sent to the web service ARN desciption can be found in http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html", - Properties: map[string]spec.Schema{ - "partition": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "service": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "region": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "accountID": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "resource": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"partition", "service", "region", "accountID", "resource"}, - }, - }, - Dependencies: []string{}, - } -} - func schema_pkg_apis_sensor_v1alpha1_ArtifactLocation(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -694,11 +649,6 @@ func schema_pkg_apis_sensor_v1alpha1_S3Artifact(ref common.ReferenceCallback) co Format: "", }, }, - "arn": { - SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.ARN"), - }, - }, "filter": { SchemaProps: spec.SchemaProps{ Ref: ref("github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.S3Filter"), @@ -708,7 +658,7 @@ func schema_pkg_apis_sensor_v1alpha1_S3Artifact(ref common.ReferenceCallback) co }, }, Dependencies: []string{ - "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.ARN", "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.S3Filter", "k8s.io/api/core/v1.SecretKeySelector"}, + "github.com/blackrock/axis/pkg/apis/sensor/v1alpha1.S3Filter", "k8s.io/api/core/v1.SecretKeySelector"}, } } diff --git a/pkg/apis/sensor/v1alpha1/types.go b/pkg/apis/sensor/v1alpha1/types.go index 0e57444cfe80..305ab1178258 100644 --- a/pkg/apis/sensor/v1alpha1/types.go +++ b/pkg/apis/sensor/v1alpha1/types.go @@ -352,18 +352,7 @@ type S3Artifact struct { S3Bucket `json:",inline" protobuf:"bytes,5,opt,name=s3Bucket"` Key string `json:"key,omitempty" protobuf:"bytes,1,opt,name=key"` Event minio.NotificationEventType `json:"event,omitempty" protobuf:"bytes,2,opt,name=event"` - ARN *ARN `json:"arn,omitempty" protobuf:"bytes,3,opt,name=arn"` - Filter *S3Filter `json:"filter,omitempty" protobuf:"bytes,4,opt,name=filter"` -} - -// ARN - holds ARN information that will be sent to the web service -// ARN desciption can be found in http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html -type ARN struct { - Partition string `json:"partition" protobuf:"bytes,1,opt,name=partition"` - Service string `json:"service" protobuf:"bytes,2,opt,name=service"` - Region string `json:"region" protobuf:"bytes,3,opt,name=region"` - AccountID string `json:"accountID" protobuf:"bytes,4,opt,name=accountID"` - Resource string `json:"resource" protobuf:"bytes,5,opt,name=resource"` + Filter *S3Filter `json:"filter,omitempty" protobuf:"bytes,3,opt,name=filter"` } // S3Bucket contains information for an S3 Bucket diff --git a/pkg/apis/sensor/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/sensor/v1alpha1/zz_generated.deepcopy.go index 2530894e4e7e..02bcff154098 100644 --- a/pkg/apis/sensor/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/sensor/v1alpha1/zz_generated.deepcopy.go @@ -39,22 +39,6 @@ func (in *AMQP) DeepCopy() *AMQP { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ARN) DeepCopyInto(out *ARN) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ARN. -func (in *ARN) DeepCopy() *ARN { - if in == nil { - return nil - } - out := new(ARN) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ArtifactLocation) DeepCopyInto(out *ArtifactLocation) { *out = *in @@ -345,15 +329,6 @@ func (in *RetryStrategy) DeepCopy() *RetryStrategy { func (in *S3Artifact) DeepCopyInto(out *S3Artifact) { *out = *in in.S3Bucket.DeepCopyInto(&out.S3Bucket) - if in.ARN != nil { - in, out := &in.ARN, &out.ARN - if *in == nil { - *out = nil - } else { - *out = new(ARN) - **out = **in - } - } if in.Filter != nil { in, out := &in.Filter, &out.Filter if *in == nil {