diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 7b320f6..f94dbd5 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2025-09-26T17:23:37Z" - build_hash: 5bf1e456e1dfc638d47ab492376335f528c0f455 - go_version: go1.24.5 - version: v0.52.0-1-g5bf1e45 + build_date: "2025-10-16T20:11:11Z" + build_hash: eaabefb6bd7b2be8a1baf4478f22b3310e6921c8 + go_version: go1.25.1 + version: v0.52.0-6-geaabefb-dirty api_directory_checksum: c0850c127b1c1c46a7abf233f454e1c7c561a71c api_version: v1alpha1 aws_sdk_go_version: v1.32.6 generator_config_info: - file_checksum: d04b5f7d437623f4ddc566ea1f2e6b068125115e + file_checksum: 651089608b32a02bd9dabcdf5e864c8263367cc8 original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index c78a035..d7a237a 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -209,6 +209,12 @@ resources: references: resource: Listener path: Status.ACKResourceMetadata.ARN + Actions: + set: + - ignore: true + method: Create + - ignore: true + method: Update Actions.targetGroupARN: references: resource: TargetGroup diff --git a/config/crd/bases/elbv2.services.k8s.aws_listeners.yaml b/config/crd/bases/elbv2.services.k8s.aws_listeners.yaml index a23c124..10edf17 100644 --- a/config/crd/bases/elbv2.services.k8s.aws_listeners.yaml +++ b/config/crd/bases/elbv2.services.k8s.aws_listeners.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: listeners.elbv2.services.k8s.aws spec: group: elbv2.services.k8s.aws diff --git a/config/crd/bases/elbv2.services.k8s.aws_loadbalancers.yaml b/config/crd/bases/elbv2.services.k8s.aws_loadbalancers.yaml index 3af5471..d5d9dbe 100644 --- a/config/crd/bases/elbv2.services.k8s.aws_loadbalancers.yaml +++ b/config/crd/bases/elbv2.services.k8s.aws_loadbalancers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: loadbalancers.elbv2.services.k8s.aws spec: group: elbv2.services.k8s.aws diff --git a/config/crd/bases/elbv2.services.k8s.aws_rules.yaml b/config/crd/bases/elbv2.services.k8s.aws_rules.yaml index e8dc4cd..21586ab 100644 --- a/config/crd/bases/elbv2.services.k8s.aws_rules.yaml +++ b/config/crd/bases/elbv2.services.k8s.aws_rules.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: rules.elbv2.services.k8s.aws spec: group: elbv2.services.k8s.aws diff --git a/config/crd/bases/elbv2.services.k8s.aws_targetgroups.yaml b/config/crd/bases/elbv2.services.k8s.aws_targetgroups.yaml index e5a787a..6fbde2f 100644 --- a/config/crd/bases/elbv2.services.k8s.aws_targetgroups.yaml +++ b/config/crd/bases/elbv2.services.k8s.aws_targetgroups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.19.0 name: targetgroups.elbv2.services.k8s.aws spec: group: elbv2.services.k8s.aws diff --git a/generator.yaml b/generator.yaml index c78a035..d7a237a 100644 --- a/generator.yaml +++ b/generator.yaml @@ -209,6 +209,12 @@ resources: references: resource: Listener path: Status.ACKResourceMetadata.ARN + Actions: + set: + - ignore: true + method: Create + - ignore: true + method: Update Actions.targetGroupARN: references: resource: TargetGroup diff --git a/pkg/resource/rule/sdk.go b/pkg/resource/rule/sdk.go index 8b5dc28..5a2403b 100644 --- a/pkg/resource/rule/sdk.go +++ b/pkg/resource/rule/sdk.go @@ -400,159 +400,6 @@ func (rm *resourceManager) sdkCreate( found := false for _, elem := range resp.Rules { - if elem.Actions != nil { - f0 := []*svcapitypes.Action{} - for _, f0iter := range elem.Actions { - f0elem := &svcapitypes.Action{} - if f0iter.AuthenticateCognitoConfig != nil { - f0elemf0 := &svcapitypes.AuthenticateCognitoActionConfig{} - if f0iter.AuthenticateCognitoConfig.AuthenticationRequestExtraParams != nil { - f0elemf0.AuthenticationRequestExtraParams = aws.StringMap(f0iter.AuthenticateCognitoConfig.AuthenticationRequestExtraParams) - } - if f0iter.AuthenticateCognitoConfig.OnUnauthenticatedRequest != "" { - f0elemf0.OnUnauthenticatedRequest = aws.String(string(f0iter.AuthenticateCognitoConfig.OnUnauthenticatedRequest)) - } - if f0iter.AuthenticateCognitoConfig.Scope != nil { - f0elemf0.Scope = f0iter.AuthenticateCognitoConfig.Scope - } - if f0iter.AuthenticateCognitoConfig.SessionCookieName != nil { - f0elemf0.SessionCookieName = f0iter.AuthenticateCognitoConfig.SessionCookieName - } - if f0iter.AuthenticateCognitoConfig.SessionTimeout != nil { - f0elemf0.SessionTimeout = f0iter.AuthenticateCognitoConfig.SessionTimeout - } - if f0iter.AuthenticateCognitoConfig.UserPoolArn != nil { - f0elemf0.UserPoolARN = f0iter.AuthenticateCognitoConfig.UserPoolArn - } - if f0iter.AuthenticateCognitoConfig.UserPoolClientId != nil { - f0elemf0.UserPoolClientID = f0iter.AuthenticateCognitoConfig.UserPoolClientId - } - if f0iter.AuthenticateCognitoConfig.UserPoolDomain != nil { - f0elemf0.UserPoolDomain = f0iter.AuthenticateCognitoConfig.UserPoolDomain - } - f0elem.AuthenticateCognitoConfig = f0elemf0 - } - if f0iter.AuthenticateOidcConfig != nil { - f0elemf1 := &svcapitypes.AuthenticateOIDCActionConfig{} - if f0iter.AuthenticateOidcConfig.AuthenticationRequestExtraParams != nil { - f0elemf1.AuthenticationRequestExtraParams = aws.StringMap(f0iter.AuthenticateOidcConfig.AuthenticationRequestExtraParams) - } - if f0iter.AuthenticateOidcConfig.AuthorizationEndpoint != nil { - f0elemf1.AuthorizationEndpoint = f0iter.AuthenticateOidcConfig.AuthorizationEndpoint - } - if f0iter.AuthenticateOidcConfig.ClientId != nil { - f0elemf1.ClientID = f0iter.AuthenticateOidcConfig.ClientId - } - if f0iter.AuthenticateOidcConfig.ClientSecret != nil { - f0elemf1.ClientSecret = f0iter.AuthenticateOidcConfig.ClientSecret - } - if f0iter.AuthenticateOidcConfig.Issuer != nil { - f0elemf1.Issuer = f0iter.AuthenticateOidcConfig.Issuer - } - if f0iter.AuthenticateOidcConfig.OnUnauthenticatedRequest != "" { - f0elemf1.OnUnauthenticatedRequest = aws.String(string(f0iter.AuthenticateOidcConfig.OnUnauthenticatedRequest)) - } - if f0iter.AuthenticateOidcConfig.Scope != nil { - f0elemf1.Scope = f0iter.AuthenticateOidcConfig.Scope - } - if f0iter.AuthenticateOidcConfig.SessionCookieName != nil { - f0elemf1.SessionCookieName = f0iter.AuthenticateOidcConfig.SessionCookieName - } - if f0iter.AuthenticateOidcConfig.SessionTimeout != nil { - f0elemf1.SessionTimeout = f0iter.AuthenticateOidcConfig.SessionTimeout - } - if f0iter.AuthenticateOidcConfig.TokenEndpoint != nil { - f0elemf1.TokenEndpoint = f0iter.AuthenticateOidcConfig.TokenEndpoint - } - if f0iter.AuthenticateOidcConfig.UseExistingClientSecret != nil { - f0elemf1.UseExistingClientSecret = f0iter.AuthenticateOidcConfig.UseExistingClientSecret - } - if f0iter.AuthenticateOidcConfig.UserInfoEndpoint != nil { - f0elemf1.UserInfoEndpoint = f0iter.AuthenticateOidcConfig.UserInfoEndpoint - } - f0elem.AuthenticateOIDCConfig = f0elemf1 - } - if f0iter.FixedResponseConfig != nil { - f0elemf2 := &svcapitypes.FixedResponseActionConfig{} - if f0iter.FixedResponseConfig.ContentType != nil { - f0elemf2.ContentType = f0iter.FixedResponseConfig.ContentType - } - if f0iter.FixedResponseConfig.MessageBody != nil { - f0elemf2.MessageBody = f0iter.FixedResponseConfig.MessageBody - } - if f0iter.FixedResponseConfig.StatusCode != nil { - f0elemf2.StatusCode = f0iter.FixedResponseConfig.StatusCode - } - f0elem.FixedResponseConfig = f0elemf2 - } - if f0iter.ForwardConfig != nil { - f0elemf3 := &svcapitypes.ForwardActionConfig{} - if f0iter.ForwardConfig.TargetGroupStickinessConfig != nil { - f0elemf3f0 := &svcapitypes.TargetGroupStickinessConfig{} - if f0iter.ForwardConfig.TargetGroupStickinessConfig.DurationSeconds != nil { - durationSecondsCopy := int64(*f0iter.ForwardConfig.TargetGroupStickinessConfig.DurationSeconds) - f0elemf3f0.DurationSeconds = &durationSecondsCopy - } - if f0iter.ForwardConfig.TargetGroupStickinessConfig.Enabled != nil { - f0elemf3f0.Enabled = f0iter.ForwardConfig.TargetGroupStickinessConfig.Enabled - } - f0elemf3.TargetGroupStickinessConfig = f0elemf3f0 - } - if f0iter.ForwardConfig.TargetGroups != nil { - f0elemf3f1 := []*svcapitypes.TargetGroupTuple{} - for _, f0elemf3f1iter := range f0iter.ForwardConfig.TargetGroups { - f0elemf3f1elem := &svcapitypes.TargetGroupTuple{} - if f0elemf3f1iter.TargetGroupArn != nil { - f0elemf3f1elem.TargetGroupARN = f0elemf3f1iter.TargetGroupArn - } - if f0elemf3f1iter.Weight != nil { - weightCopy := int64(*f0elemf3f1iter.Weight) - f0elemf3f1elem.Weight = &weightCopy - } - f0elemf3f1 = append(f0elemf3f1, f0elemf3f1elem) - } - f0elemf3.TargetGroups = f0elemf3f1 - } - f0elem.ForwardConfig = f0elemf3 - } - if f0iter.Order != nil { - orderCopy := int64(*f0iter.Order) - f0elem.Order = &orderCopy - } - if f0iter.RedirectConfig != nil { - f0elemf5 := &svcapitypes.RedirectActionConfig{} - if f0iter.RedirectConfig.Host != nil { - f0elemf5.Host = f0iter.RedirectConfig.Host - } - if f0iter.RedirectConfig.Path != nil { - f0elemf5.Path = f0iter.RedirectConfig.Path - } - if f0iter.RedirectConfig.Port != nil { - f0elemf5.Port = f0iter.RedirectConfig.Port - } - if f0iter.RedirectConfig.Protocol != nil { - f0elemf5.Protocol = f0iter.RedirectConfig.Protocol - } - if f0iter.RedirectConfig.Query != nil { - f0elemf5.Query = f0iter.RedirectConfig.Query - } - if f0iter.RedirectConfig.StatusCode != "" { - f0elemf5.StatusCode = aws.String(string(f0iter.RedirectConfig.StatusCode)) - } - f0elem.RedirectConfig = f0elemf5 - } - if f0iter.TargetGroupArn != nil { - f0elem.TargetGroupARN = f0iter.TargetGroupArn - } - if f0iter.Type != "" { - f0elem.Type = aws.String(string(f0iter.Type)) - } - f0 = append(f0, f0elem) - } - ko.Spec.Actions = f0 - } else { - ko.Spec.Actions = nil - } if elem.Conditions != nil { f1 := []*svcapitypes.RuleCondition{} for _, f1iter := range elem.Conditions { @@ -957,159 +804,6 @@ func (rm *resourceManager) sdkUpdate( found := false for _, elem := range resp.Rules { - if elem.Actions != nil { - f0 := []*svcapitypes.Action{} - for _, f0iter := range elem.Actions { - f0elem := &svcapitypes.Action{} - if f0iter.AuthenticateCognitoConfig != nil { - f0elemf0 := &svcapitypes.AuthenticateCognitoActionConfig{} - if f0iter.AuthenticateCognitoConfig.AuthenticationRequestExtraParams != nil { - f0elemf0.AuthenticationRequestExtraParams = aws.StringMap(f0iter.AuthenticateCognitoConfig.AuthenticationRequestExtraParams) - } - if f0iter.AuthenticateCognitoConfig.OnUnauthenticatedRequest != "" { - f0elemf0.OnUnauthenticatedRequest = aws.String(string(f0iter.AuthenticateCognitoConfig.OnUnauthenticatedRequest)) - } - if f0iter.AuthenticateCognitoConfig.Scope != nil { - f0elemf0.Scope = f0iter.AuthenticateCognitoConfig.Scope - } - if f0iter.AuthenticateCognitoConfig.SessionCookieName != nil { - f0elemf0.SessionCookieName = f0iter.AuthenticateCognitoConfig.SessionCookieName - } - if f0iter.AuthenticateCognitoConfig.SessionTimeout != nil { - f0elemf0.SessionTimeout = f0iter.AuthenticateCognitoConfig.SessionTimeout - } - if f0iter.AuthenticateCognitoConfig.UserPoolArn != nil { - f0elemf0.UserPoolARN = f0iter.AuthenticateCognitoConfig.UserPoolArn - } - if f0iter.AuthenticateCognitoConfig.UserPoolClientId != nil { - f0elemf0.UserPoolClientID = f0iter.AuthenticateCognitoConfig.UserPoolClientId - } - if f0iter.AuthenticateCognitoConfig.UserPoolDomain != nil { - f0elemf0.UserPoolDomain = f0iter.AuthenticateCognitoConfig.UserPoolDomain - } - f0elem.AuthenticateCognitoConfig = f0elemf0 - } - if f0iter.AuthenticateOidcConfig != nil { - f0elemf1 := &svcapitypes.AuthenticateOIDCActionConfig{} - if f0iter.AuthenticateOidcConfig.AuthenticationRequestExtraParams != nil { - f0elemf1.AuthenticationRequestExtraParams = aws.StringMap(f0iter.AuthenticateOidcConfig.AuthenticationRequestExtraParams) - } - if f0iter.AuthenticateOidcConfig.AuthorizationEndpoint != nil { - f0elemf1.AuthorizationEndpoint = f0iter.AuthenticateOidcConfig.AuthorizationEndpoint - } - if f0iter.AuthenticateOidcConfig.ClientId != nil { - f0elemf1.ClientID = f0iter.AuthenticateOidcConfig.ClientId - } - if f0iter.AuthenticateOidcConfig.ClientSecret != nil { - f0elemf1.ClientSecret = f0iter.AuthenticateOidcConfig.ClientSecret - } - if f0iter.AuthenticateOidcConfig.Issuer != nil { - f0elemf1.Issuer = f0iter.AuthenticateOidcConfig.Issuer - } - if f0iter.AuthenticateOidcConfig.OnUnauthenticatedRequest != "" { - f0elemf1.OnUnauthenticatedRequest = aws.String(string(f0iter.AuthenticateOidcConfig.OnUnauthenticatedRequest)) - } - if f0iter.AuthenticateOidcConfig.Scope != nil { - f0elemf1.Scope = f0iter.AuthenticateOidcConfig.Scope - } - if f0iter.AuthenticateOidcConfig.SessionCookieName != nil { - f0elemf1.SessionCookieName = f0iter.AuthenticateOidcConfig.SessionCookieName - } - if f0iter.AuthenticateOidcConfig.SessionTimeout != nil { - f0elemf1.SessionTimeout = f0iter.AuthenticateOidcConfig.SessionTimeout - } - if f0iter.AuthenticateOidcConfig.TokenEndpoint != nil { - f0elemf1.TokenEndpoint = f0iter.AuthenticateOidcConfig.TokenEndpoint - } - if f0iter.AuthenticateOidcConfig.UseExistingClientSecret != nil { - f0elemf1.UseExistingClientSecret = f0iter.AuthenticateOidcConfig.UseExistingClientSecret - } - if f0iter.AuthenticateOidcConfig.UserInfoEndpoint != nil { - f0elemf1.UserInfoEndpoint = f0iter.AuthenticateOidcConfig.UserInfoEndpoint - } - f0elem.AuthenticateOIDCConfig = f0elemf1 - } - if f0iter.FixedResponseConfig != nil { - f0elemf2 := &svcapitypes.FixedResponseActionConfig{} - if f0iter.FixedResponseConfig.ContentType != nil { - f0elemf2.ContentType = f0iter.FixedResponseConfig.ContentType - } - if f0iter.FixedResponseConfig.MessageBody != nil { - f0elemf2.MessageBody = f0iter.FixedResponseConfig.MessageBody - } - if f0iter.FixedResponseConfig.StatusCode != nil { - f0elemf2.StatusCode = f0iter.FixedResponseConfig.StatusCode - } - f0elem.FixedResponseConfig = f0elemf2 - } - if f0iter.ForwardConfig != nil { - f0elemf3 := &svcapitypes.ForwardActionConfig{} - if f0iter.ForwardConfig.TargetGroupStickinessConfig != nil { - f0elemf3f0 := &svcapitypes.TargetGroupStickinessConfig{} - if f0iter.ForwardConfig.TargetGroupStickinessConfig.DurationSeconds != nil { - durationSecondsCopy := int64(*f0iter.ForwardConfig.TargetGroupStickinessConfig.DurationSeconds) - f0elemf3f0.DurationSeconds = &durationSecondsCopy - } - if f0iter.ForwardConfig.TargetGroupStickinessConfig.Enabled != nil { - f0elemf3f0.Enabled = f0iter.ForwardConfig.TargetGroupStickinessConfig.Enabled - } - f0elemf3.TargetGroupStickinessConfig = f0elemf3f0 - } - if f0iter.ForwardConfig.TargetGroups != nil { - f0elemf3f1 := []*svcapitypes.TargetGroupTuple{} - for _, f0elemf3f1iter := range f0iter.ForwardConfig.TargetGroups { - f0elemf3f1elem := &svcapitypes.TargetGroupTuple{} - if f0elemf3f1iter.TargetGroupArn != nil { - f0elemf3f1elem.TargetGroupARN = f0elemf3f1iter.TargetGroupArn - } - if f0elemf3f1iter.Weight != nil { - weightCopy := int64(*f0elemf3f1iter.Weight) - f0elemf3f1elem.Weight = &weightCopy - } - f0elemf3f1 = append(f0elemf3f1, f0elemf3f1elem) - } - f0elemf3.TargetGroups = f0elemf3f1 - } - f0elem.ForwardConfig = f0elemf3 - } - if f0iter.Order != nil { - orderCopy := int64(*f0iter.Order) - f0elem.Order = &orderCopy - } - if f0iter.RedirectConfig != nil { - f0elemf5 := &svcapitypes.RedirectActionConfig{} - if f0iter.RedirectConfig.Host != nil { - f0elemf5.Host = f0iter.RedirectConfig.Host - } - if f0iter.RedirectConfig.Path != nil { - f0elemf5.Path = f0iter.RedirectConfig.Path - } - if f0iter.RedirectConfig.Port != nil { - f0elemf5.Port = f0iter.RedirectConfig.Port - } - if f0iter.RedirectConfig.Protocol != nil { - f0elemf5.Protocol = f0iter.RedirectConfig.Protocol - } - if f0iter.RedirectConfig.Query != nil { - f0elemf5.Query = f0iter.RedirectConfig.Query - } - if f0iter.RedirectConfig.StatusCode != "" { - f0elemf5.StatusCode = aws.String(string(f0iter.RedirectConfig.StatusCode)) - } - f0elem.RedirectConfig = f0elemf5 - } - if f0iter.TargetGroupArn != nil { - f0elem.TargetGroupARN = f0iter.TargetGroupArn - } - if f0iter.Type != "" { - f0elem.Type = aws.String(string(f0iter.Type)) - } - f0 = append(f0, f0elem) - } - ko.Spec.Actions = f0 - } else { - ko.Spec.Actions = nil - } if elem.Conditions != nil { f1 := []*svcapitypes.RuleCondition{} for _, f1iter := range elem.Conditions {