Google Git
Sign in
cos/cos/policymanager/refs/heads/release-R105^!/.
commit
36158840dfef92a681ec51ecdaff41b708a36dd6
[log]
author
Nobel Barakat <nobelbarakat@google.com>
Fri Feb 17 21:45:41 2023 +0000
committer
Nobel Barakat <nobelbarakat@google.com>
Tue Feb 21 10:19:03 2023 -0800
tree
35b8904b0195d00a9d98db8effc49468789e61be
parent
01045afbda2113657147ff99460f532d2e6366c5 [diff]
policymanager: stop GetDefaultInstanceConfigFromBase from overriding fluent bit value

The function `GetDefaultInstanceConfigFromBase` in `manager.go` is overriding
the default value for fluent bit causing tests to fail. Adding a line to support
flunet-bit.

BUG=b/268738844
TEST=presubmit
RELEASE_NOTE=none

Change-Id: I4ac95d229833404f73d9107c61c7af23b5e41c9d

diff --git a/pkg/devicepolicy/manager.go b/pkg/devicepolicy/manager.go
index 1f5254f..f176773 100644
--- a/pkg/devicepolicy/manager.go
+++ b/pkg/devicepolicy/manager.go

@@ -158,9 +158,10 @@
 		MetricsEnabled: proto.Bool(false),
 		UpdateStrategy: proto.String(""),
 		HealthMonitorConfig: &pmpb.HealthMonitorConfig{
-			Enforced:          proto.Bool(false),
-			LoggingEnabled:    proto.Bool(false),
-			MonitoringEnabled: proto.Bool(false),
+			Enforced:                proto.Bool(false),
+			LoggingEnabled:          proto.Bool(false),
+			LoggingFluentBitEnabled: proto.Bool(false),
+			MonitoringEnabled:       proto.Bool(false),
 		},
 	}
 

diff --git a/pkg/devicepolicy/manager_test.go b/pkg/devicepolicy/manager_test.go
index cc38148..cb1f2b3 100644
--- a/pkg/devicepolicy/manager_test.go
+++ b/pkg/devicepolicy/manager_test.go

@@ -32,9 +32,10 @@
 	MetricsEnabled: proto.Bool(true),
 	UpdateStrategy: proto.String(""),
 	HealthMonitorConfig: &pb.HealthMonitorConfig{
-		Enforced:          proto.Bool(true),
-		LoggingEnabled:    proto.Bool(true),
-		MonitoringEnabled: proto.Bool(false),
+		Enforced:                proto.Bool(true),
+		LoggingEnabled:          proto.Bool(true),
+		LoggingFluentBitEnabled: proto.Bool(false),
+		MonitoringEnabled:       proto.Bool(false),
 	},
 }
 
@@ -499,9 +500,10 @@
 		MetricsEnabled: proto.Bool(false),
 		UpdateStrategy: proto.String(""),
 		HealthMonitorConfig: &pb.HealthMonitorConfig{
-			Enforced:          proto.Bool(true),
-			LoggingEnabled:    proto.Bool(true),
-			MonitoringEnabled: proto.Bool(false),
+			Enforced:                proto.Bool(true),
+			LoggingEnabled:          proto.Bool(true),
+			LoggingFluentBitEnabled: proto.Bool(false),
+			MonitoringEnabled:       proto.Bool(false),
 		},
 	}
 	expectedInstanceConfigBytes := generateFakePolicyBytes(t, expectedInstanceConfig)
@@ -539,9 +541,10 @@
 		MetricsEnabled: proto.Bool(false),
 		UpdateStrategy: proto.String(""),
 		HealthMonitorConfig: &pb.HealthMonitorConfig{
-			Enforced:          proto.Bool(false),
-			LoggingEnabled:    proto.Bool(false),
-			MonitoringEnabled: proto.Bool(false),
+			Enforced:                proto.Bool(false),
+			LoggingEnabled:          proto.Bool(false),
+			LoggingFluentBitEnabled: proto.Bool(false),
+			MonitoringEnabled:       proto.Bool(false),
 		},
 	}
 
@@ -571,9 +574,10 @@
 				MetricsEnabled: proto.Bool(true),
 				UpdateStrategy: proto.String(""),
 				HealthMonitorConfig: &pb.HealthMonitorConfig{
-					Enforced:          proto.Bool(false),
-					LoggingEnabled:    proto.Bool(false),
-					MonitoringEnabled: proto.Bool(false),
+					Enforced:                proto.Bool(false),
+					LoggingEnabled:          proto.Bool(false),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(false),
 				},
 			},
 		},
@@ -586,9 +590,10 @@
 				MetricsEnabled: proto.Bool(false),
 				UpdateStrategy: proto.String(""),
 				HealthMonitorConfig: &pb.HealthMonitorConfig{
-					Enforced:          proto.Bool(false),
-					LoggingEnabled:    proto.Bool(false),
-					MonitoringEnabled: proto.Bool(false),
+					Enforced:                proto.Bool(false),
+					LoggingEnabled:          proto.Bool(false),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(false),
 				},
 			},
 		},
@@ -602,9 +607,10 @@
 				MetricsEnabled: proto.Bool(true),
 				UpdateStrategy: proto.String(""),
 				HealthMonitorConfig: &pb.HealthMonitorConfig{
-					Enforced:          proto.Bool(false),
-					LoggingEnabled:    proto.Bool(false),
-					MonitoringEnabled: proto.Bool(false),
+					Enforced:                proto.Bool(false),
+					LoggingEnabled:          proto.Bool(false),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(false),
 				},
 			},
 		},
