From 2e875b8c2c2f536d65cee66f347ed8d910d47873 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Thu, 7 Sep 2023 10:27:53 -0400 Subject: [PATCH 1/2] feat: Add git sha to the VRL playground header --- lib/vector-vrl/web-playground/build.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/vector-vrl/web-playground/build.rs b/lib/vector-vrl/web-playground/build.rs index 2162a604467ab..9c340838b8f92 100644 --- a/lib/vector-vrl/web-playground/build.rs +++ b/lib/vector-vrl/web-playground/build.rs @@ -2,6 +2,7 @@ use cargo_toml::Manifest; use std::fs::File; use std::io::Write; use std::path::{Path, PathBuf}; +use std::process::Command; use std::{env, fs, io}; fn get_vector_toml_path() -> PathBuf { @@ -18,6 +19,16 @@ fn get_vector_toml_path() -> PathBuf { .to_path_buf() } +fn get_git_hash() -> String { + let output = Command::new("git") + .args(&["rev-parse", "HEAD"]) + .output() + .unwrap(); + let mut git_hash = String::from_utf8(output.stdout).unwrap(); + git_hash.truncate(8); + git_hash +} + fn write_build_constants(manifest: &Manifest, dest_path: &Path) -> io::Result<()> { let mut output_file = File::create(dest_path)?; output_file.write_all( @@ -26,14 +37,15 @@ fn write_build_constants(manifest: &Manifest, dest_path: &Path) -> io::Result<() let create_const_statement = |name, value| format!("pub const {}: &str = \"{}\";\n", name, value); + // TODO: For releases, we should use the manifest.package().version(). // https://github.com/vectordotdev/vector/issues/18425 - let vector_version_const = create_const_statement("VECTOR_VERSION", "master"); + let vector_version_const = create_const_statement("VECTOR_VERSION", get_git_hash()); output_file .write_all(vector_version_const.as_bytes()) .expect("Failed to write Vector version constant"); - let vrl_version = &manifest + let vrl_version = manifest .dependencies .get("vrl") .unwrap() From d3bc82452393a031bbbc9ab2f568dcbd0ff53f89 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Thu, 7 Sep 2023 12:42:00 -0400 Subject: [PATCH 2/2] add hyperlinks for versions and address nits --- lib/vector-vrl/web-playground/build.rs | 4 +-- .../web-playground/public/index.css | 34 +++++++++---------- .../web-playground/public/index.html | 11 +++++- lib/vector-vrl/web-playground/public/index.js | 16 +++++++-- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/lib/vector-vrl/web-playground/build.rs b/lib/vector-vrl/web-playground/build.rs index 9c340838b8f92..c12e6767bfdbd 100644 --- a/lib/vector-vrl/web-playground/build.rs +++ b/lib/vector-vrl/web-playground/build.rs @@ -21,9 +21,9 @@ fn get_vector_toml_path() -> PathBuf { fn get_git_hash() -> String { let output = Command::new("git") - .args(&["rev-parse", "HEAD"]) + .args(["rev-parse", "HEAD"]) .output() - .unwrap(); + .expect("Failed to get git HEAD sha"); let mut git_hash = String::from_utf8(output.stdout).unwrap(); git_hash.truncate(8); git_hash diff --git a/lib/vector-vrl/web-playground/public/index.css b/lib/vector-vrl/web-playground/public/index.css index bc3b1e7a3e491..296b067889097 100644 --- a/lib/vector-vrl/web-playground/public/index.css +++ b/lib/vector-vrl/web-playground/public/index.css @@ -1,14 +1,27 @@ body { - margin-right: 2vw; - margin-left: 2vw; + margin-right: 2vw; + margin-left: 2vw; + font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, + Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, + Segoe UI Symbol, Noto Color Emoji; } +table { + width: 100%; + border-spacing: 10px; +} + +td { + text-align: left; + font-weight: bold; +} + + .headers-grid { display: grid; grid-template-columns: 3fr 2fr 7fr; grid-template-rows: 90px; gap: 10px; - font-family: "Helvetica Neue", serif; width: 100%; height: 100%; margin: auto; @@ -80,7 +93,6 @@ div#toolbar-section { height: 100%; grid-row: 1; font-weight: bold; - font-family: "Helvetica Neue", serif; } #input-section #cell #container-program { @@ -109,7 +121,6 @@ div#toolbar-section { display: grid; grid-row: 1; font-weight: bold; - font-family: "Helvetica Neue", serif; } #output-section #event-cell #container-event { @@ -130,7 +141,6 @@ div#toolbar-section { display: grid; grid-row: 1; font-weight: bold; - font-family: "Helvetica Neue", serif; height: 50px; } @@ -140,12 +150,6 @@ div#toolbar-section { height: 100%; } - body { - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, - Segoe UI Symbol, Noto Color Emoji; - } - /* BUTTONS */ .btn { display: inline-block; @@ -287,12 +291,6 @@ div#toolbar-section { height: 100%; } - body { - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, - Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, - Segoe UI Symbol, Noto Color Emoji; - } - .btn-primary { display: inline-block; outline: 0; diff --git a/lib/vector-vrl/web-playground/public/index.html b/lib/vector-vrl/web-playground/public/index.html index 614c18c496daf..8fd0d464d88b1 100644 --- a/lib/vector-vrl/web-playground/public/index.html +++ b/lib/vector-vrl/web-playground/public/index.html @@ -27,7 +27,16 @@

VRL Playground

-

+ + + + + + + + + +
Vector Version:
VRL Version:

diff --git a/lib/vector-vrl/web-playground/public/index.js b/lib/vector-vrl/web-playground/public/index.js index f2cc69dbd1504..377167f8f6cc9 100644 --- a/lib/vector-vrl/web-playground/public/index.js +++ b/lib/vector-vrl/web-playground/public/index.js @@ -35,6 +35,7 @@ String: {{str}} You can try validating your JSON here: https://jsonlint.com/ \n`; export class VrlWebPlayground { + constructor() { let temp = init().then(() => { this.run_vrl = run_vrl; @@ -84,12 +85,23 @@ export class VrlWebPlayground { } } - document.getElementById('versions-header').innerText = - "Vector Version: " + vector_version() + "\nVRL Version: " + vrl_version(); + this.addVersions(); }); }); } + addVersions() { + let vectorLinkElement = document.getElementById('vector-version-link'); + let vectorVersion = vector_version(); + vectorLinkElement.text = vectorVersion; + vectorLinkElement.href = `https://github.com/vectordotdev/vector/tree/${vectorVersion}`; + + let vrlLinkElement = document.getElementById('vrl-version-link'); + let vrlVersion = vrl_version(); + vrlLinkElement.text = vrlVersion; + vrlLinkElement.href = `https://crates.io/crates/vrl/${vrlVersion}`; + } + createDefaultEditor(elementId, value, language, theme) { return this.monaco.editor.create(document.getElementById(elementId), { value: value,