fix: avoid nil pointer dereference

odigos-io · Aug 13, 2024 · 3e32f0c · 3e32f0c
1 parent d33d26d
commit 3e32f0c
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/api/odigos/v1alpha1/odigosconfig_types.go b/api/odigos/v1alpha1/odigosconfig_types.go
@@ -76,26 +76,30 @@ func init() {
 }
 
 func (odigosConfig *OdigosConfiguration) ToCommonConfig() *common.OdigosConfiguration {
-	return &common.OdigosConfiguration{
-		OdigosVersion:     odigosConfig.Spec.OdigosVersion,
-		ConfigVersion:     odigosConfig.Spec.ConfigVersion,
-		TelemetryEnabled:  odigosConfig.Spec.TelemetryEnabled,
-		OpenshiftEnabled:  odigosConfig.Spec.OpenshiftEnabled,
-		IgnoredNamespaces: odigosConfig.Spec.IgnoredNamespaces,
-		IgnoredContainers: odigosConfig.Spec.IgnoredContainers,
-		Psp:               odigosConfig.Spec.Psp,
-		ImagePrefix:       odigosConfig.Spec.ImagePrefix,
-		OdigletImage:      odigosConfig.Spec.OdigletImage,
-		InstrumentorImage: odigosConfig.Spec.InstrumentorImage,
-		AutoscalerImage:   odigosConfig.Spec.AutoscalerImage,
-		SupportedSDKs:     odigosConfig.Spec.SupportedSDKs,
-		DefaultSDKs:       odigosConfig.Spec.DefaultSDKs,
-		CollectorGateway: &common.CollectorGatewayConfiguration{
+	var collectorGateway common.CollectorGatewayConfiguration
+	if odigosConfig.Spec.CollectorGateway != nil {
+		collectorGateway = common.CollectorGatewayConfiguration{
 			RequestMemoryMiB:           odigosConfig.Spec.CollectorGateway.RequestMemoryMiB,
 			MemoryLimiterLimitMiB:      odigosConfig.Spec.CollectorGateway.MemoryLimiterLimitMiB,
 			MemoryLimiterSpikeLimitMiB: odigosConfig.Spec.CollectorGateway.MemoryLimiterSpikeLimitMiB,
 			GoMemLimitMib:              odigosConfig.Spec.CollectorGateway.GoMemLimitMib,
-		},
+		}
+	}
+	return &common.OdigosConfiguration{
+		OdigosVersion:               odigosConfig.Spec.OdigosVersion,
+		ConfigVersion:               odigosConfig.Spec.ConfigVersion,
+		TelemetryEnabled:            odigosConfig.Spec.TelemetryEnabled,
+		OpenshiftEnabled:            odigosConfig.Spec.OpenshiftEnabled,
+		IgnoredNamespaces:           odigosConfig.Spec.IgnoredNamespaces,
+		IgnoredContainers:           odigosConfig.Spec.IgnoredContainers,
+		Psp:                         odigosConfig.Spec.Psp,
+		ImagePrefix:                 odigosConfig.Spec.ImagePrefix,
+		OdigletImage:                odigosConfig.Spec.OdigletImage,
+		InstrumentorImage:           odigosConfig.Spec.InstrumentorImage,
+		AutoscalerImage:             odigosConfig.Spec.AutoscalerImage,
+		SupportedSDKs:               odigosConfig.Spec.SupportedSDKs,
+		DefaultSDKs:                 odigosConfig.Spec.DefaultSDKs,
+		CollectorGateway:            &collectorGateway,
 		GoAutoIncludeCodeAttributes: odigosConfig.Spec.GoAutoIncludeCodeAttributes,
 	}
 }