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.

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

T6605: restore configd error formatting to be consistent with CLI #3868

Merged
merged 1 commit into from
Jul 25, 2024

Conversation

jestabro
Copy link
Contributor

Change Summary

Restore formatting of ConfigError under configd to be consistent with running with no configd support. The formatting was extended in T6559 to report a clearer distinction between configdep script errors and originating script errors, but the change can confuse consistent parsing of errors. Note that this was and remains only a difference in formatting; errors are correctly triggered by configd, both historically and following the fix in T6559.

The only discrepancy in formatting under configd, persistent since its introduction in 1.3, is the lack of the initial path statement, redundant as repeated below the commit error. The example below is the behavior since 1.3, and restored by this PR.

With configd:

vyos@vyos# set interfaces vxlan vxlan1 description 'this is strange'
[edit]
vyos@vyos# commit

Group, remote, source-address or source-interface must be configured

[[interfaces vxlan vxlan1]] failed
Commit failed
[edit]

Without configd:

vyos@vyos# set interfaces vxlan vxlan1 description 'this is strange'
[edit]
vyos@vyos# commit
[ interfaces vxlan vxlan1 ]
Group, remote, source-address or source-interface must be configured

[[interfaces vxlan vxlan1]] failed
Commit failed
[edit]

Any other desired formatting changes can be provided under this or a separate task. This PR simply restores the previous formatting consistency.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

Proposed changes

How to test

Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@jestabro jestabro self-assigned this Jul 24, 2024
@jestabro jestabro requested a review from a team as a code owner July 24, 2024 16:26
Copy link

👍
No issues in PR Title / Commit Title

Copy link

👍
No issues in unused-imports

Copy link

CI integration ❌ failed!

Details

CI logs

  • CLI Smoketests ❌ failed
  • Config tests 👍 passed
  • RAID1 tests 👍 passed

@sever-sever sever-sever merged commit 645f249 into vyos:current Jul 25, 2024
13 of 14 checks passed
@jestabro
Copy link
Contributor Author

@Mergifyio backport circinus sagitta

Copy link
Contributor

mergify bot commented Jul 25, 2024

backport circinus sagitta

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 25, 2024
mergify bot pushed a commit that referenced this pull request Jul 25, 2024
c-po added a commit that referenced this pull request Jul 26, 2024
T6605: restore configd error formatting to be consistent with CLI (backport #3868)
sever-sever pushed a commit that referenced this pull request Jul 28, 2024
) (#3878)

(cherry picked from commit 645f249)

Co-authored-by: John Estabrook <jestabro@vyos.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants