From a14efeaee4a0d5db8180cb1185ec71cc022e45ec Mon Sep 17 00:00:00 2001 From: "o.omahony" Date: Fri, 9 Sep 2022 18:34:51 +0100 Subject: [PATCH 1/5] features missing defaults --- src/core/config/defaults.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/config/defaults.go b/src/core/config/defaults.go index 2ecf4a2b56..9c9487b7bc 100644 --- a/src/core/config/defaults.go +++ b/src/core/config/defaults.go @@ -250,6 +250,7 @@ var ( &StringSliceFlag{ Name: FeaturesKey, Usage: "A comma-separated list of features enabled for the agent.", + DefaultValue: Defaults.Features, }, // NGINX Config &StringFlag{ From 34fc56b8bc2ee93cff94631a9bf10254b5a82e6b Mon Sep 17 00:00:00 2001 From: "o.omahony" Date: Fri, 9 Sep 2022 18:36:24 +0100 Subject: [PATCH 2/5] deps --- .../vendor/github.com/nginx/agent/v2/src/core/config/defaults.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go index 2ecf4a2b56..9c9487b7bc 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go @@ -250,6 +250,7 @@ var ( &StringSliceFlag{ Name: FeaturesKey, Usage: "A comma-separated list of features enabled for the agent.", + DefaultValue: Defaults.Features, }, // NGINX Config &StringFlag{ From efaaeecf476950aaa8a1eed478d99c40bbf2f18a Mon Sep 17 00:00:00 2001 From: "o.omahony" Date: Fri, 9 Sep 2022 18:38:51 +0100 Subject: [PATCH 3/5] debug statement --- main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index fb47fb1bcb..fafd526638 100644 --- a/main.go +++ b/main.go @@ -65,8 +65,8 @@ func main() { log.Infof("setting displayName to %s", loadedConfig.DisplayName) } - log.Infof("NGINX Agent %s at %s with pid %d, clientID=%s name=%s", - version, commit, os.Getpid(), loadedConfig.ClientID, loadedConfig.DisplayName) + log.Infof("NGINX Agent %s at %s with pid %d, clientID=%s name=%s features=%v", + version, commit, os.Getpid(), loadedConfig.ClientID, loadedConfig.DisplayName, loadedConfig.Features) sdkGRPC.InitMeta(loadedConfig.ClientID, loadedConfig.CloudAccountID) controller, commander, reporter := createGrpcClients(ctx, loadedConfig) From b1f4d72073f0b082e916c671e48e969a833a5277 Mon Sep 17 00:00:00 2001 From: "o.omahony" Date: Fri, 9 Sep 2022 18:51:21 +0100 Subject: [PATCH 4/5] fixed test --- src/plugins/metrics_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/metrics_test.go b/src/plugins/metrics_test.go index 2595125488..f4ce17d359 100644 --- a/src/plugins/metrics_test.go +++ b/src/plugins/metrics_test.go @@ -211,6 +211,7 @@ func TestMetrics_Process_AgentConfigChanged(t *testing.T) { CollectionInterval: 10, Mode: "streaming", }, + Features: config.Defaults.Features, }, expUpdatedConfig: &config.Config{ ClientID: "12345", @@ -221,6 +222,7 @@ func TestMetrics_Process_AgentConfigChanged(t *testing.T) { CollectionInterval: 10, Mode: "aggregated", }, + Features: config.Defaults.Features, }, updatedTags: false, }, From 2c3d020d6112978a17c967c6262a3c2e8a6e4d53 Mon Sep 17 00:00:00 2001 From: "o.omahony" Date: Fri, 9 Sep 2022 18:56:42 +0100 Subject: [PATCH 5/5] fixed more tests --- src/plugins/dataplane_status_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/dataplane_status_test.go b/src/plugins/dataplane_status_test.go index 05578ae5ef..35fa2e88db 100644 --- a/src/plugins/dataplane_status_test.go +++ b/src/plugins/dataplane_status_test.go @@ -96,9 +96,11 @@ func TestDPSSyncAgentConfigChange(t *testing.T) { testName: "ValuesToUpdate", config: &config.Config{ Tags: tutils.InitialConfTags, + Features: config.Defaults.Features, }, expUpdatedConfig: &config.Config{ Tags: updateTags, + Features: config.Defaults.Features, }, updatedTags: true, }, @@ -106,9 +108,11 @@ func TestDPSSyncAgentConfigChange(t *testing.T) { testName: "NoValuesToUpdate", config: &config.Config{ Tags: tutils.InitialConfTags, + Features: config.Defaults.Features, }, expUpdatedConfig: &config.Config{ Tags: tutils.InitialConfTags, + Features: config.Defaults.Features, }, updatedTags: false, },