Update arangosync-client package for new API capabilities and better …

…HTTP handling
arangodb · Jan 22, 2023 · 6b8c251 · 6b8c251
1 parent 57b6ad0
commit 6b8c251
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - (DebugPackage) Add Agency Dump & State
 - (Bugfix) Fix After leaked GoRoutines
 - (Bugfix) Ensure proper ArangoDeployment Spec usage in ArangoSync
+- (Improvement) Update arangosync-client package for new API capabilities and better HTTP handling
 
 ## [1.2.23](https://github.com/arangodb/kube-arangodb/tree/1.2.23) (2023-01-12)
 - (Bugfix) Remove PDBs if group count is 0

diff --git a/go.mod b/go.mod
@@ -24,8 +24,8 @@ replace (
 
 require (
 	github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680
-	github.com/arangodb/arangosync-client v0.8.0
-	github.com/arangodb/go-driver v1.2.1
+	github.com/arangodb/arangosync-client v0.9.0
+	github.com/arangodb/go-driver v1.4.1
 	github.com/arangodb/go-driver/v2 v2.0.0-20211021031401-d92dcd5a4c83
 	github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21
 	github.com/cenkalti/backoff v2.2.1+incompatible

diff --git a/go.sum b/go.sum
@@ -63,6 +63,10 @@ github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680 h1
 github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680/go.mod h1:xDyzBwyYzcEhsaDXtmxCNM4p5BrtuoVYYsRTuJqmCeg=
 github.com/arangodb/arangosync-client v0.8.0 h1:lZzT8ERzkAZWjCZR7HUoTFjAep6KcpNsioWE6t+0ggQ=
 github.com/arangodb/arangosync-client v0.8.0/go.mod h1:TwzM8ll85P4Iu+MRq3BTUwsMLDOoaPREKDnwvyRS+70=
+github.com/arangodb/arangosync-client v0.8.1-0.20230120154617-a4ae374af8cd h1:CIrFed1D1Y8+yYqt4LEFltYdI12ZeDcpwz/OaYhNnCg=
+github.com/arangodb/arangosync-client v0.8.1-0.20230120154617-a4ae374af8cd/go.mod h1:kU2UaOkv2AeHLAFMEo4Ug3qLbUQVKOuRtkfr6pZqmuk=
+github.com/arangodb/arangosync-client v0.9.0 h1:XhY+5gGGpl9Gk8Prqmdv0SpK3HydFUXvN2CmTIKUxKI=
+github.com/arangodb/arangosync-client v0.9.0/go.mod h1:kU2UaOkv2AeHLAFMEo4Ug3qLbUQVKOuRtkfr6pZqmuk=
 github.com/arangodb/go-driver v1.2.1 h1:HREDHhDmzdIWxHmfkfTESbYUnRjESjPh4WUuXq7FZa8=
 github.com/arangodb/go-driver v1.2.1/go.mod h1:zdDkJJnCj8DAkfbtIjIXnsTrWIiy6VhP3Vy14p+uQeY=
 github.com/arangodb/go-driver/v2 v2.0.0-20211021031401-d92dcd5a4c83 h1:PCbi3alUFastUw6InBKGEXqniveJJcQuMYspubJMRS8=

diff --git a/pkg/replication/finalizers.go b/pkg/replication/finalizers.go
@@ -151,7 +151,7 @@ func (dr *DeploymentReplication) inspectFinalizerDeplReplStopSync(ctx context.Co
 	}
 
 	// Get status from sync master.
-	syncInfo, err := destClient.Master().Status(ctx)
+	syncInfo, err := destClient.Master().Status(ctx, client.GetSyncStatusDetailsShort)
 	if err != nil {
 		return false, errors.WithMessage(err, "Failed to get status from target master")
 	}

diff --git a/pkg/replication/sync_inspector.go b/pkg/replication/sync_inspector.go
@@ -85,7 +85,7 @@ func (dr *DeploymentReplication) inspectDeploymentReplication(lastInterval time.
 			if err != nil {
 				dr.log.Err(err).Warn("Failed to fetch endpoints from destination syncmaster")
 			}
-			destStatus, err := destClient.Master().Status(ctx)
+			destStatus, err := destClient.Master().Status(ctx, client.GetSyncStatusDetailsFull)
 			if err != nil {
 				dr.log.Err(err).Warn("Failed to fetch status from destination syncmaster")
 			} else {
@@ -126,7 +126,7 @@ func (dr *DeploymentReplication) inspectDeploymentReplication(lastInterval time.
 			if err != nil {
 				dr.log.Err(err).Warn("Failed to create source syncmaster client")
 			} else {
-				sourceStatus, err := sourceClient.Master().Status(ctx)
+				sourceStatus, err := sourceClient.Master().Status(ctx, client.GetSyncStatusDetailsShort)
 				if err != nil {
 					dr.log.Err(err).Warn("Failed to fetch status from source syncmaster")
 				}