DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Define a metadata subrouter

Browse source 
Define a metadata subrouter and move the token endpoint there. We may
end up needing multiple endpoints for various purposes in the future.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2022-12-02 19:48:32 +00:00
parent a078645ab2
commit 0869073906
19 changed files with 63 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config/config.go
View file

@ -173,8 +173,9 @@ type Default struct {
ConfigDir string `toml:"config_dir,omitempty" json:"config-dir,omitempty"`
// CallbackURL is the URL where the instances can send back status reports.
CallbackURL string `toml:"callback_url" json:"callback-url"`
// TokenURL is the URL where instances can fetch a github runner registration token.
TokenURL string `toml:"token_url" json:"token-url"`
// MetadataURL is the URL where instances can fetch information they may need
// to set themselves up.
MetadataURL string `toml:"metadata_url" json:"metadata-url"`
// LogFile is the location of the log file.
LogFile string `toml:"log_file,omitempty" json:"log-file"`
EnableLogStreamer bool `toml:"enable_log_streamer"`
@ -190,9 +191,9 @@ func (d *Default) Validate() error {
return errors.Wrap(err, "validating callback_url")
}
if d.TokenURL != "" {
if _, err := url.Parse(d.TokenURL); err != nil {
return errors.Wrap(err, "validating token_url")
if d.MetadataURL != "" {
if _, err := url.Parse(d.MetadataURL); err != nil {
return errors.Wrap(err, "validating metadata_url")
}
}