fix version reporting

Author: aphralG

src/core/config/config.go

@@ -16,8 +16,6 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
-	"reflect"
-	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -56,7 +54,7 @@ var (
 
 func SetVersion(version, commit string) {
 	ROOT_COMMAND.Version = version + "-" + commit
-	Viper.SetDefault(VersionKey, version)
+	Viper.Set(VersionKey, version)
 }
 
 func Execute() error {
@@ -256,7 +254,6 @@ func UpdateAgentConfig(systemId string, updateTags []string, updateFeatures []st
 		log.Errorf("Failed to register config: %v", err)
 		return false, err
 	}
-
 	// Update nil valued updateTags to empty slice for comparison
 	if updateTags == nil {
 		updateTags = []string{}
@@ -266,33 +263,12 @@ func UpdateAgentConfig(systemId string, updateTags []string, updateFeatures []st
 		updateFeatures = []string{}
 	}
 
-	// Sort tags and compare them
-	sort.Strings(updateTags)
-	sort.Strings(config.Tags)
-	synchronizedTags := reflect.DeepEqual(updateTags, config.Tags)
-
 	Viper.Set(TagsKey, updateTags)
 	config.Tags = Viper.GetStringSlice(TagsKey)
 
-	// Needed for legacy reasons.
-	// Remove Features_ prefix from the feature strings.
-	// This is needed for management servers that are sending features before sdk version v2.23.0
-	for index, feature := range updateFeatures {
-		updateFeatures[index] = strings.Replace(feature, "features_", "", 1)
-	}
-	sort.Strings(updateFeatures)
-	sort.Strings(config.Features)
-	synchronizedFeatures := reflect.DeepEqual(updateFeatures, config.Features)
-
 	Viper.Set(agent_config.FeaturesKey, updateFeatures)
 	config.Features = Viper.GetStringSlice(agent_config.FeaturesKey)
 
-	// If the features are already synchronized there is no need to overwrite
-	if synchronizedTags && synchronizedFeatures {
-		log.Debug("Manager and Local tags and features are already synchronized")
-		return false, nil
-	}
-
 	// Get the dynamic config path and use default dynamic config path if it's not
 	// already set.
 	dynamicCfgPath := Viper.GetString(DynamicConfigPathKey)

src/core/config/config_test.go

@@ -417,7 +417,7 @@ func TestUpdateAgentConfig(t *testing.T) {
 			updatedConfFeatures: curConf.Features,
 			expConfTags:         curConf.Tags,
 			expConfFeatures:     curConf.Features,
-			updatedConf:         false,
+			updatedConf:         true,
 		},
 		{
 			testName:            "UpdatedTags",
@@ -458,7 +458,7 @@ func TestUpdateAgentConfig(t *testing.T) {
 			// Attempt update & check results
 			updated, err := UpdateAgentConfig("12345", tc.updatedConfTags, tc.updatedConfFeatures)
 			assert.NoError(t, err)
-			assert.Equal(t, updated, tc.updatedConf)
+			assert.Equal(t, tc.updatedConf, updated)
 
 			// Get potentially updated config
 			updatedConf, err := GetConfig("12345")

src/plugins/config_reader.go

@@ -100,7 +100,6 @@ func (r *ConfigReader) updateAgentConfig(payloadAgentConfig *proto.AgentConfig)
 		}
 
 		synchronizeFeatures := false
-		synchronizeTags := false
 
 		if payloadAgentConfig.Details.Features != nil {
 			r.detailsMu.Lock()
@@ -128,20 +127,14 @@ func (r *ConfigReader) updateAgentConfig(payloadAgentConfig *proto.AgentConfig)
 			r.detailsMu.Unlock()
 		}
 
-		sort.Strings(onDiskAgentConfig.Tags)
-		sort.Strings(payloadAgentConfig.Details.Tags)
-		synchronizeTags = !reflect.DeepEqual(payloadAgentConfig.Details.Tags, onDiskAgentConfig.Tags)
-
-		if synchronizeFeatures || synchronizeTags {
-			tags := payloadAgentConfig.Details.Tags
-			features := payloadAgentConfig.Details.Features
-			configUpdated, err := config.UpdateAgentConfig(r.config.ClientID, tags, features)
-			if err != nil {
-				log.Errorf("Failed updating Agent config - %v", err)
-			}
-			if configUpdated {
-				log.Debugf("Updated agent config on disk")
-			}
+		tags := payloadAgentConfig.Details.Tags
+		features := payloadAgentConfig.Details.Features
+		configUpdated, err := config.UpdateAgentConfig(r.config.ClientID, tags, features)
+		if err != nil {
+			log.Errorf("Failed updating Agent config - %v", err)
+		}
+		if configUpdated {
+			log.Debugf("Updated agent config on disk")
 		}
 
 		if payloadAgentConfig.Details.Extensions != nil {