Skip to content

Commit 2ddc6cf

Browse files
authored
fix: Domain nil pointer panic (#97)
Issue [#2582](aws-controllers-k8s/community#2582) Description of changes: Do a nil check when setting DomainConfig TimeoutMinutes By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 72adf18 commit 2ddc6cf

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

pkg/resource/domain/hooks.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,14 @@ func (rm *resourceManager) customUpdateDomain(ctx context.Context, desired, late
192192
if resp.DomainConfig.AdvancedSecurityOptions != nil && resp.DomainConfig.AdvancedSecurityOptions.Options != nil {
193193
var samlOptions *v1alpha1.SAMLOptionsInput
194194
if resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions != nil {
195+
var timeoutMinutes *int64
196+
if resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions.SessionTimeoutMinutes != nil {
197+
timeoutMinutes = aws.Int64(int64(*resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions.SessionTimeoutMinutes))
198+
}
195199
samlOptions = &v1alpha1.SAMLOptionsInput{
196200
Enabled: resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions.Enabled,
197201
RolesKey: resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions.RolesKey,
198-
SessionTimeoutMinutes: aws.Int64(int64(*resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions.SessionTimeoutMinutes)),
202+
SessionTimeoutMinutes: timeoutMinutes,
199203
SubjectKey: resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions.SubjectKey,
200204
}
201205
if resp.DomainConfig.AdvancedSecurityOptions.Options.SAMLOptions.Idp != nil {

0 commit comments

Comments
 (0)