From 9a95fa364c1defad7867a3c8aa7e4474e3ca3e6a Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Fri, 3 Mar 2023 17:32:19 +0300 Subject: [PATCH] :zap: Change `consts` config field to `env` --- cmd/tapRunner.go | 2 +- config/configStructs/scriptingConfig.go | 2 +- internal/connect/hub.go | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/tapRunner.go b/cmd/tapRunner.go index 06f680dd4..86994f997 100644 --- a/cmd/tapRunner.go +++ b/cmd/tapRunner.go @@ -448,7 +448,7 @@ func postHubStarted(ctx context.Context, kubernetesProvider *kubernetes.Provider } // Scripting - connector.PostConsts(config.Config.Scripting.Consts) + connector.PostEnv(config.Config.Scripting.Env) scripts, err := config.Config.Scripting.GetScripts() if err != nil { diff --git a/config/configStructs/scriptingConfig.go b/config/configStructs/scriptingConfig.go index 34b0021b4..249de74a9 100644 --- a/config/configStructs/scriptingConfig.go +++ b/config/configStructs/scriptingConfig.go @@ -10,7 +10,7 @@ import ( ) type ScriptingConfig struct { - Consts map[string]interface{} `yaml:"consts"` + Env map[string]interface{} `yaml:"env"` Source string `yaml:"source" default:""` } diff --git a/internal/connect/hub.go b/internal/connect/hub.go index 976c776ea..abd9fd1b1 100644 --- a/internal/connect/hub.go +++ b/internal/connect/hub.go @@ -181,27 +181,27 @@ func (connector *Connector) PostLicense(license string) { } } -func (connector *Connector) PostConsts(consts map[string]interface{}) { - if len(consts) == 0 { +func (connector *Connector) PostEnv(env map[string]interface{}) { + if len(env) == 0 { return } - postConstsUrl := fmt.Sprintf("%s/scripts/consts", connector.url) + postEnvUrl := fmt.Sprintf("%s/scripts/env", connector.url) - if constsMarshalled, err := json.Marshal(consts); err != nil { - log.Error().Err(err).Msg("Failed to marshal the consts:") + if envMarshalled, err := json.Marshal(env); err != nil { + log.Error().Err(err).Msg("Failed to marshal the env:") } else { ok := false for !ok { var resp *http.Response - if resp, err = utils.Post(postConstsUrl, "application/json", bytes.NewBuffer(constsMarshalled), connector.client); err != nil || resp.StatusCode != http.StatusOK { + if resp, err = utils.Post(postEnvUrl, "application/json", bytes.NewBuffer(envMarshalled), connector.client); err != nil || resp.StatusCode != http.StatusOK { if _, ok := err.(*url.Error); ok { break } log.Warn().Err(err).Msg("Failed sending the constants to Hub:") } else { ok = true - log.Info().Interface("consts", consts).Msg("Reported constants to Hub:") + log.Info().Interface("env", env).Msg("Reported constants to Hub:") } time.Sleep(DefaultSleep) }