Skip to content

Commit cbb4562

Browse files
GT-228 Update arangosync-client package for new API capabilities and better HTTP handling (#1234)
1 parent f124f5f commit cbb4562

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- (Feature) CreationFailed ArangoMember Phase
77
- (Bugfix) Fix Rebalancer NPE in case if member is missing in Status
88
- (Feature) SilentRotation High plan
9+
- (Improvement) Update arangosync-client package for new API capabilities and better HTTP handling
910

1011
## [1.2.24](https://github.com/arangodb/kube-arangodb/tree/1.2.24) (2023-01-25)
1112
- (Bugfix) Fix deployment creation on ARM64

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ replace (
2424

2525
require (
2626
github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680
27-
github.com/arangodb/arangosync-client v0.8.0
28-
github.com/arangodb/go-driver v1.2.1
27+
github.com/arangodb/arangosync-client v0.9.0
28+
github.com/arangodb/go-driver v1.4.1
2929
github.com/arangodb/go-driver/v2 v2.0.0-20211021031401-d92dcd5a4c83
3030
github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21
3131
github.com/cenkalti/backoff v2.2.1+incompatible

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680 h1
6363
github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680/go.mod h1:xDyzBwyYzcEhsaDXtmxCNM4p5BrtuoVYYsRTuJqmCeg=
6464
github.com/arangodb/arangosync-client v0.8.0 h1:lZzT8ERzkAZWjCZR7HUoTFjAep6KcpNsioWE6t+0ggQ=
6565
github.com/arangodb/arangosync-client v0.8.0/go.mod h1:TwzM8ll85P4Iu+MRq3BTUwsMLDOoaPREKDnwvyRS+70=
66+
github.com/arangodb/arangosync-client v0.8.1-0.20230120154617-a4ae374af8cd h1:CIrFed1D1Y8+yYqt4LEFltYdI12ZeDcpwz/OaYhNnCg=
67+
github.com/arangodb/arangosync-client v0.8.1-0.20230120154617-a4ae374af8cd/go.mod h1:kU2UaOkv2AeHLAFMEo4Ug3qLbUQVKOuRtkfr6pZqmuk=
68+
github.com/arangodb/arangosync-client v0.9.0 h1:XhY+5gGGpl9Gk8Prqmdv0SpK3HydFUXvN2CmTIKUxKI=
69+
github.com/arangodb/arangosync-client v0.9.0/go.mod h1:kU2UaOkv2AeHLAFMEo4Ug3qLbUQVKOuRtkfr6pZqmuk=
6670
github.com/arangodb/go-driver v1.2.1 h1:HREDHhDmzdIWxHmfkfTESbYUnRjESjPh4WUuXq7FZa8=
6771
github.com/arangodb/go-driver v1.2.1/go.mod h1:zdDkJJnCj8DAkfbtIjIXnsTrWIiy6VhP3Vy14p+uQeY=
6872
github.com/arangodb/go-driver/v2 v2.0.0-20211021031401-d92dcd5a4c83 h1:PCbi3alUFastUw6InBKGEXqniveJJcQuMYspubJMRS8=

pkg/replication/finalizers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DISCLAIMER
33
//
4-
// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
4+
// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -151,7 +151,7 @@ func (dr *DeploymentReplication) inspectFinalizerDeplReplStopSync(ctx context.Co
151151
}
152152

153153
// Get status from sync master.
154-
syncInfo, err := destClient.Master().Status(ctx)
154+
syncInfo, err := destClient.Master().Status(ctx, client.GetSyncStatusDetailsShort)
155155
if err != nil {
156156
return false, errors.WithMessage(err, "Failed to get status from target master")
157157
}

pkg/replication/sync_inspector.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DISCLAIMER
33
//
4-
// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
4+
// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@ func (dr *DeploymentReplication) inspectDeploymentReplication(lastInterval time.
8585
if err != nil {
8686
dr.log.Err(err).Warn("Failed to fetch endpoints from destination syncmaster")
8787
}
88-
destStatus, err := destClient.Master().Status(ctx)
88+
destStatus, err := destClient.Master().Status(ctx, client.GetSyncStatusDetailsFull)
8989
if err != nil {
9090
dr.log.Err(err).Warn("Failed to fetch status from destination syncmaster")
9191
} else {
@@ -126,7 +126,7 @@ func (dr *DeploymentReplication) inspectDeploymentReplication(lastInterval time.
126126
if err != nil {
127127
dr.log.Err(err).Warn("Failed to create source syncmaster client")
128128
} else {
129-
sourceStatus, err := sourceClient.Master().Status(ctx)
129+
sourceStatus, err := sourceClient.Master().Status(ctx, client.GetSyncStatusDetailsShort)
130130
if err != nil {
131131
dr.log.Err(err).Warn("Failed to fetch status from source syncmaster")
132132
}

0 commit comments

Comments
 (0)