handle autotuneOption progress states

Author: michaelhtm

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2025-05-01T21:10:59Z"
-  build_hash: f0e8616acf8e1aabb66c73da53b041f9b4b63679
+  build_date: "2025-05-02T18:40:01Z"
+  build_hash: f8dc5330705b3752ce07dce0ac831161fd4cb14f
   go_version: go1.24.1
-  version: v0.44.0-4-gf0e8616
+  version: v0.45.0
 api_directory_checksum: 13af9d3a7962f45a46b4bedaca965631b194a9a8
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6

pkg/resource/domain/hooks.go

@@ -16,6 +16,7 @@ package domain
 import (
 	"context"
 	"errors"
+	"fmt"
 	"strings"
 
 	"github.com/aws-controllers-k8s/opensearchservice-controller/apis/v1alpha1"
@@ -48,6 +49,22 @@ func domainProcessing(r *resource) bool {
 	return *r.ko.Status.Processing
 }
 
+func isAutoTuneOptionReady(autoTuneOption *svcsdktypes.AutoTuneOptionsOutput) (bool, error) {
+	switch autoTuneOption.State {
+	case svcsdktypes.AutoTuneStateEnabled, svcsdktypes.AutoTuneStateDisabled:
+		return true, nil
+
+	case svcsdktypes.AutoTuneStateError:
+		if autoTuneOption.ErrorMessage != nil {
+			return false, fmt.Errorf("error: %s", *autoTuneOption.ErrorMessage)
+		}
+		return false, fmt.Errorf("there is an error when updating AutoTuneOptions")
+
+	default:
+		return false, nil
+	}
+}
+
 // isAutoTuneSupported returns true if instance type supports AutoTune
 // https://docs.aws.amazon.com/opensearch-service/latest/developerguide/supported-instance-types.html
 func isAutoTuneSupported(r *resource) bool {

pkg/resource/domain/sdk.go

@@ -1,11 +1,10 @@
 	if resp.DomainStatus.AutoTuneOptions != nil {
-		if resp.DomainStatus.AutoTuneOptions.State == svcsdktypes.AutoTuneStateError && !isAutoTuneSupported(&resource{ko}) {
-			// t2,t3 instances does not support AutoTuneOptions.DesiredState: DISABLED
-			// set value manually to remove delta
-			ko.Spec.AutoTuneOptions.DesiredState = aws.String(string(svcsdktypes.AutoTuneStateDisabled))
-		} else {
-			ko.Spec.AutoTuneOptions.DesiredState = aws.String(string(resp.DomainStatus.AutoTuneOptions.State))
+		if ready, err := isAutoTuneOptionReady(resp.DomainStatus.AutoTuneOptions); err != nil {
+			return latest, ackrequeue.Needed(err)
+		} else if !ready {
+			return latest, ackrequeue.Needed(fmt.Errorf("waiting for AutotuneOptions to sync. Current state: ", resp.DomainStatus.AutoTuneOptions.State))
 		}
+		ko.Spec.AutoTuneOptions.DesiredState = aws.String(string(resp.DomainStatus.AutoTuneOptions.State))
 	}
 
 	if domainProcessing(&resource{ko}) {