Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace hand crafted query interpolation with sqlx parameter binding #1952

Merged
merged 2 commits into from
Jun 24, 2024
Merged

Replace hand crafted query interpolation with sqlx parameter binding #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72bfe58
[cron-script-server] Replace hand crafted query interpolation with sq…
ddelnano Jun 24, 2024
a941975
Replace vzmgr hand crafted query interpolation with sqlx parameter bi…
ddelnano Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/cloud/cron_script/controllers/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,17 +346,22 @@ func (s *Server) GetScripts(ctx context.Context, req *cronscriptpb.GetScriptsReq
ids[i] = utils.UUIDFromProtoOrNil(id)
}

strQuery := `SELECT id, org_id, script, cluster_ids, PGP_SYM_DECRYPT(configs, '%s'::text) as configs, enabled, frequency_s FROM cron_scripts WHERE org_id='%s' AND id IN (?)`
strQuery = fmt.Sprintf(strQuery, s.dbKey, orgID)
strQuery := "SELECT id, org_id, script, cluster_ids, PGP_SYM_DECRYPT(configs, ? ::text) as configs, enabled, frequency_s FROM cron_scripts WHERE org_id=? AND id IN (?)"
cronErr := status.Error(codes.Internal, "Failed to get cron scripts")

query, args, err := sqlx.In(strQuery, s.dbKey, orgID, ids)

query, args, err := sqlx.In(strQuery, ids)
if err != nil {
return nil, status.Error(codes.Internal, "Failed to get cron scripts")
log.WithError(err).Error("Failed to bind parameters for cron scripts query")
return nil, cronErr
}

query = s.db.Rebind(query)
rows, err := s.db.Queryx(query, args...)

if err != nil {
return nil, status.Error(codes.Internal, "Failed to get cron scripts")
log.WithError(err).Error(fmt.Sprintf("Failed to run cron scripts query: %s", query))
return nil, cronErr
}

defer rows.Close()
Expand Down
5 changes: 2 additions & 3 deletions src/cloud/vzmgr/controllers/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,9 @@ func (s *Server) GetVizierInfos(ctx context.Context, req *vzmgrpb.GetVizierInfos
i.control_plane_pod_statuses, i.unhealthy_data_plane_pod_statuses,
i.num_nodes, i.num_instrumented_nodes, i.status_message, i.prev_status, i.prev_status_time
FROM vizier_cluster_info as i, vizier_cluster as c
WHERE i.vizier_cluster_id=c.id AND i.vizier_cluster_id IN (?) AND c.org_id='%s'`
strQuery = fmt.Sprintf(strQuery, orgIDstr)
WHERE i.vizier_cluster_id=c.id AND i.vizier_cluster_id IN (?) AND c.org_id=?`

query, args, err := sqlx.In(strQuery, ids)
query, args, err := sqlx.In(strQuery, ids, orgIDstr)
if err != nil {
return nil, err
}
Expand Down
Loading