fix: waiter for rabbitmq

- Adapted tests
- Update CHANGELOG.md

Author: marceljk

CHANGELOG.md

@@ -9,6 +9,8 @@
   - **Bugfix:** `PartialUpdateInstanceWaitHandler` does not finish when update is succeeded
 - `redis`: [v0.21.2](services/redis/CHANGELOG.md#v0212-2025-04-01)
   - **Bugfix:** `PartialUpdateInstanceWaitHandler` does not finish when update is succeeded
+- `rabbitmq`: [v0.21.2](services/rabbitmq/CHANGELOG.md#v0212-2025-04-01)
+  - **Bugfix:** `PartialUpdateInstanceWaitHandler` does not finish when update is succeeded
 
 
 

services/rabbitmq/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.21.2 (2025-04-01)
+- **Bugfix:** `PartialUpdateInstanceWaitHandler` does not finish when update is succeeded
+
 ## v0.21.1 (2025-03-19)
 - **Internal:** Backwards compatible change to generated code
 

services/rabbitmq/wait/wait.go

@@ -13,11 +13,14 @@ import (
 )
 
 const (
-	InstanceStateSuccess = "succeeded"
-	InstanceStateFailed  = "failed"
-	InstanceTypeCreate   = "create"
-	InstanceTypeUpdate   = "update"
-	InstanceTypeDelete   = "delete"
+	InstanceStatusActive   = "active"
+	InstanceStatusFailed   = "failed"
+	InstanceStatusDeleting = "deleting"
+	InstanceStateSuccess   = "succeeded"
+	InstanceStateFailed    = "failed"
+	InstanceTypeCreate     = "create"
+	InstanceTypeUpdate     = "update"
+	InstanceTypeDelete     = "delete"
 )
 
 // Interface needed for tests
@@ -37,14 +40,18 @@ func CreateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface
 		if err != nil {
 			return false, nil, err
 		}
-		if s.InstanceId == nil || s.LastOperation == nil || s.LastOperation.Type == nil || s.LastOperation.State == nil {
-			return false, nil, fmt.Errorf("create failed for instance with id %s. The response is not valid: the instance id, the last operation type or the state are missing", instanceId)
+		if s.InstanceId == nil || s.Status == nil {
+			return false, nil, fmt.Errorf("create failed for instance with id %s. The response is not valid: the instance id or the status are missing", instanceId)
 		}
-		if *s.InstanceId == instanceId && *s.LastOperation.Type == InstanceTypeCreate && *s.LastOperation.State == InstanceStateSuccess {
+		if *s.InstanceId == instanceId && *s.Status == InstanceStatusActive {
 			return true, s, nil
 		}
-		if *s.InstanceId == instanceId && *s.LastOperation.Type == InstanceTypeCreate && *s.LastOperation.State == InstanceStateFailed {
-			return true, s, fmt.Errorf("create failed for instance with id %s: %s", instanceId, *s.LastOperation.Description)
+		if *s.InstanceId == instanceId && *s.Status == InstanceStatusFailed {
+			var failedDescription string
+			if s.LastOperation != nil && s.LastOperation.Description != nil {
+				failedDescription = *s.LastOperation.Description
+			}
+			return true, s, fmt.Errorf("create failed for instance with id %s: %s", instanceId, failedDescription)
 		}
 		return false, nil, nil
 	})
@@ -59,14 +66,18 @@ func PartialUpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceIn
 		if err != nil {
 			return false, nil, err
 		}
-		if s.InstanceId == nil || s.LastOperation == nil || s.LastOperation.Type == nil || s.LastOperation.State == nil {
+		if s.InstanceId == nil || s.Status == nil {
 			return false, nil, fmt.Errorf("update failed for instance with id %s. The response is not valid: the instance id, the last operation type or the state are missing", instanceId)
 		}
-		if *s.InstanceId == instanceId && *s.LastOperation.Type == InstanceTypeUpdate && *s.LastOperation.State == InstanceStateSuccess {
+		if *s.InstanceId == instanceId && *s.Status == InstanceStatusActive {
 			return true, s, nil
 		}
-		if *s.InstanceId == instanceId && *s.LastOperation.Type == InstanceTypeUpdate && *s.LastOperation.State == InstanceStateFailed {
-			return true, s, fmt.Errorf("update failed for instance with id %s: %s", instanceId, *s.LastOperation.Description)
+		if *s.InstanceId == instanceId && *s.Status == InstanceStatusFailed {
+			var failedDescription string
+			if s.LastOperation != nil && s.LastOperation.Description != nil {
+				failedDescription = *s.LastOperation.Description
+			}
+			return true, s, fmt.Errorf("update failed for instance with id %s: %s", instanceId, failedDescription)
 		}
 		return false, nil, nil
 	})
@@ -79,10 +90,10 @@ func DeleteInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface
 	handler := wait.New(func() (waitFinished bool, response *struct{}, err error) {
 		s, err := a.GetInstanceExecute(ctx, projectId, instanceId)
 		if err == nil {
-			if s.LastOperation == nil || s.LastOperation.Type == nil || s.LastOperation.State == nil || s.LastOperation.Description == nil {
-				return false, nil, fmt.Errorf("delete failed for instance with id %s. The response is not valid: The last operation type, description or the state are missing", instanceId)
+			if s.LastOperation == nil || s.Status == nil || s.LastOperation.State == nil || s.LastOperation.Description == nil {
+				return false, nil, fmt.Errorf("delete failed for instance with id %s. The response is not valid: The status, last operation type, description or the state are missing", instanceId)
 			}
-			if *s.LastOperation.Type != InstanceTypeDelete {
+			if *s.Status != InstanceStatusDeleting {
 				return false, nil, nil
 			}
 			if *s.LastOperation.State == InstanceStateSuccess {

services/rabbitmq/wait/wait_test.go

@@ -21,12 +21,6 @@ type apiClientInstanceMocked struct {
 	resourceDescription        string
 }
 
-var (
-	instanceTypeCreate = InstanceTypeCreate
-	instanceTypeUpdate = InstanceTypeUpdate
-	instanceTypeDelete = InstanceTypeDelete
-)
-
 func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _ string) (*rabbitmq.Instance, error) {
 	if a.getFails {
 		return nil, &oapierror.GenericOpenAPIError{
@@ -37,6 +31,7 @@ func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _ str
 		if a.deletionSucceedsWithErrors {
 			return &rabbitmq.Instance{
 				InstanceId: &a.resourceId,
+				Status:     &a.resourceState,
 				LastOperation: &rabbitmq.InstanceLastOperation{
 					Description: &a.resourceDescription,
 					Type:        a.resourceOperation,
@@ -51,11 +46,7 @@ func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _ str
 
 	return &rabbitmq.Instance{
 		InstanceId: &a.resourceId,
-		LastOperation: &rabbitmq.InstanceLastOperation{
-			Description: &a.resourceDescription,
-			Type:        a.resourceOperation,
-			State:       &a.resourceState,
-		},
+		Status:     utils.Ptr(a.resourceState),
 	}, nil
 }
 
@@ -96,14 +87,14 @@ func TestCreateInstanceWaitHandler(t *testing.T) {
 		{
 			desc:          "create_succeeded",
 			getFails:      false,
-			resourceState: InstanceStateSuccess,
+			resourceState: InstanceStatusActive,
 			wantErr:       false,
 			wantResp:      true,
 		},
 		{
 			desc:          "create_failed",
 			getFails:      false,
-			resourceState: InstanceStateFailed,
+			resourceState: InstanceStatusFailed,
 			wantErr:       true,
 			wantResp:      true,
 		},
@@ -128,19 +119,15 @@ func TestCreateInstanceWaitHandler(t *testing.T) {
 			apiClient := &apiClientInstanceMocked{
 				getFails:          tt.getFails,
 				resourceId:        instanceId,
-				resourceOperation: &instanceTypeCreate,
+				resourceOperation: utils.Ptr(InstanceTypeCreate),
 				resourceState:     tt.resourceState,
 			}
 
 			var wantRes *rabbitmq.Instance
 			if tt.wantResp {
 				wantRes = &rabbitmq.Instance{
 					InstanceId: &instanceId,
-					LastOperation: &rabbitmq.InstanceLastOperation{
-						Type:        &instanceTypeCreate,
-						State:       utils.Ptr(tt.resourceState),
-						Description: utils.Ptr(""),
-					},
+					Status:     utils.Ptr(tt.resourceState),
 				}
 			}
 
@@ -170,14 +157,14 @@ func TestUpdateInstanceWaitHandler(t *testing.T) {
 		{
 			desc:          "update_succeeded",
 			getFails:      false,
-			resourceState: InstanceStateSuccess,
+			resourceState: InstanceStatusActive,
 			wantErr:       false,
 			wantResp:      true,
 		},
 		{
 			desc:          "update_failed",
 			getFails:      false,
-			resourceState: InstanceStateFailed,
+			resourceState: InstanceStatusFailed,
 			wantErr:       true,
 			wantResp:      true,
 		},
@@ -202,19 +189,15 @@ func TestUpdateInstanceWaitHandler(t *testing.T) {
 			apiClient := &apiClientInstanceMocked{
 				getFails:          tt.getFails,
 				resourceId:        instanceId,
-				resourceOperation: &instanceTypeUpdate,
+				resourceOperation: utils.Ptr(InstanceTypeUpdate),
 				resourceState:     tt.resourceState,
 			}
 
 			var wantRes *rabbitmq.Instance
 			if tt.wantResp {
 				wantRes = &rabbitmq.Instance{
 					InstanceId: &instanceId,
-					LastOperation: &rabbitmq.InstanceLastOperation{
-						Type:        &instanceTypeUpdate,
-						State:       utils.Ptr(tt.resourceState),
-						Description: utils.Ptr(""),
-					},
+					Status:     utils.Ptr(tt.resourceState),
 				}
 			}
 
@@ -278,7 +261,7 @@ func TestDeleteInstanceWaitHandler(t *testing.T) {
 				getFails:                   tt.getFails,
 				deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors,
 				resourceId:                 instanceId,
-				resourceOperation:          &instanceTypeDelete,
+				resourceOperation:          utils.Ptr(InstanceTypeDelete),
 				resourceDescription:        tt.resourceDescription,
 				resourceState:              tt.resourceState,
 			}