feat(alb): refactor wait handler (#6791)

relates to STACKITTPR-369

Author: marceljk

CHANGELOG.md

@@ -10,6 +10,9 @@
     - Minimal go version is now Go 1.25
   - [v0.14.1](services/alb/CHANGELOG.md#v0141) 
     - **Dependencies:** Bump STACKIT SDK core module from `v0.24.1` to `v0.25.0`
+  - [v0.14.2](services/alb/CHANGELOG.md#v0142)
+    - **Dependencies:** Bump STACKIT SDK core module from `v0.25.0` to `v0.26.0`
+    - `v2api`: **Improvement**: Use new `WaiterHandler` struct in the ALB WaitHandler
 - `albwaf`:
   - [v0.3.2](services/albwaf/CHANGELOG.md#v032) 
     - **Dependencies:** Bump STACKIT SDK core module from `v0.24.0` to `v0.24.1`

services/alb/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.14.2
+- **Dependencies:** Bump STACKIT SDK core module from `v0.25.0` to `v0.26.0`
+- `v2api`: **Improvement**: Use new `WaiterHandler` struct in the ALB WaitHandler
+
 ## v0.14.1
 - **Dependencies:** Bump STACKIT SDK core module from `v0.24.1` to `v0.25.0`
 

services/alb/VERSION

@@ -1 +1 @@
-v0.14.1
+v0.14.2

services/alb/go.mod

@@ -5,7 +5,7 @@ go 1.25
 require (
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
-	github.com/stackitcloud/stackit-sdk-go/core v0.25.0
+	github.com/stackitcloud/stackit-sdk-go/core v0.26.0
 )
 
 require github.com/golang-jwt/jwt/v5 v5.3.1 // indirect

services/alb/go.sum

@@ -4,5 +4,5 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/stackitcloud/stackit-sdk-go/core v0.25.0 h1:ra3VEk684MNoq741g+xbZrKjZzhyztq5liUAwwew4DY=
-github.com/stackitcloud/stackit-sdk-go/core v0.25.0/go.mod h1:WU1hhxnjXw2EV7CYa1nlEvNpMiRY6CvmIOaHuL3pOaA=
+github.com/stackitcloud/stackit-sdk-go/core v0.26.0 h1:jQEb9gkehfp6VCP6TcYk7BI10cz4l0KM2L6hqYBH2QA=
+github.com/stackitcloud/stackit-sdk-go/core v0.26.0/go.mod h1:WU1hhxnjXw2EV7CYa1nlEvNpMiRY6CvmIOaHuL3pOaA=

services/alb/v2api/wait/wait.go

@@ -3,11 +3,8 @@ package wait
 import (
 	"context"
 	"errors"
-	"fmt"
-	"net/http"
 	"time"
 
-	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 	"github.com/stackitcloud/stackit-sdk-go/core/wait"
 	alb "github.com/stackitcloud/stackit-sdk-go/services/alb/v2api"
 )
@@ -21,44 +18,43 @@ const (
 )
 
 func CreateOrUpdateLoadbalancerWaitHandler(ctx context.Context, client alb.DefaultAPI, projectId, region, name string) *wait.AsyncActionHandler[alb.LoadBalancer] {
-	handler := wait.New(func() (bool, *alb.LoadBalancer, error) {
-		response, err := client.GetLoadBalancer(ctx, projectId, region, name).Execute()
-		if err != nil {
-			return false, nil, err
-		}
-		if response.HasStatus() {
-			switch *response.Status {
-			case LOADBALANCERSTATUS_PENDING:
-				return false, nil, nil
-			case LOADBALANCERSTATUS_UNSPECIFIED:
-				return false, nil, nil
-			case LOADBALANCERSTATUS_ERROR:
-				return true, response, fmt.Errorf("loadbalancer in error: %s", *response.Status)
-			default:
-				return true, response, nil
+	waitConfig := wait.WaiterHelper[alb.LoadBalancer, string]{
+		FetchInstance: client.GetLoadBalancer(ctx, projectId, region, name).Execute,
+		GetState: func(response *alb.LoadBalancer) (string, error) {
+			if response == nil {
+				return "", errors.New("empty response")
 			}
-		}
+			if response.Status == nil {
+				return "", errors.New("status is missing in response")
+			}
+			return *response.Status, nil
+		},
+		ActiveState: []string{LOADBALANCERSTATUS_READY},
+		ErrorState:  []string{LOADBALANCERSTATUS_ERROR},
+	}
 
-		return false, nil, nil
-	})
+	handler := wait.New(waitConfig.Wait())
 	handler.SetTimeout(10 * time.Minute)
 	return handler
 }
 
 func DeleteLoadbalancerWaitHandler(ctx context.Context, client alb.DefaultAPI, projectId, region, name string) *wait.AsyncActionHandler[alb.LoadBalancer] {
-	handler := wait.New(func() (bool, *alb.LoadBalancer, error) {
-		_, err := client.GetLoadBalancer(ctx, projectId, region, name).Execute()
-		if err != nil {
-			var apiErr *oapierror.GenericOpenAPIError
-			if errors.As(err, &apiErr) {
-				if statusCode := apiErr.StatusCode; statusCode == http.StatusNotFound || statusCode == http.StatusGone {
-					return true, nil, nil
-				}
+	waitConfig := wait.WaiterHelper[alb.LoadBalancer, string]{
+		FetchInstance: client.GetLoadBalancer(ctx, projectId, region, name).Execute,
+		GetState: func(response *alb.LoadBalancer) (string, error) {
+			if response == nil {
+				return "", errors.New("empty response")
+			}
+			if response.Status == nil {
+				return "", errors.New("status is missing in response")
 			}
-			return true, nil, err
-		}
-		return false, nil, nil
-	})
+			return *response.Status, nil
+		},
+		ActiveState: []string{},
+		ErrorState:  []string{LOADBALANCERSTATUS_ERROR},
+	}
+
+	handler := wait.New(waitConfig.Wait())
 	handler.SetTimeout(10 * time.Minute)
 	return handler
 }

services/alb/v2api/wait/wait_test.go

@@ -102,8 +102,16 @@ func TestCreateOrUpdateLoadbalancerWaitHandler(t *testing.T) {
 			[]response{
 				{&alb.LoadBalancer{Status: utils.Ptr("bogus")}, nil},
 			},
-			&alb.LoadBalancer{Status: utils.Ptr("bogus")},
-			false,
+			nil,
+			true,
+		},
+		{
+			"no state",
+			[]response{
+				{&alb.LoadBalancer{Status: nil}, nil},
+			},
+			nil,
+			true,
 		},
 		// no special update tests needed as the states are the same
 	}