Skip to content

Commit 1708959

Browse files
Fix nil dereference from Bucket fields (#41)
Fixes aws-controllers-k8s/community#918 Description of changes: `nil` check spec fields before attempting to dereference in hook code. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent a2654b9 commit 1708959

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

pkg/resource/bucket/hook.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,8 @@ func customPreCompare(
300300
if a.ko.Spec.Accelerate == nil && b.ko.Spec.Accelerate != nil {
301301
a.ko.Spec.Accelerate = &svcapitypes.AccelerateConfiguration{}
302302

303-
if *b.ko.Spec.Accelerate.Status == DefaultAccelerationStatus {
303+
if b.ko.Spec.Accelerate.Status != nil &&
304+
*b.ko.Spec.Accelerate.Status == DefaultAccelerationStatus {
304305
a.ko.Spec.Accelerate.Status = &DefaultAccelerationStatus
305306
}
306307
}
@@ -375,7 +376,8 @@ func customPreCompare(
375376
if a.ko.Spec.Versioning == nil && b.ko.Spec.Versioning != nil {
376377
a.ko.Spec.Versioning = &svcapitypes.VersioningConfiguration{}
377378

378-
if *b.ko.Spec.Versioning.Status == DefaultVersioningStatus {
379+
if b.ko.Spec.Versioning.Status != nil &&
380+
*b.ko.Spec.Versioning.Status == DefaultVersioningStatus {
379381
a.ko.Spec.Versioning.Status = &DefaultVersioningStatus
380382
}
381383
}

0 commit comments

Comments
 (0)