Iter

Author: ajanikow

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
 - (Bugfix) Use Profile Annotations
 - (Bugfix) Improve Wait Procedure on AF
+- (Feature) (Platform) Generate GRPC Gateway Code
 
 ## [1.2.46](https://github.com/arangodb/kube-arangodb/tree/1.2.46) (2025-02-24)
 - (Bugfix) Clean Phase change properly during upgrade

pkg/util/errors/errors.go

@@ -98,6 +98,23 @@ func WithMessagef(err error, format string, args ...interface{}) error {
 	return errors.WithMessagef(err, format, args...)
 }
 
+func AnyOf(err error, targets ...error) bool {
+	if err == nil {
+		return false
+	}
+	for _, target := range targets {
+		if target == nil {
+			continue
+		}
+
+		if Is(err, target) {
+			return true
+		}
+	}
+
+	return false
+}
+
 func Is(err, target error) bool { return errors.Is(err, target) }
 
 func As(err error, target interface{}) bool { return errors.As(err, target) }

pkg/util/svc/starter.go

@@ -24,6 +24,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	goHttp "net/http"
 	"sync"
 	"time"
 
@@ -86,7 +87,7 @@ func (s *serviceStarter) runE(ctx context.Context, health Health, ln, http net.L
 			s.service.server.GracefulStop()
 		}()
 
-		if err := s.service.server.Serve(ln); err != nil && !errors.Is(err, grpc.ErrServerStopped) {
+		if err := s.service.server.Serve(ln); !errors.AnyOf(err, grpc.ErrServerStopped) {
 			serveError = err
 		}
 	}()
@@ -107,10 +108,8 @@ func (s *serviceStarter) runE(ctx context.Context, health Health, ln, http net.L
 			s.service.http.Close()
 		}()
 
-		if err := s.service.http.Serve(http); err != nil {
-			if !errors.Is(err, grpc.ErrServerStopped) {
-				serveError = err
-			}
+		if err := s.service.http.Serve(http); !errors.AnyOf(err, goHttp.ErrServerClosed) {
+			serveError = err
 		}
 	}()