Pass context to Cassandra queries (#6954)

hashicorp · Jun 21, 2019 · c3e362b · c3e362b
1 parent eb13427
commit c3e362b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugins/database/cassandra/cassandra.go b/plugins/database/cassandra/cassandra.go
@@ -130,7 +130,7 @@ func (c *Cassandra) CreateUser(ctx context.Context, statements dbplugin.Statemen
 			err = session.Query(dbutil.QueryHelper(query, map[string]string{
 				"username": username,
 				"password": password,
-			})).Exec()
+			})).WithContext(ctx).Exec()
 			if err != nil {
 				for _, stmt := range rollbackCQL {
 					for _, query := range strutil.ParseArbitraryStringSlice(stmt, ";") {
@@ -141,7 +141,7 @@ func (c *Cassandra) CreateUser(ctx context.Context, statements dbplugin.Statemen
 
 						session.Query(dbutil.QueryHelper(query, map[string]string{
 							"username": username,
-						})).Exec()
+						})).WithContext(ctx).Exec()
 					}
 				}
 				return "", "", err
@@ -186,7 +186,7 @@ func (c *Cassandra) RevokeUser(ctx context.Context, statements dbplugin.Statemen
 
 			err := session.Query(dbutil.QueryHelper(query, map[string]string{
 				"username": username,
-			})).Exec()
+			})).WithContext(ctx).Exec()
 
 			result = multierror.Append(result, err)
 		}
@@ -226,7 +226,7 @@ func (c *Cassandra) RotateRootCredentials(ctx context.Context, statements []stri
 			err := session.Query(dbutil.QueryHelper(query, map[string]string{
 				"username": c.Username,
 				"password": password,
-			})).Exec()
+			})).WithContext(ctx).Exec()
 
 			result = multierror.Append(result, err)
 		}

diff --git a/plugins/database/cassandra/connection_producer.go b/plugins/database/cassandra/connection_producer.go
@@ -136,7 +136,7 @@ func (c *cassandraConnectionProducer) Init(ctx context.Context, conf map[string]
 	return conf, nil
 }
 
-func (c *cassandraConnectionProducer) Connection(_ context.Context) (interface{}, error) {
+func (c *cassandraConnectionProducer) Connection(ctx context.Context) (interface{}, error) {
 	if !c.Initialized {
 		return nil, connutil.ErrNotInitialized
 	}
@@ -146,7 +146,7 @@ func (c *cassandraConnectionProducer) Connection(_ context.Context) (interface{}
 		return c.session, nil
 	}
 
-	session, err := c.createSession()
+	session, err := c.createSession(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -171,7 +171,7 @@ func (c *cassandraConnectionProducer) Close() error {
 	return nil
 }
 
-func (c *cassandraConnectionProducer) createSession() (*gocql.Session, error) {
+func (c *cassandraConnectionProducer) createSession(ctx context.Context) (*gocql.Session, error) {
 	hosts := strings.Split(c.Hosts, ",")
 	clusterConfig := gocql.NewCluster(hosts...)
 	clusterConfig.Authenticator = gocql.PasswordAuthenticator{
@@ -255,7 +255,7 @@ func (c *cassandraConnectionProducer) createSession() (*gocql.Session, error) {
 	}
 
 	// Verify the info
-	err = session.Query(`LIST ALL`).Exec()
+	err = session.Query(`LIST ALL`).WithContext(ctx).Exec()
 	if err != nil && len(c.Username) != 0 && strings.Contains(err.Error(), "not authorized") {
 		rowNum := session.Query(dbutil.QueryHelper(`LIST CREATE ON ALL ROLES OF '{{username}}';`, map[string]string{
 			"username": c.Username,