Skip to content

confgenerator: omit semantic validation on user config #1081

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
Merged
merged 4 commits into from
Feb 3, 2023
Merged

confgenerator: omit semantic validation on user config #1081

merged 4 commits into from
Feb 3, 2023

Conversation

@ridwanmsharif
Copy link
Contributor

@ridwanmsharif ridwanmsharif commented Feb 3, 2023 •
edited by igorpeshansky
Loading

Description

The semantic validation should only happen on the merged config.

Related issue

http://b/267762522

How has this been tested?

Checklist:

  • Unit tests
    • Unit tests do not apply.
    • Unit tests have been added/modified and passed for this PR.
  • Integration tests
    • Integration tests do not apply.
    • Integration tests have been added/modified and passed for this PR.
  • Documentation
    • This PR introduces no user visible changes.
    • This PR introduces user visible changes and the corresponding documentation change has been made.
  • Minor version bump
    • This PR introduces no new features.
    • This PR introduces new features, and there is a separate PR to bump the minor version since the last release already.
    • This PR bumps the version.

igorpeshansky
igorpeshansky reviewed Feb 3, 2023
View reviewed changes
@ridwanmsharif ridwanmsharif force-pushed the ridwanmsharif/validation-hotfix branch 2 times, most recently from e10e141 to 07270ea Compare February 3, 2023 16:25
@ridwanmsharif
confgenerator: omit semantic validation on user config
0fb4e36 
Signed-off-by: Ridwan Sharif <ridwanmsharif@google.com>
@ridwanmsharif ridwanmsharif force-pushed the ridwanmsharif/validation-hotfix branch from 07270ea to 0fb4e36 Compare February 3, 2023 16:28
igorpeshansky
igorpeshansky reviewed Feb 3, 2023
View reviewed changes
confgenerator/confmerger.go Outdated

// Read the built-in config file.
original, err := builtInStruct.DeepCopy(platform)
template, err := builtInStruct.DeepCopy(platform)
Copy link
Contributor

@igorpeshansky igorpeshansky Feb 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Optional] I'd call this merged or result, FWIW. Eventually, we should probably turn mergeConfigs into a functional update (rather than in-place) and do the DeepCopy there.

Copy link
Contributor Author

@ridwanmsharif ridwanmsharif Feb 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Naming is hard :(

I like the suggestion. Will attempt something in another PR so this doesn't block the release

ridwanmsharif and others added 2 commits February 3, 2023 13:08
@ridwanmsharif @igorpeshansky
Update confgenerator/confmerger.go
4a345e2 
Co-authored-by: igorpeshansky <igorpeshansky@users.noreply.github.com>
@ridwanmsharif
confmeger: rename original to result
08ce564
igorpeshansky
igorpeshansky approved these changes Feb 3, 2023
View reviewed changes
Copy link
Contributor

@igorpeshansky igorpeshansky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :shipit:

@ridwanmsharif ridwanmsharif merged commit 6705187 into master Feb 3, 2023
@ridwanmsharif ridwanmsharif deleted the ridwanmsharif/validation-hotfix branch February 3, 2023 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@igorpeshansky igorpeshansky igorpeshansky approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ridwanmsharif @igorpeshansky