diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 206ea674..597c225f 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2025-03-27T16:32:48Z" - build_hash: 980cb1e4734f673d16101cf55206b84ca639ec01 + build_date: "2025-04-18T02:07:04Z" + build_hash: 0909e7f0adb8ffe4120a8c20d5d58b991f2539e9 go_version: go1.24.1 - version: v0.44.0 + version: v0.44.0-3-g0909e7f api_directory_checksum: b37edb8bba9d3847d4bdf1e842b7a597821c8c37 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/pkg/resource/alias/sdk.go b/pkg/resource/alias/sdk.go index acb05448..2ea2841d 100644 --- a/pkg/resource/alias/sdk.go +++ b/pkg/resource/alias/sdk.go @@ -275,13 +275,7 @@ func (rm *resourceManager) newCreateRequestPayload( if r.ko.Spec.RoutingConfig != nil { f4 := &svcsdktypes.AliasRoutingConfiguration{} if r.ko.Spec.RoutingConfig.AdditionalVersionWeights != nil { - f4f0 := map[string]float64{} - for f4f0key, f4f0valiter := range r.ko.Spec.RoutingConfig.AdditionalVersionWeights { - var f4f0val float64 - f4f0val = *f4f0valiter - f4f0[f4f0key] = f4f0val - } - f4.AdditionalVersionWeights = f4f0 + f4.AdditionalVersionWeights = aws.ToFloat64Map(r.ko.Spec.RoutingConfig.AdditionalVersionWeights) } res.RoutingConfig = f4 } @@ -407,13 +401,7 @@ func (rm *resourceManager) newUpdateRequestPayload( if r.ko.Spec.RoutingConfig != nil { f5 := &svcsdktypes.AliasRoutingConfiguration{} if r.ko.Spec.RoutingConfig.AdditionalVersionWeights != nil { - f5f0 := map[string]float64{} - for f5f0key, f5f0valiter := range r.ko.Spec.RoutingConfig.AdditionalVersionWeights { - var f5f0val float64 - f5f0val = *f5f0valiter - f5f0[f5f0key] = f5f0val - } - f5.AdditionalVersionWeights = f5f0 + f5.AdditionalVersionWeights = aws.ToFloat64Map(r.ko.Spec.RoutingConfig.AdditionalVersionWeights) } res.RoutingConfig = f5 } diff --git a/pkg/resource/function/sdk.go b/pkg/resource/function/sdk.go index d629c09e..8cf5eca4 100644 --- a/pkg/resource/function/sdk.go +++ b/pkg/resource/function/sdk.go @@ -327,6 +327,13 @@ func (rm *resourceManager) sdkFind( } rm.setStatusDefaults(ko) + if r.ko.Spec.VPCConfig != nil { + if ko.Spec.VPCConfig == nil { + ko.Spec.VPCConfig = &svcapitypes.VPCConfig{} + } + ko.Spec.VPCConfig.SecurityGroupRefs = r.ko.Spec.VPCConfig.SecurityGroupRefs + ko.Spec.VPCConfig.SubnetRefs = r.ko.Spec.VPCConfig.SubnetRefs + } if resp.Code != nil { if ko.Spec.Code == nil { ko.Spec.Code = &svcapitypes.FunctionCode{} @@ -335,6 +342,9 @@ func (rm *resourceManager) sdkFind( ko.Spec.Code.ImageURI = resp.Code.ImageUri } } + if r.ko.Spec.Code != nil && r.ko.Spec.Code.S3BucketRef != nil { + ko.Spec.Code.S3BucketRef = r.ko.Spec.Code.S3BucketRef + } if resp.Configuration.Layers != nil { f16 := []*svcapitypes.Layer{} layer := []*string{} @@ -666,6 +676,14 @@ func (rm *resourceManager) sdkCreate( } rm.setStatusDefaults(ko) + if desired.ko.Spec.VPCConfig != nil { + if ko.Spec.VPCConfig == nil { + ko.Spec.VPCConfig = &svcapitypes.VPCConfig{} + } + ko.Spec.VPCConfig.SecurityGroupRefs = desired.ko.Spec.VPCConfig.SecurityGroupRefs + ko.Spec.VPCConfig.SubnetRefs = desired.ko.Spec.VPCConfig.SubnetRefs + } + if resp.Layers != nil { f16 := []*svcapitypes.Layer{} for _, f16iter := range resp.Layers { diff --git a/templates/hooks/function/sdk_create_post_set_output.go.tpl b/templates/hooks/function/sdk_create_post_set_output.go.tpl index 41f7f580..8ba83999 100644 --- a/templates/hooks/function/sdk_create_post_set_output.go.tpl +++ b/templates/hooks/function/sdk_create_post_set_output.go.tpl @@ -1,3 +1,11 @@ + if desired.ko.Spec.VPCConfig != nil { + if ko.Spec.VPCConfig == nil { + ko.Spec.VPCConfig = &svcapitypes.VPCConfig{} + } + ko.Spec.VPCConfig.SecurityGroupRefs = desired.ko.Spec.VPCConfig.SecurityGroupRefs + ko.Spec.VPCConfig.SubnetRefs = desired.ko.Spec.VPCConfig.SubnetRefs + } + if resp.Layers != nil { f16 := []*svcapitypes.Layer{} for _, f16iter := range resp.Layers { diff --git a/templates/hooks/function/sdk_read_one_post_set_output.go.tpl b/templates/hooks/function/sdk_read_one_post_set_output.go.tpl index 4554cfc1..28d18904 100644 --- a/templates/hooks/function/sdk_read_one_post_set_output.go.tpl +++ b/templates/hooks/function/sdk_read_one_post_set_output.go.tpl @@ -1,3 +1,10 @@ + if r.ko.Spec.VPCConfig != nil { + if ko.Spec.VPCConfig == nil { + ko.Spec.VPCConfig = &svcapitypes.VPCConfig{} + } + ko.Spec.VPCConfig.SecurityGroupRefs = r.ko.Spec.VPCConfig.SecurityGroupRefs + ko.Spec.VPCConfig.SubnetRefs = r.ko.Spec.VPCConfig.SubnetRefs + } if resp.Code != nil { if ko.Spec.Code == nil { ko.Spec.Code = &svcapitypes.FunctionCode{} @@ -6,6 +13,9 @@ ko.Spec.Code.ImageURI = resp.Code.ImageUri } } + if r.ko.Spec.Code != nil && r.ko.Spec.Code.S3BucketRef != nil { + ko.Spec.Code.S3BucketRef = r.ko.Spec.Code.S3BucketRef + } if resp.Configuration.Layers != nil { f16 := []*svcapitypes.Layer{} layer := []*string{}