Fix advanced settings Camel case json. and fix proxy_server from `pro…

…xy_version`
octarinesec · Jan 15, 2024 · 97f8ebe · 97f8ebe
1 parent 2644635
commit 97f8ebe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cbcontainers/models/remote_configuration_changes.go b/cbcontainers/models/remote_configuration_changes.go
@@ -9,15 +9,15 @@ var (
 )
 
 type AdvancedSettings struct {
-	ProxyVersion   *string `json:"proxy_version,omitempty"`
+	ProxyServer    *string `json:"proxy_server,omitempty"`
 	RegistryServer *string `json:"registry_server,omitempty"`
 }
 
 type ConfigurationChange struct {
 	ID               string             `json:"id"`
 	Status           RemoteChangeStatus `json:"status"`
 	AgentVersion     *string            `json:"agent_version"`
-	AdvancedSettings *AdvancedSettings  `json:"advancedSettings,omitempty"`
+	AdvancedSettings *AdvancedSettings  `json:"advanced_settings,omitempty"`
 	Timestamp        string             `json:"timestamp"`
 }
 

diff --git a/cbcontainers/remote_configuration/change_applier.go b/cbcontainers/remote_configuration/change_applier.go
@@ -88,8 +88,8 @@ func applyAdvancedSettings(settings *models.AdvancedSettings, cr *cbcontainersv1
 	if settings.RegistryServer != nil {
 		cr.Spec.Components.Settings.DefaultImagesRegistry = *settings.RegistryServer
 	}
-	if settings.ProxyVersion != nil {
-		cr.Spec.Components.Settings.Proxy.HttpsProxy = settings.ProxyVersion
-		cr.Spec.Components.Settings.Proxy.HttpProxy = settings.ProxyVersion
+	if settings.ProxyServer != nil {
+		cr.Spec.Components.Settings.Proxy.HttpsProxy = settings.ProxyServer
+		cr.Spec.Components.Settings.Proxy.HttpProxy = settings.ProxyServer
 	}
 }