@@ -621,9 +627,31 @@
 				MetricsEnabled: proto.Bool(false),
 				UpdateStrategy: proto.String(""),
 				HealthMonitorConfig: &pb.HealthMonitorConfig{
-					Enforced:          proto.Bool(true),
-					LoggingEnabled:    proto.Bool(true),
-					MonitoringEnabled: proto.Bool(false),
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(false),
+				},
+			},
+		},
+		{
+			"BaseConfigEnablingLoggingFluentBitMissingMonitoring",
+			&pb.InstanceConfig{
+				UpdateStrategy: proto.String(""),
+				HealthMonitorConfig: &pb.HealthMonitorConfig{
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(true),
+				},
+			},
+			&pb.InstanceConfig{
+				MetricsEnabled: proto.Bool(false),
+				UpdateStrategy: proto.String(""),
+				HealthMonitorConfig: &pb.HealthMonitorConfig{
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(true),
+					MonitoringEnabled:       proto.Bool(false),
 				},
 			},
 		},
@@ -640,9 +668,10 @@
 				MetricsEnabled: proto.Bool(false),
 				UpdateStrategy: proto.String(""),
 				HealthMonitorConfig: &pb.HealthMonitorConfig{
-					Enforced:          proto.Bool(true),
-					LoggingEnabled:    proto.Bool(false),
-					MonitoringEnabled: proto.Bool(false),
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(false),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(false),
 				},
 			},
 		},
@@ -659,9 +688,52 @@
 				MetricsEnabled: proto.Bool(false),
 				UpdateStrategy: proto.String(""),
 				HealthMonitorConfig: &pb.HealthMonitorConfig{
-					Enforced:          proto.Bool(true),
-					LoggingEnabled:    proto.Bool(true),
-					MonitoringEnabled: proto.Bool(true),
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(true),
+				},
+			},
+		},
+		{
+			"BaseConfigEnableLoggingFluentBitAndMonitoring",
+			&pb.InstanceConfig{
+				HealthMonitorConfig: &pb.HealthMonitorConfig{
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(true),
+					MonitoringEnabled:       proto.Bool(true),
+				},
+			},
+			&pb.InstanceConfig{
+				MetricsEnabled: proto.Bool(false),
+				UpdateStrategy: proto.String(""),
+				HealthMonitorConfig: &pb.HealthMonitorConfig{
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(true),
+					MonitoringEnabled:       proto.Bool(true),
+				},
+			},
+		},
+		{
+			"BaseConfigEnableLoggingFluentBitNoLogging",
+			&pb.InstanceConfig{
+				HealthMonitorConfig: &pb.HealthMonitorConfig{
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(false),
+					LoggingFluentBitEnabled: proto.Bool(true),
+					MonitoringEnabled:       proto.Bool(true),
+				},
+			},
+			&pb.InstanceConfig{
+				MetricsEnabled: proto.Bool(false),
+				UpdateStrategy: proto.String(""),
+				HealthMonitorConfig: &pb.HealthMonitorConfig{
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(false),
+					LoggingFluentBitEnabled: proto.Bool(true),
+					MonitoringEnabled:       proto.Bool(true),
 				},
 			},
 		},

diff --git a/pkg/devicepolicy/policy_util_test.go b/pkg/devicepolicy/policy_util_test.go
index f1ae737..308e4d3 100644
--- a/pkg/devicepolicy/policy_util_test.go
+++ b/pkg/devicepolicy/policy_util_test.go

@@ -44,9 +44,10 @@
 				UpdateStrategy: instanceConfig.UpdateStrategy,
 				MetricsEnabled: instanceConfig.MetricsEnabled,
 				HealthMonitorConfig: &pmpb.HealthMonitorConfig{
-					Enforced:          proto.Bool(true),
-					LoggingEnabled:    proto.Bool(true),
-					MonitoringEnabled: proto.Bool(false),
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(false),
 				},
 			},
 		},
@@ -58,9 +59,10 @@
 				UpdateStrategy: instanceConfig.UpdateStrategy,
 				MetricsEnabled: instanceConfig.MetricsEnabled,
 				HealthMonitorConfig: &pmpb.HealthMonitorConfig{
-					Enforced:          proto.Bool(true),
-					LoggingEnabled:    proto.Bool(true),
-					MonitoringEnabled: proto.Bool(false),
+					Enforced:                proto.Bool(true),
+					LoggingEnabled:          proto.Bool(true),
+					LoggingFluentBitEnabled: proto.Bool(false),
+					MonitoringEnabled:       proto.Bool(false),
 				},
 			},
 		},
@@ -276,9 +278,10 @@
 		UpdateStrategy: instanceConfig.UpdateStrategy,
 		MetricsEnabled: instanceConfig.MetricsEnabled,
 		HealthMonitorConfig: &pmpb.HealthMonitorConfig{
-			Enforced:          proto.Bool(true),
-			LoggingEnabled:    proto.Bool(true),
-			MonitoringEnabled: proto.Bool(false),
+			Enforced:                proto.Bool(true),
+			LoggingEnabled:          proto.Bool(true),
+			LoggingFluentBitEnabled: proto.Bool(false),
+			MonitoringEnabled:       proto.Bool(false),
 		},
 	}
 	if !proto.Equal(fakePolicy.instanceConfig, expectInstanceConfig) {