From cb4f69884a5b5ff63378544d9a4223f13635cc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Eduardo=20Jer=C3=A9z=20Gir=C3=B3n?= Date: Mon, 22 Jul 2024 22:24:00 -0600 Subject: [PATCH] Update SQL queries to use more descriptive column aliases --- internal/service/databases/get_database.sql | 2 +- internal/service/databases/paginate_databases.sql | 2 +- internal/service/destinations/get_destination.sql | 4 ++-- internal/service/destinations/paginate_destinations.sql | 4 ++-- internal/service/executions/run_execution.go | 9 +++++---- internal/service/executions/run_execution.sql | 6 +++--- internal/service/executions/soft_delete_execution.go | 2 +- internal/service/executions/soft_delete_execution.sql | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/internal/service/databases/get_database.sql b/internal/service/databases/get_database.sql index 7d16290..ad16f17 100644 --- a/internal/service/databases/get_database.sql +++ b/internal/service/databases/get_database.sql @@ -1,6 +1,6 @@ -- name: DatabasesServiceGetDatabase :one SELECT *, - pgp_sym_decrypt(connection_string::bytea, @encryption_key) AS connection_string + pgp_sym_decrypt(connection_string::bytea, @encryption_key) AS decrypted_connection_string FROM databases WHERE id = @id; diff --git a/internal/service/databases/paginate_databases.sql b/internal/service/databases/paginate_databases.sql index b3cdba5..0f4261f 100644 --- a/internal/service/databases/paginate_databases.sql +++ b/internal/service/databases/paginate_databases.sql @@ -4,7 +4,7 @@ SELECT COUNT(*) FROM databases; -- name: DatabasesServicePaginateDatabases :many SELECT *, - pgp_sym_decrypt(connection_string::bytea, @encryption_key) AS connection_string + pgp_sym_decrypt(connection_string::bytea, @encryption_key) AS decrypted_connection_string FROM databases ORDER BY created_at DESC LIMIT sqlc.arg('limit') OFFSET sqlc.arg('offset'); diff --git a/internal/service/destinations/get_destination.sql b/internal/service/destinations/get_destination.sql index 9e03a38..470845d 100644 --- a/internal/service/destinations/get_destination.sql +++ b/internal/service/destinations/get_destination.sql @@ -1,7 +1,7 @@ -- name: DestinationsServiceGetDestination :one SELECT *, - pgp_sym_decrypt(access_key::bytea, @encryption_key) AS access_key, - pgp_sym_decrypt(secret_key::bytea, @encryption_key) AS secret_key + pgp_sym_decrypt(access_key::bytea, @encryption_key) AS decrypted_access_key, + pgp_sym_decrypt(secret_key::bytea, @encryption_key) AS decrypted_secret_key FROM destinations WHERE id = @id; diff --git a/internal/service/destinations/paginate_destinations.sql b/internal/service/destinations/paginate_destinations.sql index ae293b4..171bcb8 100644 --- a/internal/service/destinations/paginate_destinations.sql +++ b/internal/service/destinations/paginate_destinations.sql @@ -4,8 +4,8 @@ SELECT COUNT(*) FROM destinations; -- name: DestinationsServicePaginateDestinations :many SELECT *, - pgp_sym_decrypt(access_key::bytea, @encryption_key) AS access_key, - pgp_sym_decrypt(secret_key::bytea, @encryption_key) AS secret_key + pgp_sym_decrypt(access_key::bytea, @encryption_key) AS decrypted_access_key, + pgp_sym_decrypt(secret_key::bytea, @encryption_key) AS decrypted_secret_key FROM destinations ORDER BY created_at DESC LIMIT sqlc.arg('limit') OFFSET sqlc.arg('offset'); diff --git a/internal/service/executions/run_execution.go b/internal/service/executions/run_execution.go index 9b76a7b..a5ac4b9 100644 --- a/internal/service/executions/run_execution.go +++ b/internal/service/executions/run_execution.go @@ -50,7 +50,7 @@ func (s *Service) RunExecution(ctx context.Context, backupID uuid.UUID) error { }) } - err = s.ints.PGDumpClient.Ping(pgVersion, back.DatabaseConnectionString) + err = s.ints.PGDumpClient.Ping(pgVersion, back.DecryptedDatabaseConnectionString) if err != nil { return updateExec(dbgen.ExecutionsServiceUpdateExecutionParams{ ID: ex.ID, @@ -61,7 +61,7 @@ func (s *Service) RunExecution(ctx context.Context, backupID uuid.UUID) error { } dumpBytes, err := s.ints.PGDumpClient.DumpZip( - pgVersion, back.DatabaseConnectionString, pgdump.DumpParams{ + pgVersion, back.DecryptedDatabaseConnectionString, pgdump.DumpParams{ DataOnly: back.BackupOptDataOnly, SchemaOnly: back.BackupOptSchemaOnly, Clean: back.BackupOptClean, @@ -88,8 +88,9 @@ func (s *Service) RunExecution(ctx context.Context, backupID uuid.UUID) error { path := strutil.CreatePath(false, back.BackupDestDir, date, file) _, err = s.ints.S3Client.Upload( - back.DestinationAccessKey, back.DestinationSecretKey, back.DestinationRegion, - back.DestinationEndpoint, back.DestinationBucketName, path, dumpBytes, + back.DecryptedDestinationAccessKey, back.DecryptedDestinationSecretKey, + back.DestinationRegion, back.DestinationEndpoint, back.DestinationBucketName, + path, dumpBytes, ) if err != nil { return updateExec(dbgen.ExecutionsServiceUpdateExecutionParams{ diff --git a/internal/service/executions/run_execution.sql b/internal/service/executions/run_execution.sql index bbfd714..8fecd7d 100644 --- a/internal/service/executions/run_execution.sql +++ b/internal/service/executions/run_execution.sql @@ -11,7 +11,7 @@ SELECT pgp_sym_decrypt( databases.connection_string::bytea, @encryption_key - ) AS database_connection_string, + ) AS decrypted_database_connection_string, databases.pg_version as database_pg_version, destinations.bucket_name as destination_bucket_name, @@ -19,10 +19,10 @@ SELECT destinations.endpoint as destination_endpoint, pgp_sym_decrypt( destinations.access_key::bytea, @encryption_key - ) AS destination_access_key, + ) AS decrypted_destination_access_key, pgp_sym_decrypt( destinations.secret_key::bytea, @encryption_key - ) AS destination_secret_key + ) AS decrypted_destination_secret_key FROM backups JOIN databases ON backups.database_id = databases.id JOIN destinations ON backups.destination_id = destinations.id diff --git a/internal/service/executions/soft_delete_execution.go b/internal/service/executions/soft_delete_execution.go index b45014c..c6f3769 100644 --- a/internal/service/executions/soft_delete_execution.go +++ b/internal/service/executions/soft_delete_execution.go @@ -27,7 +27,7 @@ func (s *Service) SoftDeleteExecution( if execution.ExecutionPath.Valid { err := s.ints.S3Client.Delete( - execution.DestinationAccessKey, execution.DestinationSecretKey, + execution.DecryptedDestinationAccessKey, execution.DecryptedDestinationSecretKey, execution.DestinationRegion, execution.DestinationEndpoint, execution.DestinationBucketName, execution.ExecutionPath.String, ) diff --git a/internal/service/executions/soft_delete_execution.sql b/internal/service/executions/soft_delete_execution.sql index 8fd4022..4459a64 100644 --- a/internal/service/executions/soft_delete_execution.sql +++ b/internal/service/executions/soft_delete_execution.sql @@ -10,10 +10,10 @@ SELECT destinations.endpoint as destination_endpoint, pgp_sym_decrypt( destinations.access_key::bytea, @encryption_key - ) AS destination_access_key, + ) AS decrypted_destination_access_key, pgp_sym_decrypt( destinations.secret_key::bytea, @encryption_key - ) AS destination_secret_key + ) AS decrypted_destination_secret_key FROM executions JOIN backups ON backups.id = executions.backup_id JOIN destinations ON destinations.id = backups.destination_id