luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity
open-consul/agent/config/runtime_oss_test.go

22 lines
1000 B
Go
Raw Normal View History

Sync of OSS changes to support namespaces (#6909)
2019-12-10 02:26:41 +00:00
// +build !consulent
package config
config: Use golden for TestRuntimeConfig_Sanitize A golden file makes the expected value easier to work with. This change also removes a number of shims for enterprise and replaces them with a single one for the golden filename.
2020-12-21 17:36:38 +00:00
var testRuntimeConfigSanitizeExpectedFilename = "TestRuntimeConfig_Sanitize.golden"
OSS changes to allow for parsing the enterprise DNS config prop… (#6959)
2019-12-18 15:16:35 +00:00
token: OSS support for enterprise tokens
2020-08-27 17:15:10 +00:00
func entFullRuntimeConfig(rt *RuntimeConfig) {}
Update enterprise configurations to be in OSS This will emit warnings about the configs not doing anything but still allow them to be parsed. This also added the warnings for enterprise fields that we already had in OSS but didn’t change their enforcement behavior. For example, attempting to use a network segment will cause a hard error in OSS.
2020-04-28 13:45:33 +00:00
config: Use config fields to warn about enterprise settings It is no safe to assumes that the mapstructure keys will contain all the keys because some config can be specified with command line flags or literals. This change allows us to remove the json marshal/unmarshal cycle for command line flags, which will allow us to remove all of the hcl/json struct tags on config fields.
2020-11-20 22:43:32 +00:00
var enterpriseReadReplicaWarnings = []string{enterpriseConfigKeyError{key: "read_replica (or the deprecated non_voting_server)"}.Error()}
var enterpriseConfigKeyWarnings = []string{
Add OSS bits for supporting specifying the enterprise license via config
2021-05-10 14:10:39 +00:00
enterpriseConfigKeyError{key: "license_path"}.Error(),
config: Use config fields to warn about enterprise settings It is no safe to assumes that the mapstructure keys will contain all the keys because some config can be specified with command line flags or literals. This change allows us to remove the json marshal/unmarshal cycle for command line flags, which will allow us to remove all of the hcl/json struct tags on config fields.
2020-11-20 22:43:32 +00:00
enterpriseConfigKeyError{key: "read_replica (or the deprecated non_voting_server)"}.Error(),
enterpriseConfigKeyError{key: "autopilot.redundancy_zone_tag"}.Error(),
enterpriseConfigKeyError{key: "autopilot.upgrade_version_tag"}.Error(),
enterpriseConfigKeyError{key: "autopilot.disable_upgrade_migration"}.Error(),
enterpriseConfigKeyError{key: "dns_config.prefer_namespace"}.Error(),
enterpriseConfigKeyError{key: "acl.msp_disable_bootstrap"}.Error(),
enterpriseConfigKeyError{key: "acl.tokens.managed_service_provider"}.Error(),
enterpriseConfigKeyError{key: "audit"}.Error(),
Update enterprise configurations to be in OSS This will emit warnings about the configs not doing anything but still allow them to be parsed. This also added the warnings for enterprise fields that we already had in OSS but didn’t change their enforcement behavior. For example, attempting to use a network segment will cause a hard error in OSS.
2020-04-28 13:45:33 +00:00
}