Merge branch 'postgres-sink-on-conflict' of github.com:vaughnw128/vector into postgres-sink-on-conflict

Author: vaughnw128

Cargo.lock

@@ -53,7 +53,7 @@ workspace = true
 [package.metadata.deb]
 name = "vector"
 section = "admin"
-maintainer-scripts = "distribution/debian/scripts/"
+maintainer-scripts = "target/debian-maintainer-scripts/"
 conf-files = ["/etc/default/vector", "/etc/vector/vector.yaml"]
 assets = [
   ["target/release/vector", "/usr/bin/", "755"],

Cargo.toml

@@ -32,49 +32,9 @@ case "$1" in
         # absent makes dpkg prompt about a deleted configuration file. Stage
         # the exact incoming stub instead, then restore the user's file in
         # postinst (or postrm if installation aborts).
-        # Keep this content byte-for-byte in sync with ../vector.yaml.
+        # The packaging step embeds distribution/debian/vector.yaml here.
         cat > /etc/vector/vector.yaml <<'VECTOR_CONFIG_STUB'
-#                                    __   __  __
-#                                    \ \ / / / /
-#                                     \ V / / /
-#                                      \_/  \/
-#
-#                                    V E C T O R
-#                                   Configuration
-#
-# ------------------------------------------------------------------------------
-# Website: https://vector.dev
-# Docs: https://vector.dev/docs
-# Chat: https://chat.vector.dev
-# ------------------------------------------------------------------------------
-
-# Change this to use a non-default directory for Vector data storage:
-# data_dir: "/var/lib/vector"
-
-# Example configurations are available at /etc/vector/examples/
-
-# Add your sources, transforms, and sinks here.
-# See https://vector.dev/docs/reference/configuration/ for full reference.
-
-# sources:
-#   my_source:
-#     type: "..."
-
-# transforms:
-#   my_transform:
-#     type: "..."
-#     inputs: ["my_source"]
-
-# sinks:
-#   my_sink:
-#     type: "..."
-#     inputs: ["my_transform"]
-
-# Vector's API (disabled by default)
-# Uncomment to try it out with the `vector top` command
-# api:
-#   enabled: true
-#   address: "127.0.0.1:8686"
+{{config_stub~}}
 VECTOR_CONFIG_STUB
       fi
     fi

distribution/debian/scripts/preinst

@@ -76,6 +76,8 @@ cat LICENSE NOTICE >"$PROJECT_ROOT/target/debian-license.txt"
 # mirroring `scripts/package-rpm.sh`. Without this, a `0.59.0-dev-1` package
 # would sort newer than the eventual stable `0.59.0-1` release.
 DEB_VERSION="${PACKAGE_VERSION/-/\~}"
+${VDEV:-cargo vdev} build debian-maintainer-scripts
+
 cargo deb --target "$TARGET" --deb-version "${DEB_VERSION}-1" --variant "$TARGET" --no-build --no-strip --profile "$PROFILE"
 
 # Rename the resulting .deb file to remove TARGET from name.

scripts/package-deb.sh

@@ -67,7 +67,7 @@ impl Default for HttpConfig {
             request: RequestConfig::default(),
             poll_interval_secs: 30,
             tls_options: None,
-            proxy: Default::default(),
+            proxy: ProxyConfig::default(),
             config_format: Format::default(),
             interpolate_env: false,
         }
@@ -90,7 +90,7 @@ async fn http_request(
 
     // Augment with headers. These may be required e.g. for authentication to
     // private endpoints.
-    for (header, value) in headers.iter() {
+    for (header, value) in headers {
         builder = builder.header(header.as_str(), value.as_str());
     }
 
@@ -184,7 +184,7 @@ fn poll_http(
             match http_request_to_config_builder(&url, tls_options.as_ref(), &headers, &proxy, &config_format, interpolate_env).await {
                 Ok(config_builder) => yield signal::SignalTo::ReloadFromConfigBuilder(config_builder),
                 Err(_) => {},
-            };
+            }
 
             info!(
                 message = "HTTP provider is waiting.",

src/providers/http.rs

@@ -1,3 +1,4 @@
+#![warn(clippy::pedantic)]
 #![allow(missing_docs)]
 use enum_dispatch::enum_dispatch;
 use vector_lib::configurable::{NamedComponent, configurable_component};

src/providers/mod.rs

@@ -1,6 +1,6 @@
 [package]
 name = "vdev"
-version = "0.3.28"
+version = "0.3.29"
 edition = "2024"
 authors = ["Vector Contributors <vector@datadoghq.com>"]
 license = "MPL-2.0"
@@ -27,6 +27,7 @@ clap-verbosity-flag = "3.0.4"
 clap_complete.workspace = true
 directories = "6.0.0"
 glob.workspace = true
+handlebars = { version = "6.4.4", default-features = false }
 hex = "0.4.3"
 indexmap.workspace = true
 indicatif = { version = "0.18.4", features = ["improved_unicode"] }