diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index da1b7e7..fcea4de 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-06-10T23:41:29Z" - build_hash: e675923dfc54d8b6e09730098c3e3e1056d3c1e9 - go_version: go1.24.3 - version: v0.48.0 + build_date: "2025-07-15T01:30:17Z" + build_hash: 4640e4fbac38e133c51fc9a0c2ff49e57b1a4d13 + go_version: go1.24.4 + version: v0.48.0-4-g4640e4f api_directory_checksum: bcdceff2d7ddf7c98141572260ef2e6cee8bf23f api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/pkg/resource/table/hooks.go b/pkg/resource/table/hooks.go index cf29042..738a7e3 100644 --- a/pkg/resource/table/hooks.go +++ b/pkg/resource/table/hooks.go @@ -471,10 +471,6 @@ func (rm *resourceManager) setResourceAdditionalFields( } else { ko.Spec.ContinuousBackups = pitrSpec } - - if err = rm.setContributorInsights(ctx, ko); err != nil { - return err - } return nil } diff --git a/pkg/resource/table/sdk.go b/pkg/resource/table/sdk.go index da0cc68..3657409 100644 --- a/pkg/resource/table/sdk.go +++ b/pkg/resource/table/sdk.go @@ -447,13 +447,17 @@ func (rm *resourceManager) sdkFind( if !canUpdateTableGSIs(&resource{ko}) { return &resource{ko}, requeueWaitGSIReady } - if err := rm.setResourceAdditionalFields(ctx, ko); err != nil { - return nil, err + if err = rm.setContributorInsights(ctx, ko); err != nil { + return &resource{ko}, err } if isTableUpdating(&resource{ko}) || isTableContributorInsightsUpdating(&resource{ko}) { return &resource{ko}, requeueWaitWhileUpdating } + if err := rm.setResourceAdditionalFields(ctx, ko); err != nil { + return nil, err + } + return &resource{ko}, nil } @@ -804,16 +808,9 @@ func (rm *resourceManager) sdkCreate( } rm.setStatusDefaults(ko) - if desired.ko.Spec.TimeToLive != nil { - if err := rm.syncTTL(ctx, desired, &resource{ko}); err != nil { - return nil, err - } - } - - if desired.ko.Spec.ContributorInsights != nil { - if err := rm.updateContributorInsights(ctx, desired); err != nil { - return nil, err - } + // handle in sdkUpdate, to give resource time until it creates + if desired.ko.Spec.TimeToLive != nil || desired.ko.Spec.ContributorInsights != nil { + ackcondition.SetSynced(&resource{ko}, corev1.ConditionFalse, nil, nil) } return &resource{ko}, nil diff --git a/templates/hooks/table/sdk_create_post_set_output.go.tpl b/templates/hooks/table/sdk_create_post_set_output.go.tpl index 8b777b5..3d9dbed 100644 --- a/templates/hooks/table/sdk_create_post_set_output.go.tpl +++ b/templates/hooks/table/sdk_create_post_set_output.go.tpl @@ -1,11 +1,4 @@ - if desired.ko.Spec.TimeToLive != nil { - if err := rm.syncTTL(ctx, desired, &resource{ko}); err != nil { - return nil, err - } - } - - if desired.ko.Spec.ContributorInsights != nil { - if err := rm.updateContributorInsights(ctx, desired); err != nil { - return nil, err - } + // handle in sdkUpdate, to give resource time until it creates + if desired.ko.Spec.TimeToLive != nil || desired.ko.Spec.ContributorInsights != nil { + ackcondition.SetSynced(&resource{ko}, corev1.ConditionFalse, nil, nil) } diff --git a/templates/hooks/table/sdk_read_one_post_set_output.go.tpl b/templates/hooks/table/sdk_read_one_post_set_output.go.tpl index 8ed5041..a3f6c5a 100644 --- a/templates/hooks/table/sdk_read_one_post_set_output.go.tpl +++ b/templates/hooks/table/sdk_read_one_post_set_output.go.tpl @@ -60,9 +60,13 @@ if !canUpdateTableGSIs(&resource{ko}) { return &resource{ko}, requeueWaitGSIReady } - if err := rm.setResourceAdditionalFields(ctx, ko); err != nil { - return nil, err + if err = rm.setContributorInsights(ctx, ko); err != nil { + return &resource{ko}, err } if isTableUpdating(&resource{ko}) || isTableContributorInsightsUpdating(&resource{ko}) { return &resource{ko}, requeueWaitWhileUpdating } + + if err := rm.setResourceAdditionalFields(ctx, ko); err != nil { + return nil, err + }