github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add an internal env var for managed cluster config in the ui (#12796)

pull/12806/head
Kyle Havlovitz 2022-04-15 09:55:52 -07:00 committed by GitHub
parent 78c346cbb3
commit e162db7ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/config/builder.go
View File

@ -1827,6 +1827,7 @@ func (b *builder) uiConfigVal(v RawUIConfig) UIConfig {
MetricsProviderOptionsJSON: stringVal(v.MetricsProviderOptionsJSON), MetricsProviderOptionsJSON: stringVal(v.MetricsProviderOptionsJSON),
MetricsProxy: b.uiMetricsProxyVal(v.MetricsProxy), MetricsProxy: b.uiMetricsProxyVal(v.MetricsProxy),
DashboardURLTemplates: v.DashboardURLTemplates, DashboardURLTemplates: v.DashboardURLTemplates,
HCPEnabled: os.Getenv("CONSUL_HCP_ENABLED") == "true",
} }
} }

1
agent/config/runtime.go
View File

@ -1433,6 +1433,7 @@ type UIConfig struct {
MetricsProviderOptionsJSON string MetricsProviderOptionsJSON string
MetricsProxy UIMetricsProxy MetricsProxy UIMetricsProxy
DashboardURLTemplates map[string]string DashboardURLTemplates map[string]string
HCPEnabled bool
} }
type UIMetricsProxy struct { type UIMetricsProxy struct {

1
agent/config/testdata/TestRuntimeConfig_Sanitize.golden vendored
View File

@ -438,6 +438,7 @@
"DashboardURLTemplates": {}, "DashboardURLTemplates": {},
"Dir": "", "Dir": "",
"Enabled": false, "Enabled": false,
"HCPEnabled": false,
"MetricsProvider": "", "MetricsProvider": "",
"MetricsProviderFiles": [], "MetricsProviderFiles": [],
"MetricsProviderOptionsJSON": "", "MetricsProviderOptionsJSON": "",

1
agent/uiserver/ui_template_data.go
View File

@ -19,6 +19,7 @@ func uiTemplateDataFromConfig(cfg *config.RuntimeConfig) (map[string]interface{}
// browser. // browser.
"metrics_proxy_enabled": cfg.UIConfig.MetricsProxy.BaseURL != "", "metrics_proxy_enabled": cfg.UIConfig.MetricsProxy.BaseURL != "",
"dashboard_url_templates": cfg.UIConfig.DashboardURLTemplates, "dashboard_url_templates": cfg.UIConfig.DashboardURLTemplates,
"hcp_enabled": cfg.UIConfig.HCPEnabled,
} }
// Only set this if there is some actual JSON or we'll cause a JSON // Only set this if there is some actual JSON or we'll cause a JSON

31
agent/uiserver/uiserver_test.go
View File

@ -43,6 +43,7 @@ func TestUIServerIndex(t *testing.T) {
"PrimaryDatacenter": "dc1", "PrimaryDatacenter": "dc1",
"ContentPath": "/ui/", "ContentPath": "/ui/",
"UIConfig": { "UIConfig": {
"hcp_enabled": false,
"metrics_provider": "", "metrics_provider": "",
"metrics_proxy_enabled": false, "metrics_proxy_enabled": false,
"dashboard_url_templates": null "dashboard_url_templates": null
@ -76,6 +77,7 @@ func TestUIServerIndex(t *testing.T) {
"PrimaryDatacenter": "dc1", "PrimaryDatacenter": "dc1",
"ContentPath": "/ui/", "ContentPath": "/ui/",
"UIConfig": { "UIConfig": {
"hcp_enabled": false,
"metrics_provider": "foo", "metrics_provider": "foo",
"metrics_provider_options": { "metrics_provider_options": {
"a-very-unlikely-string":1 "a-very-unlikely-string":1
@ -97,6 +99,26 @@ func TestUIServerIndex(t *testing.T) {
"PrimaryDatacenter": "dc1", "PrimaryDatacenter": "dc1",
"ContentPath": "/ui/", "ContentPath": "/ui/",
"UIConfig": { "UIConfig": {
"hcp_enabled": false,
"metrics_provider": "",
"metrics_proxy_enabled": false,
"dashboard_url_templates": null
}
}`,
},
{
name: "hcp enabled",
cfg: basicUIEnabledConfig(withHCPEnabled()),
path: "/",
wantStatus: http.StatusOK,
wantContains: []string{"<!-- CONSUL_VERSION:"},
wantUICfgJSON: `{
"ACLsEnabled": false,
"LocalDatacenter": "dc1",
"PrimaryDatacenter": "dc1",
"ContentPath": "/ui/",
"UIConfig": {
"hcp_enabled": true,
"metrics_provider": "", "metrics_provider": "",
"metrics_proxy_enabled": false, "metrics_proxy_enabled": false,
"dashboard_url_templates": null "dashboard_url_templates": null
@ -126,6 +148,7 @@ func TestUIServerIndex(t *testing.T) {
"PrimaryDatacenter": "dc1", "PrimaryDatacenter": "dc1",
"ContentPath": "/ui/", "ContentPath": "/ui/",
"UIConfig": { "UIConfig": {
"hcp_enabled": false,
"metrics_provider": "bar", "metrics_provider": "bar",
"metrics_proxy_enabled": false, "metrics_proxy_enabled": false,
"dashboard_url_templates": null "dashboard_url_templates": null
@ -255,6 +278,12 @@ func withMetricsProviderOptions(jsonStr string) cfgFunc {
} }
} }
func withHCPEnabled() cfgFunc {
return func(cfg *config.RuntimeConfig) {
cfg.UIConfig.HCPEnabled = true
}
}
// TestMultipleIndexRequests validates that the buffered file mechanism works // TestMultipleIndexRequests validates that the buffered file mechanism works
// beyond the first request. The initial implementation did not as it shared an // beyond the first request. The initial implementation did not as it shared an
// bytes.Reader between callers. // bytes.Reader between callers.
@ -388,6 +417,7 @@ func TestHandler_ServeHTTP_TransformIsEvaluatedOnEachRequest(t *testing.T) {
"PrimaryDatacenter": "dc1", "PrimaryDatacenter": "dc1",
"ContentPath": "/ui/", "ContentPath": "/ui/",
"UIConfig": { "UIConfig": {
"hcp_enabled": false,
"metrics_provider": "", "metrics_provider": "",
"metrics_proxy_enabled": false, "metrics_proxy_enabled": false,
"dashboard_url_templates": null "dashboard_url_templates": null
@ -411,6 +441,7 @@ func TestHandler_ServeHTTP_TransformIsEvaluatedOnEachRequest(t *testing.T) {
"PrimaryDatacenter": "dc1", "PrimaryDatacenter": "dc1",
"ContentPath": "/ui/", "ContentPath": "/ui/",
"UIConfig": { "UIConfig": {
"hcp_enabled": false,
"metrics_provider": "", "metrics_provider": "",
"metrics_proxy_enabled": false, "metrics_proxy_enabled": false,
"dashboard_url_templates": null "dashboard_url_templates": null