Skip to content
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

Jump to bottom

fix(lambda): Push empty environment of vpc config if nil #1975

Merged
merged 1 commit into from
Dec 14, 2023
Merged

fix(lambda): Push empty environment of vpc config if nil #1975

Show file tree
Hide file tree
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
39 changes: 18 additions & 21 deletions pkg/controller/lambda/function/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,14 +476,12 @@ func GenerateUpdateFunctionConfigurationInput(cr *svcapitypes.Function) *svcsdk.
}
if cr.Spec.ForProvider.Environment != nil {
f4 := &svcsdk.Environment{}
if cr.Spec.ForProvider.Environment.Variables != nil {
f4f0 := map[string]*string{}
for f4f0key, f4f0valiter := range cr.Spec.ForProvider.Environment.Variables {
var f4f0val = *f4f0valiter
f4f0[f4f0key] = &f4f0val
}
f4.SetVariables(f4f0)
f4f0 := map[string]*string{}
for f4f0key, f4f0valiter := range cr.Spec.ForProvider.Environment.Variables {
var f4f0val = *f4f0valiter
f4f0[f4f0key] = &f4f0val
}
f4.SetVariables(f4f0)
res.SetEnvironment(f4)
}
if cr.Spec.ForProvider.FileSystemConfigs != nil {
Expand Down Expand Up @@ -558,22 +556,21 @@ func GenerateUpdateFunctionConfigurationInput(cr *svcapitypes.Function) *svcsdk.
}
if cr.Spec.ForProvider.CustomFunctionVPCConfigParameters != nil {
f19 := &svcsdk.VpcConfig{}
if cr.Spec.ForProvider.CustomFunctionVPCConfigParameters.SecurityGroupIDs != nil {
f19f0 := []*string{}
for _, f19f0iter := range cr.Spec.ForProvider.CustomFunctionVPCConfigParameters.SecurityGroupIDs {
var f19f0elem = *f19f0iter
f19f0 = append(f19f0, &f19f0elem)
}
f19.SetSecurityGroupIds(f19f0)

f19f0 := []*string{}
for _, f19f0iter := range cr.Spec.ForProvider.CustomFunctionVPCConfigParameters.SecurityGroupIDs {
var f19f0elem = *f19f0iter
f19f0 = append(f19f0, &f19f0elem)
}
if cr.Spec.ForProvider.CustomFunctionVPCConfigParameters.SubnetIDs != nil {
f19f1 := []*string{}
for _, f19f1iter := range cr.Spec.ForProvider.CustomFunctionVPCConfigParameters.SubnetIDs {
var f19f1elem = *f19f1iter
f19f1 = append(f19f1, &f19f1elem)
}
f19.SetSubnetIds(f19f1)
f19.SetSecurityGroupIds(f19f0)

f19f1 := []*string{}
for _, f19f1iter := range cr.Spec.ForProvider.CustomFunctionVPCConfigParameters.SubnetIDs {
var f19f1elem = *f19f1iter
f19f1 = append(f19f1, &f19f1elem)
}
f19.SetSubnetIds(f19f1)

res.SetVpcConfig(f19)
}
return res
Expand Down
5 changes: 4 additions & 1 deletion pkg/controller/lambda/function/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,10 @@ func TestGenerateUpdateFunctionConfigurationInput(t *testing.T) {
Runtime: aws.String("test_runtime"),
Timeout: aws.Int64(128),
TracingConfig: &svcsdk.TracingConfig{Mode: aws.String(svcsdk.TracingModeActive)},
VpcConfig: &svcsdk.VpcConfig{SecurityGroupIds: []*string{aws.String("id1")}},
VpcConfig: &svcsdk.VpcConfig{
SecurityGroupIds: []*string{aws.String("id1")},
SubnetIds: []*string{},
},
},
},
},
Expand Down
Loading