Skip to content

Bug_fix: validate non-nil AzureMachine.Spec.Diagnostic when upgrading to v1beta1 #2961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Dec 22, 2022
Merged

Bug_fix: validate non-nil AzureMachine.Spec.Diagnostic when upgrading to v1beta1 #2961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions api/v1beta1/azuremachine_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,13 @@ func (m *AzureMachine) ValidateUpdate(oldRaw runtime.Object) error {
allErrs = append(allErrs, err)
}

if err := webhookutils.ValidateImmutable(
field.NewPath("Spec", "Diagnostics"),
old.Spec.Diagnostics,
m.Spec.Diagnostics); err != nil {
allErrs = append(allErrs, err)
if old.Spec.Diagnostics != nil {
if err := webhookutils.ValidateImmutable(
field.NewPath("Spec", "Diagnostics"),
old.Spec.Diagnostics,
m.Spec.Diagnostics); err != nil {
allErrs = append(allErrs, err)
}
}

if len(allErrs) == 0 {
Expand Down
42 changes: 42 additions & 0 deletions api/v1beta1/azuremachine_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,48 @@ func TestAzureMachine_ValidateUpdate(t *testing.T) {
},
wantErr: false,
},
{
name: "validTest: azuremachine.spec.Diagnostics should not error on updating nil diagnostics",
oldMachine: &AzureMachine{
Spec: AzureMachineSpec{},
},
newMachine: &AzureMachine{
Spec: AzureMachineSpec{
Diagnostics: &Diagnostics{Boot: &BootDiagnostics{StorageAccountType: ManagedDiagnosticsStorage}},
},
},
wantErr: false,
},
{
name: "invalidTest: azuremachine.spec.Diagnostics is immutable",
oldMachine: &AzureMachine{
Spec: AzureMachineSpec{
Diagnostics: &Diagnostics{},
},
},
newMachine: &AzureMachine{
Spec: AzureMachineSpec{
Diagnostics: &Diagnostics{Boot: &BootDiagnostics{StorageAccountType: ManagedDiagnosticsStorage}},
},
},
wantErr: true,
},
{
name: "invalidTest: azuremachine.spec.Diagnostics is immutable",
oldMachine: &AzureMachine{
Spec: AzureMachineSpec{
Diagnostics: &Diagnostics{
Boot: &BootDiagnostics{},
},
},
},
newMachine: &AzureMachine{
Spec: AzureMachineSpec{
Diagnostics: &Diagnostics{Boot: &BootDiagnostics{StorageAccountType: ManagedDiagnosticsStorage}},
},
},
wantErr: true,
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
Expand Down