chore(codecs): consolidate enum types

Author: dsmith3197

lib/codecs/src/decoding/format/gelf.rs

@@ -26,13 +26,14 @@ use crate::{gelf_fields::*, VALID_FIELD_REGEX};
 ///   of vector will still work with the new relaxed decoding.
 
 /// Config used to build a `GelfDeserializer`.
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[configurable_component]
+#[derive(Debug, Clone, Default)]
 pub struct GelfDeserializerConfig {
+    /// GELF-specific decoding options.
     #[serde(
         default,
         skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
     )]
-    /// GELF-specific decoding options.
     pub gelf: GelfDeserializerOptions,
 }
 

lib/codecs/src/decoding/format/json.rs

@@ -17,14 +17,13 @@ use super::{default_lossy, Deserializer};
 
 /// Config used to build a `JsonDeserializer`.
 #[configurable_component]
-#[derive(Debug, Clone, PartialEq, Eq, Derivative)]
-#[derivative(Default)]
+#[derive(Debug, Clone, Default)]
 pub struct JsonDeserializerConfig {
+    /// JSON-specific decoding options.
     #[serde(
         default,
         skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
     )]
-    /// JSON-specific decoding options.
     pub json: JsonDeserializerOptions,
 }
 

lib/codecs/src/decoding/format/native_json.rs

@@ -1,6 +1,5 @@
 use bytes::Bytes;
 use derivative::Derivative;
-use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
 use vector_config::configurable_component;
 use vector_core::{config::DataType, event::Event, schema};
@@ -11,9 +10,14 @@ use super::{default_lossy, Deserializer};
 use vector_core::config::LogNamespace;
 
 /// Config used to build a `NativeJsonDeserializer`.
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[configurable_component]
+#[derive(Debug, Clone, Default)]
 pub struct NativeJsonDeserializerConfig {
     /// Vector's native JSON-specific decoding options.
+    #[serde(
+        default,
+        skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
+    )]
     pub native_json: NativeJsonDeserializerOptions,
 }
 

lib/codecs/src/decoding/format/syslog.rs

@@ -3,7 +3,6 @@ use chrono::{DateTime, Datelike, Utc};
 use derivative::Derivative;
 use lookup::lookup_v2::parse_value_path;
 use lookup::{event_path, owned_value_path, OwnedTargetPath, OwnedValuePath, PathPrefix};
-use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
 use std::borrow::Cow;
 use std::collections::BTreeMap;
@@ -20,10 +19,17 @@ use vrl::value::{kind::Collection, Kind};
 use super::{default_lossy, Deserializer};
 
 /// Config used to build a `SyslogDeserializer`.
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[configurable_component]
+#[derive(Debug, Clone, Default)]
 pub struct SyslogDeserializerConfig {
+    #[serde(skip)]
     source: Option<&'static str>,
+
     /// Syslog-specific decoding options.
+    #[serde(
+        default,
+        skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
+    )]
     pub syslog: SyslogDeserializerOptions,
 }
 

lib/codecs/src/decoding/framing/character_delimited.rs

@@ -1,14 +1,14 @@
 use bytes::{Buf, Bytes, BytesMut};
 use memchr::memchr;
-use serde::{Deserialize, Serialize};
 use tokio_util::codec::Decoder;
 use tracing::{trace, warn};
 use vector_config::configurable_component;
 
 use super::BoxedFramingError;
 
 /// Config used to build a `CharacterDelimitedDecoder`.
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[configurable_component]
+#[derive(Debug, Clone)]
 pub struct CharacterDelimitedDecoderConfig {
     /// Options for the character delimited decoder.
     pub character_delimited: CharacterDelimitedDecoderOptions,

lib/codecs/src/decoding/framing/newline_delimited.rs

@@ -1,19 +1,19 @@
 use bytes::{Bytes, BytesMut};
 use derivative::Derivative;
-use serde::{Deserialize, Serialize};
 use tokio_util::codec::Decoder;
 use vector_config::configurable_component;
 
 use super::{BoxedFramingError, CharacterDelimitedDecoder};
 
 /// Config used to build a `NewlineDelimitedDecoder`.
-#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, Eq)]
+#[configurable_component]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct NewlineDelimitedDecoderConfig {
+    /// Options for the newline delimited decoder.
     #[serde(
         default,
         skip_serializing_if = "vector_core::serde::skip_serializing_if_default"
     )]
-    /// Options for the newline delimited decoder.
     pub newline_delimited: NewlineDelimitedDecoderOptions,
 }
 

lib/codecs/src/decoding/framing/octet_counting.rs

@@ -2,15 +2,15 @@ use std::io;
 
 use bytes::{Buf, Bytes, BytesMut};
 use derivative::Derivative;
-use serde::{Deserialize, Serialize};
 use tokio_util::codec::{LinesCodec, LinesCodecError};
 use tracing::trace;
 use vector_config::configurable_component;
 
 use super::BoxedFramingError;
 
 /// Config used to build a `OctetCountingDecoder`.
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[configurable_component]
+#[derive(Debug, Clone, Default)]
 pub struct OctetCountingDecoderConfig {
     #[serde(
         default,