Remove secret file existence check in Validate for headers#687
Merged
roidelapluie merged 2 commits intoprometheus:mainfrom Sep 3, 2024
Merged
Remove secret file existence check in Validate for headers#687roidelapluie merged 2 commits intoprometheus:mainfrom
roidelapluie merged 2 commits intoprometheus:mainfrom
Conversation
This commit removes the check for the existence of the secret file for headers in the `Validate` function. The check is not valid for relative paths since `Validate` is called before `SetDirectory`, which is responsible for setting up the environment. This change aligns with the handling of other secret files, which are not checked during config validation. Signed-off-by: Julien <roidelapluie@o11y.eu>
957e515 to
d64a747
Compare
Signed-off-by: Julien <roidelapluie@o11y.eu>
Member
Author
|
Added a second commit to align SetDirectory to other configs. |
SuperQ
approved these changes
Sep 3, 2024
codeboten
referenced
this pull request
in open-telemetry/opentelemetry-collector
Sep 10, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/common](https://redirect.github.com/prometheus/common) | `v0.57.0` -> `v0.59.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>prometheus/common (github.com/prometheus/common)</summary> ### [`v0.59.1`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.1) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.59.0...v0.59.1) #### What's Changed - fix(utf8): Fix multiple metric name inside braces validation by [@​fedetorres93](https://redirect.github.com/fedetorres93) in [https://github.com/prometheus/common/pull/691](https://redirect.github.com/prometheus/common/pull/691) **Full Changelog**: prometheus/common@v0.59.0...v0.59.1 ### [`v0.59.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.58.0...v0.59.0) #### What's Changed - expfmt: Add WithEscapingScheme to help construct Formats by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/688](https://redirect.github.com/prometheus/common/pull/688) - Change the default escape method to UnderscoreEscaping by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/690](https://redirect.github.com/prometheus/common/pull/690) **Full Changelog**: prometheus/common@v0.58.0...v0.59.0 ### [`v0.58.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.58.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.57.0...v0.58.0) #### What's Changed - docs: mention new promslog package in package list in README by [@​tjhop](https://redirect.github.com/tjhop) in [https://github.com/prometheus/common/pull/683](https://redirect.github.com/prometheus/common/pull/683) - Bump golang.org/x/oauth2 from 0.21.0 to 0.22.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/684](https://redirect.github.com/prometheus/common/pull/684) - Bump golang.org/x/net from 0.27.0 to 0.28.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/685](https://redirect.github.com/prometheus/common/pull/685) - Remove secret file existence check in Validate for headers by [@​roidelapluie](https://redirect.github.com/roidelapluie) in [https://github.com/prometheus/common/pull/687](https://redirect.github.com/prometheus/common/pull/687) **Full Changelog**: prometheus/common@v0.57.0...v0.58.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
mx-psi
referenced
this pull request
in open-telemetry/opentelemetry-collector-contrib
Sep 11, 2024
) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/common](https://redirect.github.com/prometheus/common) | `v0.57.0` -> `v0.59.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>prometheus/common (github.com/prometheus/common)</summary> ### [`v0.59.1`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.1) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.59.0...v0.59.1) #### What's Changed - fix(utf8): Fix multiple metric name inside braces validation by [@​fedetorres93](https://redirect.github.com/fedetorres93) in [https://github.com/prometheus/common/pull/691](https://redirect.github.com/prometheus/common/pull/691) **Full Changelog**: prometheus/common@v0.59.0...v0.59.1 ### [`v0.59.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.58.0...v0.59.0) #### What's Changed - expfmt: Add WithEscapingScheme to help construct Formats by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/688](https://redirect.github.com/prometheus/common/pull/688) - Change the default escape method to UnderscoreEscaping by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/690](https://redirect.github.com/prometheus/common/pull/690) **Full Changelog**: prometheus/common@v0.58.0...v0.59.0 ### [`v0.58.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.58.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.57.0...v0.58.0) #### What's Changed - docs: mention new promslog package in package list in README by [@​tjhop](https://redirect.github.com/tjhop) in [https://github.com/prometheus/common/pull/683](https://redirect.github.com/prometheus/common/pull/683) - Bump golang.org/x/oauth2 from 0.21.0 to 0.22.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/684](https://redirect.github.com/prometheus/common/pull/684) - Bump golang.org/x/net from 0.27.0 to 0.28.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/685](https://redirect.github.com/prometheus/common/pull/685) - Remove secret file existence check in Validate for headers by [@​roidelapluie](https://redirect.github.com/roidelapluie) in [https://github.com/prometheus/common/pull/687](https://redirect.github.com/prometheus/common/pull/687) **Full Changelog**: prometheus/common@v0.57.0...v0.58.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit removes the check for the existence of the secret file for headers in the
Validatefunction. The check is not valid for relative paths sinceValidateis called beforeSetDirectory, which is responsible for setting up the environment. This change aligns with the handling of other secret files, which are not checked during config validation.