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

agent: ensure that we normalize bootstrapped config entries #8547

Merged
merged 2 commits into from
Aug 27, 2020

Conversation

rboyer
Copy link
Member

@rboyer rboyer commented Aug 21, 2020

In all other ways to commit config entries to the state store we Normalize() before invoking Validate() save for the bootstrap angle which this PR corrects.

@rboyer rboyer requested review from a team August 21, 2020 15:57
@rboyer rboyer self-assigned this Aug 21, 2020
}
]
}
}`},
hcl: []string{`
config_entries {
bootstrap {
kind = "proxy-defaults"
Copy link
Member Author

Choose a reason for hiding this comment

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

This test had to change because the Normalize method for proxy-defaults always forces the Name field to be global

@@ -3772,6 +3775,8 @@ func TestBuilder_BuildAndValide_ConfigFlagsAndEdgecases(t *testing.T) {
}
},
},
// TODO(rb): add in missing tests for ingress-gateway (snake + camel)
Copy link
Member Author

Choose a reason for hiding this comment

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

I noticed these, but adding them in is outside of the targeted scope of this particular fix.

Copy link
Contributor

@freddygv freddygv left a comment

Choose a reason for hiding this comment

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

Nice catch!

@rboyer rboyer merged commit d184345 into master Aug 27, 2020
@rboyer rboyer deleted the norm-config-entries-on-bootstrap branch August 27, 2020 16:37
@hashicorp-ci
Copy link
Contributor

🍒✅ Cherry pick of commit d184345 onto release/1.8.x succeeded!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants