Merge pull request #4819 from Patryk-Stefanski/DiagnosticsUserManaged…

…NilCheck Check UserManaged is not nil in azure/converters/diagnostics
kubernetes-sigs · May 9, 2024 · 43e72a9 · 43e72a9
2 parents bccef17 + d8f1e9d
commit 43e72a9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/azure/converters/diagnostics.go b/azure/converters/diagnostics.go
@@ -39,11 +39,13 @@ func GetDiagnosticsProfile(diagnostics *infrav1.Diagnostics) *armcompute.Diagnos
 				},
 			}
 		case infrav1.UserManagedDiagnosticsStorage:
-			return &armcompute.DiagnosticsProfile{
-				BootDiagnostics: &armcompute.BootDiagnostics{
-					Enabled:    ptr.To(true),
-					StorageURI: &diagnostics.Boot.UserManaged.StorageAccountURI,
-				},
+			if diagnostics.Boot.UserManaged != nil {
+				return &armcompute.DiagnosticsProfile{
+					BootDiagnostics: &armcompute.BootDiagnostics{
+						Enabled:    ptr.To(true),
+						StorageURI: &diagnostics.Boot.UserManaged.StorageAccountURI,
+					},
+				}
 			}
 		}
 	}

diff --git a/azure/converters/diagnostics_test.go b/azure/converters/diagnostics_test.go
@@ -81,6 +81,16 @@ func TestGetDiagnosticsProfile(t *testing.T) {
 			},
 			want: nil,
 		},
+		{
+			name: "nil diagnostics boot user managed",
+			diagnostics: &infrav1.Diagnostics{
+				Boot: &infrav1.BootDiagnostics{
+					StorageAccountType: infrav1.UserManagedDiagnosticsStorage,
+					UserManaged:        nil,
+				},
+			},
+			want: nil,
+		},
 	}
 	for _, tt := range tests {
 		tt := tt