Skip to content

Commit

Permalink
chore(aws_s3 sink): Update metadata to match the editorial review for…
Browse files Browse the repository at this point in the history
… the schema. (vectordotdev#17475)

<!--
**Your PR title must conform to the conventional commit spec!**

  <type>(<scope>)!: <description>

  * `type` = chore, enhancement, feat, fix, docs
  * `!` = OPTIONAL: signals a breaking change
* `scope` = Optional when `type` is "chore" or "docs", available scopes
https://github.com/vectordotdev/vector/blob/master/.github/semantic.yml#L20
  * `description` = short description of the change

Examples:

  * enhancement(file source): Add `sort` option to sort discovered files
  * feat(new source): Initial `statsd` source
  * fix(file source): Fix a bug discovering new files
  * chore(external docs): Clarify `batch_size` option
-->
  • Loading branch information
Ari committed May 23, 2023
1 parent 9f6f6ec commit c1262cd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/codecs/src/encoding/format/avro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ pub struct AvroSerializerOptions {
#[configurable(metadata(
docs::examples = r#"{ "type": "record", "name": "log", "fields": [{ "name": "message", "type": "string" }] }"#
))]
#[configurable(metadata(docs::human_name = "Schema JSON"))]
pub schema: String,
}

Expand Down
2 changes: 1 addition & 1 deletion lib/vector-config-common/src/human_friendly.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static WELL_KNOWN_ACRONYMS: Lazy<HashSet<String>> = Lazy::new(|| {
"api", "amqp", "aws", "ec2", "ecs", "gcp", "hec", "http", "https", "nats", "nginx", "s3",
"sqs", "tls", "ssl", "otel", "gelf", "csv", "json", "rfc3339", "lz4", "us", "eu", "bsd",
"vrl", "tcp", "udp", "id", "uuid", "kms", "uri", "url", "acp", "uid", "ip", "pid",
"ndjson", "ewma", "rtt", "cpu", "acl",
"ndjson", "ewma", "rtt", "cpu", "acl", "imds", "acl", "alpn",
];

acronyms.iter().map(|s| s.to_lowercase()).collect()
Expand Down
4 changes: 4 additions & 0 deletions lib/vector-core/src/tls/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ pub struct TlsConfig {
/// The certificate must be in the DER or PEM (X.509) format. Additionally, the certificate can be provided as an inline string in PEM format.
#[serde(alias = "ca_path")]
#[configurable(metadata(docs::examples = "/path/to/certificate_authority.crt"))]
#[configurable(metadata(docs::human_name = "CA File Path"))]
pub ca_file: Option<PathBuf>,

/// Absolute path to a certificate file used to identify this server.
Expand All @@ -129,20 +130,23 @@ pub struct TlsConfig {
/// If this is set, and is not a PKCS#12 archive, `key_file` must also be set.
#[serde(alias = "crt_path")]
#[configurable(metadata(docs::examples = "/path/to/host_certificate.crt"))]
#[configurable(metadata(docs::human_name = "Certificate File Path"))]
pub crt_file: Option<PathBuf>,

/// Absolute path to a private key file used to identify this server.
///
/// The key must be in DER or PEM (PKCS#8) format. Additionally, the key can be provided as an inline string in PEM format.
#[serde(alias = "key_path")]
#[configurable(metadata(docs::examples = "/path/to/host_certificate.key"))]
#[configurable(metadata(docs::human_name = "Key File Path"))]
pub key_file: Option<PathBuf>,

/// Passphrase used to unlock the encrypted key file.
///
/// This has no effect unless `key_file` is set.
#[configurable(metadata(docs::examples = "${KEY_PASS_ENV_VAR}"))]
#[configurable(metadata(docs::examples = "PassWord1"))]
#[configurable(metadata(docs::human_name = "Key File Password"))]
pub key_pass: Option<String>,
}

Expand Down
2 changes: 2 additions & 0 deletions src/aws/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ pub enum AwsAuthentication {
/// Relevant when the default credentials chain or `assume_role` is used.
#[configurable(metadata(docs::type_unit = "seconds"))]
#[configurable(metadata(docs::examples = 30))]
#[configurable(metadata(docs::human_name = "Load Timeout"))]
load_timeout_secs: Option<u64>,

/// Configuration for authenticating with AWS through IMDS.
Expand All @@ -141,6 +142,7 @@ pub enum AwsAuthentication {
/// Relevant when the default credentials chain or `assume_role` is used.
#[configurable(metadata(docs::type_unit = "seconds"))]
#[configurable(metadata(docs::examples = 30))]
#[configurable(metadata(docs::human_name = "Load Timeout"))]
load_timeout_secs: Option<u64>,

/// Configuration for authenticating with AWS through IMDS.
Expand Down
1 change: 1 addition & 0 deletions src/sinks/aws_s3/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ pub struct S3SinkConfig {
/// This ensures there are no name collisions, and can be useful in high-volume workloads where
/// object keys must be unique.
#[serde(default = "crate::serde::default_true")]
#[configurable(metadata(docs::human_name = "Append UUID to Filename"))]
pub filename_append_uuid: bool,

/// The filename extension to use in the object key.
Expand Down

0 comments on commit c1262cd

Please sign in to comment.