Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[LIBS] fix env collector #866

Merged
merged 1 commit into from
May 7, 2024
Merged

[LIBS] fix env collector #866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions libs/blockscout-service-launcher/src/env_collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,7 @@ impl Envs {
- 1;
let table_content = &markdown_content[line_start..=line_end];

let re =
regex::Regex::new(&regex_md_table_row_with_n_columns(4)).context("regex creation")?;
let re = regex::Regex::new(regex_md_table_row()).context("regex creation")?;
let result = re
.captures_iter(table_content)
.map(|c| c.extract())
Expand Down Expand Up @@ -340,12 +339,14 @@ fn serialize_env_vars_to_md_table(vars: Envs) -> String {
result
}

fn regex_md_table_row_with_n_columns(n: usize) -> String {
if n == 0 {
r"\|".to_string()
} else {
r"\|\s*`([^|`]+)`\s*\|".to_string() + &r"\s*`?([^|`]+)`?\s*\|".repeat(n - 1)
}
fn regex_md_table_row() -> &'static str {
concat!(
r"\|\s*`([^|`]*)`\s*",
r"\|\s*([^|]*)\s*",
r"\|\s*([^|]*)\s*",
r"\|\s*`?([^|`]*)`?\s*",
r#"\|"#
)
}

fn flatten_json(json: &Value, initial_prefix: &str) -> BTreeMap<String, String> {
Expand Down Expand Up @@ -477,7 +478,7 @@ url = "test-url"
markdown,
r#"
[anchor]: <> (anchors.envs.start)
|`SOME_EXTRA_VARS`| | comment should be saved |`example_value` |
|`SOME_EXTRA_VARS`| | comment should be saved. `kek` |`example_value` |
|`SOME_EXTRA_VARS2`| true | |`example_value2` |

[anchor]: <> (anchors.envs.end)
Expand Down Expand Up @@ -520,7 +521,7 @@ url = "test-url"
| `SOME_EXTRA_VARS2` | true | | `example_value2` |
| `TEST_SERVICE__DATABASE__CONNECT__URL` | true | | |
| `TEST_SERVICE__TEST` | true | | |
| `SOME_EXTRA_VARS` | | comment should be saved | `example_value` |
| `SOME_EXTRA_VARS` | | comment should be saved. `kek` | `example_value` |
| `TEST_SERVICE__DATABASE__CREATE_DATABASE` | | | `false` |
| `TEST_SERVICE__DATABASE__RUN_MIGRATIONS` | | | `false` |
| `TEST_SERVICE__TEST2` | | | `123` |
Expand Down
Loading