[Maintenance] Update go-driver version to v1.6.0 - GT-505 (#1443)

nikita-vanyasin · web-flow · commit 7816a9cd075f · 2023-10-17T13:16:06.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - (Maintenance) Make scale_down_candidate annotation obsolete
 - (Bugfix) Fix ResignJob ID propagation
 - (Bugfix) Allow shards with RF1 in EnforcedResignLeadership action
+- (Maintenance) Update go-driver to v1.6.0, update IsNotFound() checks
  
 ## [1.2.33](https://github.com/arangodb/kube-arangodb/tree/1.2.33) (2023-09-27)
 - (Maintenance) Bump golang.org/x/net to v0.13.0
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/arangodb/kube-arangodb
 go 1.20
 
 replace (
-	github.com/arangodb/go-driver => github.com/arangodb/go-driver v1.2.1
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.46.0
 	github.com/prometheus-operator/prometheus-operator/pkg/client => github.com/prometheus-operator/prometheus-operator/pkg/client v0.46.0
 	github.com/stretchr/testify => github.com/stretchr/testify v1.5.1
diff --git a/go.sum b/go.sum
@@ -76,8 +76,8 @@ github.com/arangodb-helper/go-helper v0.4.2 h1:Ekf8EtPYQdhlwtqJAEn17i7zbtuavksWa
 github.com/arangodb-helper/go-helper v0.4.2/go.mod h1:RHgEwQTFWdJ9wFDGUCgUZzaz9NLaFUskSsHgOPM5XR4=
 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 v1.6.0 h1:NFWj/idqXZxhFVueihMSI2R9NotNIsgvNfM/xmpekb4=
+github.com/arangodb/go-driver v1.6.0/go.mod h1:HQmdGkvNMVBTE3SIPSQ8T/ZddC6iwNsfMR+dDJQxIsI=
 github.com/arangodb/go-driver/v2 v2.0.0-20230616090327-3b9171814ae4 h1:LpIIPBcrbZ/mVDG2ioZN92Pbgb5HQ2Vnqj/UaQAyN4E=
 github.com/arangodb/go-driver/v2 v2.0.0-20230616090327-3b9171814ae4/go.mod h1:bnCd24JXOgd5rpG8uwSpHPsF6NCcH4m6rKtKh1EJ7Lo=
 github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21 h1:+W7D5ttxi/Ygh/39vialtypE23p9KI7P0J2qtoqUV4w=
@@ -134,7 +134,6 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-iptables v0.4.3/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
 github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -309,7 +308,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
diff --git a/pkg/deployment/reconcile/action_bootstrap_set_password.go b/pkg/deployment/reconcile/action_bootstrap_set_password.go
@@ -107,7 +107,7 @@ func (a actionBootstrapSetPassword) setUserPassword(ctx context.Context, user, s
 	ctxChild, cancel := globals.GetGlobalTimeouts().ArangoD().WithTimeout(ctx)
 	defer cancel()
 	if u, err := client.User(ctxChild, user); err != nil {
-		if !driver.IsNotFound(err) {
+		if !driver.IsNotFoundGeneral(err) {
 			return "", err
 		}
 
diff --git a/pkg/deployment/reconcile/action_cleanout_member.go b/pkg/deployment/reconcile/action_cleanout_member.go
@@ -81,7 +81,7 @@ func (a *actionCleanOutMember) Start(ctx context.Context) (bool, error) {
 	var jobID string
 	ctxJobID := driver.WithJobIDResponse(ctxChild, &jobID)
 	if err := cluster.CleanOutServer(ctxJobID, a.action.MemberID); err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			// Member not found, it could be that it never connected to the cluster
 			return true, nil
 		}
diff --git a/pkg/deployment/reconcile/action_remove_member.go b/pkg/deployment/reconcile/action_remove_member.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ func (a *actionRemoveMember) Start(ctx context.Context) (bool, error) {
 		ctxChild, cancel := globals.GetGlobalTimeouts().ArangoD().WithTimeout(ctx)
 		defer cancel()
 		if err := arangod.RemoveServerFromCluster(ctxChild, client.Connection(), driver.ServerID(m.ID)); err != nil {
-			if !driver.IsNotFound(err) && !driver.IsPreconditionFailed(err) {
+			if !driver.IsNotFoundGeneral(err) && !driver.IsPreconditionFailed(err) {
 				a.log.Err(err).Str("member-id", m.ID).Error("Failed to remove server from cluster")
 				// ignore this error, maybe all coordinators are failed and no connection to cluster is possible
 			} else if driver.IsPreconditionFailed(err) {
diff --git a/pkg/handlers/backup/arango_client_impl.go b/pkg/handlers/backup/arango_client_impl.go
@@ -232,7 +232,7 @@ func (ac *arangoClientBackupImpl) Progress(jobID driver.BackupTransferJobID) (Ar
 func (ac *arangoClientBackupImpl) Exists(backupID driver.BackupID) (bool, error) {
 	_, err := ac.Get(backupID)
 	if err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			return false, nil
 		}
 
diff --git a/pkg/handlers/backup/state_create.go b/pkg/handlers/backup/state_create.go
@@ -49,7 +49,7 @@ func stateCreateHandler(h *handler, backup *backupApi.ArangoBackup) (*backupApi.
 
 	backupMeta, err := client.Get(response.ID)
 	if err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			return wrapUpdateStatus(backup,
 				updateStatusState(backupApi.ArangoBackupStateFailed,
 					"backup is not present after creation"),
diff --git a/pkg/handlers/backup/state_downloading.go b/pkg/handlers/backup/state_downloading.go
@@ -54,7 +54,7 @@ func stateDownloadingHandler(h *handler, backup *backupApi.ArangoBackup) (*backu
 
 	details, err := client.Progress(driver.BackupTransferJobID(backup.Status.Progress.JobID))
 	if err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			return wrapUpdateStatus(backup,
 				updateStatusState(backupApi.ArangoBackupStateDownloadError,
 					"job with id %s does not exist anymore", backup.Status.Progress.JobID),
@@ -76,7 +76,7 @@ func stateDownloadingHandler(h *handler, backup *backupApi.ArangoBackup) (*backu
 	if details.Completed {
 		backupMeta, err := client.Get(driver.BackupID(backup.Spec.Download.ID))
 		if err != nil {
-			if driver.IsNotFound(err) {
+			if driver.IsNotFoundGeneral(err) {
 				return wrapUpdateStatus(backup,
 					updateStatusState(backupApi.ArangoBackupStateDownloadError,
 						"backup is not present after download"),
diff --git a/pkg/handlers/backup/state_ready.go b/pkg/handlers/backup/state_ready.go
@@ -46,7 +46,7 @@ func stateReadyHandler(h *handler, backup *backupApi.ArangoBackup) (*backupApi.A
 
 	backupMeta, err := client.Get(driver.BackupID(backup.Status.Backup.ID))
 	if err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			return wrapUpdateStatus(backup,
 				updateStatusState(backupApi.ArangoBackupStateDeleted, ""),
 				updateStatusAvailable(false),
diff --git a/pkg/handlers/backup/state_unavailable.go b/pkg/handlers/backup/state_unavailable.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ func stateUnavailableHandler(h *handler, backup *backupApi.ArangoBackup) (*backu
 
 	backupMeta, err := client.Get(driver.BackupID(backup.Status.Backup.ID))
 	if err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			return wrapUpdateStatus(backup,
 				updateStatusState(backupApi.ArangoBackupStateDeleted, ""),
 				updateStatusAvailable(false),
diff --git a/pkg/handlers/backup/state_upload.go b/pkg/handlers/backup/state_upload.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ func stateUploadHandler(h *handler, backup *backupApi.ArangoBackup) (*backupApi.
 
 	meta, err := client.Get(driver.BackupID(backup.Status.Backup.ID))
 	if err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			return wrapUpdateStatus(backup,
 				updateStatusState(backupApi.ArangoBackupStateDeleted, ""),
 				updateStatusAvailable(false),
diff --git a/pkg/handlers/backup/state_uploading.go b/pkg/handlers/backup/state_uploading.go
@@ -50,7 +50,7 @@ func stateUploadingHandler(h *handler, backup *backupApi.ArangoBackup) (*backupA
 
 	details, err := client.Progress(driver.BackupTransferJobID(backup.Status.Progress.JobID))
 	if err != nil {
-		if driver.IsNotFound(err) {
+		if driver.IsNotFoundGeneral(err) {
 			return wrapUpdateStatus(backup,
 				updateStatusState(backupApi.ArangoBackupStateUploadError,
 					"job with id %s does not exist anymore", backup.Status.Progress.JobID),

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (a actionBootstrapSetPassword) setUserPassword(ctx context.Context, user, s`
`107`	`107`	`ctxChild, cancel := globals.GetGlobalTimeouts().ArangoD().WithTimeout(ctx)`
`108`	`108`	`defer cancel()`
`109`	`109`	`if u, err := client.User(ctxChild, user); err != nil {`
`110`		`- if !driver.IsNotFound(err) {`
	`110`	`+ if !driver.IsNotFoundGeneral(err) {`
`111`	`111`	`return "", err`
`112`	`112`	`}`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (a *actionCleanOutMember) Start(ctx context.Context) (bool, error) {`
`81`	`81`	`var jobID string`
`82`	`82`	`ctxJobID := driver.WithJobIDResponse(ctxChild, &jobID)`
`83`	`83`	`if err := cluster.CleanOutServer(ctxJobID, a.action.MemberID); err != nil {`
`84`		`- if driver.IsNotFound(err) {`
	`84`	`+ if driver.IsNotFoundGeneral(err) {`
`85`	`85`	`// Member not found, it could be that it never connected to the cluster`
`86`	`86`	`return true, nil`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ func (ac *arangoClientBackupImpl) Progress(jobID driver.BackupTransferJobID) (Ar`
`232`	`232`	`func (ac *arangoClientBackupImpl) Exists(backupID driver.BackupID) (bool, error) {`
`233`	`233`	`_, err := ac.Get(backupID)`
`234`	`234`	`if err != nil {`
`235`		`- if driver.IsNotFound(err) {`
	`235`	`+ if driver.IsNotFoundGeneral(err) {`
`236`	`236`	`return false, nil`
`237`	`237`	`}`
`238`	`238`