From f92a3539695d1537629aa27f0617f06469dc9814 Mon Sep 17 00:00:00 2001 From: Xabier Arbulu Insausti Date: Wed, 27 Apr 2022 18:13:40 +0200 Subject: [PATCH] Remove interval flag (#44) --- cmd/config.go | 3 --- cmd/config_test.go | 4 ---- cmd/runner.go | 2 -- runner/app.go | 1 - test/fixtures/config/runner.yaml | 1 - 5 files changed, 11 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index a42a238..5e8f865 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -1,8 +1,6 @@ package cmd import ( - "time" - "github.com/spf13/viper" "github.com/trento-project/runner/runner" ) @@ -12,7 +10,6 @@ func LoadConfig() *runner.Config { Host: viper.GetString("host"), Port: viper.GetInt("port"), CallbacksUrl: viper.GetString("callbacks-url"), - Interval: time.Duration(viper.GetInt("interval")) * time.Minute, AnsibleFolder: viper.GetString("ansible-folder"), } } diff --git a/cmd/config_test.go b/cmd/config_test.go index 3e1bab4..e4e70f1 100644 --- a/cmd/config_test.go +++ b/cmd/config_test.go @@ -4,7 +4,6 @@ import ( "bytes" "os" "testing" - "time" "github.com/spf13/cobra" "github.com/stretchr/testify/suite" @@ -49,7 +48,6 @@ func (suite *RunnerCmdTestSuite) TearDownTest() { Host: "localhost", Port: 5678, CallbacksUrl: "http://192.168.1.1:8000/api/runner/callbacks", - Interval: 1 * time.Minute, AnsibleFolder: "path/to/ansible", } config := LoadConfig() @@ -63,7 +61,6 @@ func (suite *RunnerCmdTestSuite) TestConfigFromFlags() { "--host=localhost", "--port=5678", "--callbacks-url=http://192.168.1.1:8000/api/runner/callbacks", - "--interval=1", "--ansible-folder=path/to/ansible", }) } @@ -72,7 +69,6 @@ func (suite *RunnerCmdTestSuite) TestConfigFromEnv() { os.Setenv("TRENTO_RUNNER_HOST", "localhost") os.Setenv("TRENTO_RUNNER_PORT", "5678") os.Setenv("TRENTO_RUNNER_CALLBACKS_URL", "http://192.168.1.1:8000/api/runner/callbacks") - os.Setenv("TRENTO_RUNNER_INTERVAL", "1") os.Setenv("TRENTO_RUNNER_ANSIBLE_FOLDER", "path/to/ansible") } diff --git a/cmd/runner.go b/cmd/runner.go index ce5fec1..138527d 100644 --- a/cmd/runner.go +++ b/cmd/runner.go @@ -55,7 +55,6 @@ func addStartCmd(runnerCmd *cobra.Command) { var host string var port int var callbacksUrl string - var interval int var ansibleFolder string startCmd := &cobra.Command{ @@ -68,7 +67,6 @@ func addStartCmd(runnerCmd *cobra.Command) { startCmd.Flags().IntVar(&port, "port", 8080, "Trento Runner API port") startCmd.Flags().StringVar(&callbacksUrl, "callbacks-url", "", "Trento web server runner callbacks API url") startCmd.MarkFlagRequired("callbacks-url") - startCmd.Flags().IntVarP(&interval, "interval", "i", 5, "Interval in minutes to run the checks") startCmd.Flags().StringVar(&ansibleFolder, "ansible-folder", "/tmp/trento", "Folder where the ansible file structure will be created") runnerCmd.AddCommand(startCmd) diff --git a/runner/app.go b/runner/app.go index 2cf8468..3ea0312 100644 --- a/runner/app.go +++ b/runner/app.go @@ -16,7 +16,6 @@ type Config struct { Host string Port int CallbacksUrl string - Interval time.Duration AnsibleFolder string } diff --git a/test/fixtures/config/runner.yaml b/test/fixtures/config/runner.yaml index 5dd5709..ab09add 100644 --- a/test/fixtures/config/runner.yaml +++ b/test/fixtures/config/runner.yaml @@ -1,5 +1,4 @@ host: localhost port: 5678 callbacks-url: http://192.168.1.1:8000/api/runner/callbacks -interval: 1 ansible-folder: path/to/ansible