Skip to content

Go v2 patches #156

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
merged 1 commit into from
Feb 6, 2025
Merged

Go v2 patches #156

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
27 changes: 21 additions & 6 deletions pkg/resource/alias/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ func (rm *resourceManager) syncEventInvokeConfig(
input.DestinationConfig = destinations
}
if dspec.FunctionEventInvokeConfig.MaximumEventAgeInSeconds != nil {
input.MaximumEventAgeInSeconds = aws.Int32(int32(*dspec.FunctionEventInvokeConfig.MaximumEventAgeInSeconds))
input.MaximumEventAgeInSeconds = int32OrNil(dspec.FunctionEventInvokeConfig.MaximumEventAgeInSeconds)
}
if dspec.FunctionEventInvokeConfig.MaximumRetryAttempts != nil {
input.MaximumRetryAttempts = aws.Int32(int32(*dspec.FunctionEventInvokeConfig.MaximumRetryAttempts))
input.MaximumRetryAttempts = int32OrNil(dspec.FunctionEventInvokeConfig.MaximumRetryAttempts)
}

_, err = rm.sdkapi.PutFunctionEventInvokeConfig(ctx, input)
Expand Down Expand Up @@ -116,7 +116,7 @@ func (rm *resourceManager) updateProvisionedConcurrency(
input := &svcsdk.PutProvisionedConcurrencyConfigInput{
FunctionName: aws.String(*dspec.FunctionName),
Qualifier: aws.String(*dspec.Name),
ProvisionedConcurrentExecutions: aws.Int32(int32(*dspec.ProvisionedConcurrencyConfig.ProvisionedConcurrentExecutions)),
ProvisionedConcurrentExecutions: int32OrNil(dspec.ProvisionedConcurrencyConfig.ProvisionedConcurrentExecutions),
}

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

Expand All @@ -174,8 +174,8 @@ func (rm *resourceManager) setFunctionEventInvokeConfigFromResponse(
cloudFunctionEventInvokeConfig.DestinationConfig.OnSuccess = &svcapitypes.OnSuccess{}
cloudFunctionEventInvokeConfig.DestinationConfig.OnFailure.Destination = getFunctionEventInvokeConfigOutput.DestinationConfig.OnFailure.Destination
cloudFunctionEventInvokeConfig.DestinationConfig.OnSuccess.Destination = getFunctionEventInvokeConfigOutput.DestinationConfig.OnSuccess.Destination
cloudFunctionEventInvokeConfig.MaximumEventAgeInSeconds = aws.Int64(int64(*getFunctionEventInvokeConfigOutput.MaximumEventAgeInSeconds))
cloudFunctionEventInvokeConfig.MaximumRetryAttempts = aws.Int64(int64(*getFunctionEventInvokeConfigOutput.MaximumRetryAttempts))
cloudFunctionEventInvokeConfig.MaximumEventAgeInSeconds = int64OrNil(getFunctionEventInvokeConfigOutput.MaximumEventAgeInSeconds)
cloudFunctionEventInvokeConfig.MaximumRetryAttempts = int64OrNil(getFunctionEventInvokeConfigOutput.MaximumRetryAttempts)
ko.Spec.FunctionEventInvokeConfig = cloudFunctionEventInvokeConfig

}
Expand Down Expand Up @@ -237,3 +237,18 @@ func (rm *resourceManager) setResourceAdditionalFields(

return nil
}


func int32OrNil(val *int64) *int32 {
if val != nil {
return aws.Int32(int32(*val))
}
return nil
}

func int64OrNil(val *int32) *int64 {
if val != nil {
return aws.Int64(int64(*val))
}
return nil
}