option to override hub url template. for testers only. (#2785)
This commit is contained in:
parent
532e97e00f
commit
91b0fce955
|
@ -56,3 +56,7 @@ func HubBranch(cfg *csconfig.Config) string {
|
||||||
|
|
||||||
return branch
|
return branch
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func HubURLTemplate(cfg *csconfig.Config) string {
|
||||||
|
return cfg.Cscli.HubURLTemplate
|
||||||
|
}
|
||||||
|
|
|
@ -66,10 +66,10 @@ func Notifications(c *csconfig.Config) error {
|
||||||
func RemoteHub(c *csconfig.Config) *cwhub.RemoteHubCfg {
|
func RemoteHub(c *csconfig.Config) *cwhub.RemoteHubCfg {
|
||||||
// set branch in config, and log if necessary
|
// set branch in config, and log if necessary
|
||||||
branch := HubBranch(c)
|
branch := HubBranch(c)
|
||||||
|
urlTemplate := HubURLTemplate(c)
|
||||||
remote := &cwhub.RemoteHubCfg{
|
remote := &cwhub.RemoteHubCfg{
|
||||||
Branch: branch,
|
Branch: branch,
|
||||||
URLTemplate: "https://hub-cdn.crowdsec.net/%s/%s",
|
URLTemplate: urlTemplate,
|
||||||
// URLTemplate: "http://localhost:8000/crowdsecurity/%s/hub/%s",
|
|
||||||
IndexPath: ".index.json",
|
IndexPath: ".index.json",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@ type CscliCfg struct {
|
||||||
Output string `yaml:"output,omitempty"`
|
Output string `yaml:"output,omitempty"`
|
||||||
Color string `yaml:"color,omitempty"`
|
Color string `yaml:"color,omitempty"`
|
||||||
HubBranch string `yaml:"hub_branch"`
|
HubBranch string `yaml:"hub_branch"`
|
||||||
|
HubURLTemplate string `yaml:"__hub_url_template__,omitempty"`
|
||||||
SimulationConfig *SimulationConfig `yaml:"-"`
|
SimulationConfig *SimulationConfig `yaml:"-"`
|
||||||
DbConfig *DatabaseCfg `yaml:"-"`
|
DbConfig *DatabaseCfg `yaml:"-"`
|
||||||
|
|
||||||
|
@ -16,6 +17,8 @@ type CscliCfg struct {
|
||||||
PrometheusUrl string `yaml:"prometheus_uri"`
|
PrometheusUrl string `yaml:"prometheus_uri"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const defaultHubURLTemplate = "https://hub-cdn.crowdsec.net/%s/%s"
|
||||||
|
|
||||||
func (c *Config) loadCSCLI() error {
|
func (c *Config) loadCSCLI() error {
|
||||||
if c.Cscli == nil {
|
if c.Cscli == nil {
|
||||||
c.Cscli = &CscliCfg{}
|
c.Cscli = &CscliCfg{}
|
||||||
|
@ -25,5 +28,9 @@ func (c *Config) loadCSCLI() error {
|
||||||
c.Cscli.PrometheusUrl = fmt.Sprintf("http://%s:%d/metrics", c.Prometheus.ListenAddr, c.Prometheus.ListenPort)
|
c.Cscli.PrometheusUrl = fmt.Sprintf("http://%s:%d/metrics", c.Prometheus.ListenAddr, c.Prometheus.ListenPort)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if c.Cscli.HubURLTemplate == "" {
|
||||||
|
c.Cscli.HubURLTemplate = defaultHubURLTemplate
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,7 @@ func TestLoadCSCLI(t *testing.T) {
|
||||||
},
|
},
|
||||||
expected: &CscliCfg{
|
expected: &CscliCfg{
|
||||||
PrometheusUrl: "http://127.0.0.1:6060/metrics",
|
PrometheusUrl: "http://127.0.0.1:6060/metrics",
|
||||||
|
HubURLTemplate: defaultHubURLTemplate,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue