Merge pull request #467 from #463-cassandra-repo

updated statement execute to have retry logic
motiv-labs · Mar 21, 2021 · 833d5d9 · 833d5d9
2 parents 3eb0f7e + eec06dc
commit 833d5d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/pkg/api/cassandra_repository.go b/pkg/api/cassandra_repository.go
@@ -136,17 +136,17 @@ func (r *CassandraRepository) FindAll() ([]*Definition, error) {
 
 	var savedDef string
 
-	for iter.Scan(&savedDef) {
+	err := iter.ScanAndClose(func() bool {
 		var definition *Definition
 		err := json.Unmarshal([]byte(savedDef), &definition)
 		if err != nil {
 			log.Errorf("error trying to unmarshal definition json: %v", err)
-			return nil, err
+			return false
 		}
 		results = append(results, definition)
-	}
+		return true
+	}, &savedDef)
 
-	err := iter.Close()
 	if err != nil {
 		log.Errorf("error getting all definitions: %v", err)
 	}

diff --git a/pkg/plugin/basic/cassandra_repository.go b/pkg/plugin/basic/cassandra_repository.go
@@ -29,14 +29,14 @@ func (r *CassandraRepository) FindAll() ([]*User, error) {
 	var username string
 	var password string
 
-	for iter.Scan(&username, &password) {
+	err := iter.ScanAndClose(func() bool {
 		var user User
 		user.Username = username
 		user.Password = password
 		results = append(results, &user)
-	}
+		return true
+	}, &username, &password)
 
-	err := iter.Close()
 	if err != nil {
 		log.Errorf("error getting all oauths: %v", err)
 	}
@@ -51,14 +51,11 @@ func (r *CassandraRepository) FindByUsername(username string) (*User, error) {
 
 	var user User
 
-	iter := r.session.GetSession().Query(
+	err := r.session.GetSession().Query(
 		"SELECT username, password " +
 			"FROM user " +
 			"WHERE username = ?",
-		username).Iter()
-
-	iter.Scan(&user.Username, &user.Password)
-	err := iter.Close()
+		username).Scan(&user.Username, &user.Password)
 
 	if err != nil {
 		log.Errorf("error selecting user %s: %v", username, err)

diff --git a/pkg/plugin/oauth2/cassandra_repository.go b/pkg/plugin/oauth2/cassandra_repository.go
@@ -26,17 +26,17 @@ func (r *CassandraRepository) FindAll() ([]*OAuth, error) {
 
 	var savedOauth string
 
-	for iter.Scan(&savedOauth) {
+	err := iter.ScanAndClose(func() bool {
 		var oauth *OAuth
 		err := json.Unmarshal([]byte(savedOauth), &oauth)
 		if err != nil {
 			log.Errorf("error trying to unmarshal oauth json: %v", err)
-			return nil, err
+			return false
 		}
 		results = append(results, oauth)
-	}
+		return true
+	}, &savedOauth)
 
-	err := iter.Close()
 	if err != nil {
 		log.Errorf("error getting all oauths: %v", err)
 	}