Skip to content

Commit fc31d0f

Browse files
authored
Go v2 patches (#156)
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 7925f91 commit fc31d0f

File tree

1 file changed

+21
-6
lines changed

1 file changed

+21
-6
lines changed

pkg/resource/alias/hooks.go

+21-6
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ func (rm *resourceManager) syncEventInvokeConfig(
7272
input.DestinationConfig = destinations
7373
}
7474
if dspec.FunctionEventInvokeConfig.MaximumEventAgeInSeconds != nil {
75-
input.MaximumEventAgeInSeconds = aws.Int32(int32(*dspec.FunctionEventInvokeConfig.MaximumEventAgeInSeconds))
75+
input.MaximumEventAgeInSeconds = int32OrNil(dspec.FunctionEventInvokeConfig.MaximumEventAgeInSeconds)
7676
}
7777
if dspec.FunctionEventInvokeConfig.MaximumRetryAttempts != nil {
78-
input.MaximumRetryAttempts = aws.Int32(int32(*dspec.FunctionEventInvokeConfig.MaximumRetryAttempts))
78+
input.MaximumRetryAttempts = int32OrNil(dspec.FunctionEventInvokeConfig.MaximumRetryAttempts)
7979
}
8080

8181
_, err = rm.sdkapi.PutFunctionEventInvokeConfig(ctx, input)
@@ -116,7 +116,7 @@ func (rm *resourceManager) updateProvisionedConcurrency(
116116
input := &svcsdk.PutProvisionedConcurrencyConfigInput{
117117
FunctionName: aws.String(*dspec.FunctionName),
118118
Qualifier: aws.String(*dspec.Name),
119-
ProvisionedConcurrentExecutions: aws.Int32(int32(*dspec.ProvisionedConcurrencyConfig.ProvisionedConcurrentExecutions)),
119+
ProvisionedConcurrentExecutions: int32OrNil(dspec.ProvisionedConcurrencyConfig.ProvisionedConcurrentExecutions),
120120
}
121121

122122
_, err = rm.sdkapi.PutProvisionedConcurrencyConfig(ctx, input)
@@ -156,7 +156,7 @@ func (rm *resourceManager) setProvisionedConcurrencyConfig(
156156
} else {
157157
// creating ProvisionedConcurrency object to store the values returned from `Get` call
158158
cloudProvisionedConcurrency := &svcapitypes.PutProvisionedConcurrencyConfigInput{}
159-
cloudProvisionedConcurrency.ProvisionedConcurrentExecutions = aws.Int64(int64(*getProvisionedConcurrencyConfigOutput.RequestedProvisionedConcurrentExecutions))
159+
cloudProvisionedConcurrency.ProvisionedConcurrentExecutions = int64OrNil(getProvisionedConcurrencyConfigOutput.RequestedProvisionedConcurrentExecutions)
160160
ko.Spec.ProvisionedConcurrencyConfig = cloudProvisionedConcurrency
161161
}
162162

@@ -174,8 +174,8 @@ func (rm *resourceManager) setFunctionEventInvokeConfigFromResponse(
174174
cloudFunctionEventInvokeConfig.DestinationConfig.OnSuccess = &svcapitypes.OnSuccess{}
175175
cloudFunctionEventInvokeConfig.DestinationConfig.OnFailure.Destination = getFunctionEventInvokeConfigOutput.DestinationConfig.OnFailure.Destination
176176
cloudFunctionEventInvokeConfig.DestinationConfig.OnSuccess.Destination = getFunctionEventInvokeConfigOutput.DestinationConfig.OnSuccess.Destination
177-
cloudFunctionEventInvokeConfig.MaximumEventAgeInSeconds = aws.Int64(int64(*getFunctionEventInvokeConfigOutput.MaximumEventAgeInSeconds))
178-
cloudFunctionEventInvokeConfig.MaximumRetryAttempts = aws.Int64(int64(*getFunctionEventInvokeConfigOutput.MaximumRetryAttempts))
177+
cloudFunctionEventInvokeConfig.MaximumEventAgeInSeconds = int64OrNil(getFunctionEventInvokeConfigOutput.MaximumEventAgeInSeconds)
178+
cloudFunctionEventInvokeConfig.MaximumRetryAttempts = int64OrNil(getFunctionEventInvokeConfigOutput.MaximumRetryAttempts)
179179
ko.Spec.FunctionEventInvokeConfig = cloudFunctionEventInvokeConfig
180180

181181
}
@@ -237,3 +237,18 @@ func (rm *resourceManager) setResourceAdditionalFields(
237237

238238
return nil
239239
}
240+
241+
242+
func int32OrNil(val *int64) *int32 {
243+
if val != nil {
244+
return aws.Int32(int32(*val))
245+
}
246+
return nil
247+
}
248+
249+
func int64OrNil(val *int32) *int64 {
250+
if val != nil {
251+
return aws.Int64(int64(*val))
252+
}
253+
return nil
254+
}

0 commit comments

Comments
 (0)