Merge pull request kubernetes-sigs#3896 from shraddhabang/main

k8s-ci-robot · web-flow · commit 808fcbce374a · 2024-10-17T05:15:02.000+01:00
Fix controller crash due enabling shield protection after AWSSDKGoV2 upgrade
diff --git a/pkg/deploy/shield/protection_manager.go b/pkg/deploy/shield/protection_manager.go
@@ -125,7 +125,7 @@ func (m *defaultProtectionManager) GetProtection(ctx context.Context, resourceAR
 			return nil, err
 		}
 	}
-	if resp.Protection != nil {
+	if resp != nil && resp.Protection != nil {
 		protectionInfo = &ProtectionInfo{
 			Name: awssdk.ToString(resp.Protection.Name),
 			ID:   awssdk.ToString(resp.Protection.Id),

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (m *defaultProtectionManager) GetProtection(ctx context.Context, resourceAR`
`125`	`125`	`return nil, err`
`126`	`126`	`}`
`127`	`127`	`}`
`128`		`- if resp.Protection != nil {`
	`128`	`+ if resp != nil && resp.Protection != nil {`
`129`	`129`	`protectionInfo = &ProtectionInfo{`
`130`	`130`	`Name: awssdk.ToString(resp.Protection.Name),`
`131`	`131`	`ID: awssdk.ToString(resp.Protection.Id),`